From 77b345494bf5521c58d18cb1a25f939dceb8320d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 27 Apr 2005 12:25:39 +0000 Subject: [PATCH] file type in plugin's open() is uri rather than its index --- org.glite.jp.primary/interface/file_plugin.h | 2 +- org.glite.jp.primary/src/feed.c | 2 +- org.glite.jp.primary/src/soap_ops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.glite.jp.primary/interface/file_plugin.h b/org.glite.jp.primary/interface/file_plugin.h index 144c94c..2bb9fc0 100644 --- a/org.glite.jp.primary/interface/file_plugin.h +++ b/org.glite.jp.primary/interface/file_plugin.h @@ -11,7 +11,7 @@ typedef struct _glite_jpps_fplug_op_t { \param[in] type Index of the type in this plugin's uri's. \param[out] handle Handle to the opened file structure, to be passed to other plugin functions. */ - int (*open)(void *fpctx,void *bhandle,int type,void **handle); + int (*open)(void *fpctx,void *bhandle,const char *uri,void **handle); /** Close the file. Free data associated to a handle */ int (*close)(void *fpctx,void *handle); diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c index 414e7f1..7f4b384 100644 --- a/org.glite.jp.primary/src/feed.c +++ b/org.glite.jp.primary/src/feed.c @@ -209,7 +209,7 @@ int glite_jpps_match_file( return ret; } - if (pd[pi]->ops.open(pd[pi]->fpctx,bh,ci,&ph)) { + if (pd[pi]->ops.open(pd[pi]->fpctx,bh,class,&ph)) { /* XXX: complain more visibly */ fputs("plugin open failed\n",stderr); continue; diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c index 96f2101..205aeb5 100644 --- a/org.glite.jp.primary/src/soap_ops.c +++ b/org.glite.jp.primary/src/soap_ops.c @@ -215,7 +215,7 @@ SOAP_FMAC5 int SOAP_FMAC6 jpsrv__RecordTag( s2jp_tag(tag,&mytag); /* XXX: assuming tag plugin handles just one type */ - if (pd[0]->ops.open(pd[0]->fpctx,file_be,0,&file_p) + if (pd[0]->ops.open(pd[0]->fpctx,file_be,GLITE_JP_FILETYPE_TAGS,&file_p) || pd[0]->ops.generic(pd[0]->fpctx,file_p,GLITE_JP_FPLUG_TAGS_APPEND,&mytag)) { err2fault(ctx,soap); -- 1.8.2.3