Fix build with gsoap 2.6.2

diff --git a/org.glite.jp.primary/examples/jpps-test.c b/org.glite.jp.primary/examples/jpps-test.c
index 684a33f..c7c3e6d 100644 (file)
--- a/org.glite.jp.primary/examples/jpps-test.c
+++ b/org.glite.jp.primary/examples/jpps-test.c
@@ -10,6 +10,18 @@
 
 #include "jptype_map.h"
 
+#include "soap_version.h"
+#if GSOAP_VERSION <= 20602
+#define soap_call___jpsrv__RegisterJob soap_call___ns1__RegisterJob
+#define soap_call___jpsrv__StartUpload soap_call___ns1__StartUpload
+#define soap_call___jpsrv__CommitUpload soap_call___ns1__CommitUpload
+#define soap_call___jpsrv__RecordTag soap_call___ns1__RecordTag
+#define soap_call___jpsrv__FeedIndex soap_call___ns1__FeedIndex
+#define soap_call___jpsrv__FeedIndexRefresh soap_call___ns1__FeedIndexRefresh
+#define soap_call___jpsrv__GetJob soap_call___ns1__GetJob
+#endif
+
+
 static void usage(const char *me)
 {
        fprintf(stderr,"%s: [-s server-url] operation args \n\n"

diff --git a/org.glite.jp.primary/interface/file_plugin.h b/org.glite.jp.primary/interface/file_plugin.h
index 2bb9fc0..da07c56 100644 (file)
--- a/org.glite.jp.primary/interface/file_plugin.h
+++ b/org.glite.jp.primary/interface/file_plugin.h
@@ -8,7 +8,7 @@ typedef struct _glite_jpps_fplug_op_t {
 /** Open a file.
 \param[in] fpctx       Context of the plugin, returned by its init.
 \param[in] bhandle     Handle of the file via JPPS backend.
-\param[in] type                Index of the type in this plugin's uri's.
+\param[in] uri         URI (type) of the opened file.
 \param[out] handle     Handle to the opened file structure, to be passed to other plugin functions.
 */
        int     (*open)(void *fpctx,void *bhandle,const char *uri,void **handle);

diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c
index 6ef1796..6a2fe79 100644 (file)
--- a/org.glite.jp.primary/src/soap_ops.c
+++ b/org.glite.jp.primary/src/soap_ops.c
@@ -16,6 +16,17 @@
 #include "file_plugin.h"
 #include "builtin_plugins.h"
 
+#include "soap_version.h"
+#if GSOAP_VERSION <= 20602
+#define __jpsrv__RegisterJob __ns1__RegisterJob
+#define __jpsrv__StartUpload __ns1__StartUpload
+#define __jpsrv__CommitUpload __ns1__CommitUpload
+#define __jpsrv__RecordTag __ns1__RecordTag
+#define __jpsrv__FeedIndex __ns1__FeedIndex
+#define __jpsrv__FeedIndexRefresh __ns1__FeedIndexRefresh
+#define __jpsrv__GetJob __ns1__GetJob
+#endif
+
 static struct jptype__genericFault *jp2s_error(struct soap *soap,
                const glite_jp_error_t *err)
 {

diff --git a/org.glite.jp.primary/src/tags_plugin.c b/org.glite.jp.primary/src/tags_plugin.c
index c107d14..7e8b32b 100644 (file)
--- a/org.glite.jp.primary/src/tags_plugin.c
+++ b/org.glite.jp.primary/src/tags_plugin.c
@@ -9,7 +9,7 @@
 #include "builtin_plugins.h"
 
 static int tagappend(void *,void *,int,...);
-static int tagopen(void *,void *,void **);
+static int tagopen(void *,void *,const char *uri,void **);
 static int tagclose(void *,void *);
 
 static int tagdummy()
@@ -37,7 +37,7 @@ int init(glite_jp_context_t ctx, glite_jpps_fplug_data_t *data)
        return 0;
 }
 
-static int tagopen(void *fpctx,void *bhandle,void **handle)
+static int tagopen(void *fpctx,void *bhandle,const char *uri,void **handle)
 {
        /* we don't need anything special yet, so just pass the backend handle */
        *handle = bhandle;