- fixed build

- extended example to cover StartUpload

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 94e6663..8dbff02 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -38,6 +38,7 @@ LINK:=libtool --mode=link ${CC} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
+GSOAP_LIB:=-L${gsoap_prefix}/lib -lgsoap${GSOAP_DEBUG}
 
 daemon:=glite-jp-primarystoraged
 example:=jpps-test
@@ -52,16 +53,20 @@ CFLAGS+=-DGSOAP_VERSION=${gsoap_version}
 SRCS:= simple_server.c soap_ops.c \
        ftp_backend.c \
        feed.c tags.c\
-       is_client.c \
-       ${ps_prefix}ServerLib.c \
-       ${is_prefix}ClientLib.c \
-       env_C.c
+       ${ps_prefix}Server.c ${ps_prefix}C.c
+
+
+# not yet
+#      ${ps_prefix}ServerLib.c \
+#      ${is_prefix}ClientLib.c \
+#      is_client.c \
+#      env_C.c
 
 EXA_SRCS:=jpps-test.c ${ps_prefix}C.c ${ps_prefix}Client.c
 
 
-OBJS:=${SRCS:.c=.o} stdsoap2.o
-EXA_OBJS:=${EXA_SRCS:.c=.o} stdsoap2.o
+OBJS:=${SRCS:.c=.o}
+EXA_OBJS:=${EXA_SRCS:.c=.o}
 
 COMMONLIB:=-lglite_jp_common
 
@@ -70,10 +75,10 @@ default all: compile
 compile: ${daemon} ${example}
 
 ${daemon}: ${OBJS}
-       ${LINK} -o $@ ${OBJS} ${COMMONLIB} ${GLOBUS_LIBS} 
+       ${LINK} -o $@ ${OBJS} ${COMMONLIB} ${GSOAP_LIB} ${GLOBUS_LIBS} 
 
 ${example}: ${EXA_OBJS}
-       ${LINK} -o $@ ${EXA_OBJS} 
+       ${LINK} -o $@ ${EXA_OBJS} ${GSOAP_LIB}
 
 JobProvenanceIS.xh JobProvenancePS.xh: %.xh: %.wsdl JobProvenanceTypes.wsdl typemap.dat
        cp  ${jpproject}/JobProvenanceTypes.wsdl .
@@ -83,8 +88,8 @@ JobProvenanceIS.xh JobProvenancePS.xh: %.xh: %.wsdl JobProvenanceTypes.wsdl type
 ${ps_prefix}ServerLib.c ${ps_prefix}H.h: JobProvenancePS.xh
        ${gsoap_prefix}/bin/soapcpp2 -n -w -c -p ${ps_prefix} JobProvenancePS.xh
 
-${is_prefix}ClientLib.c ${is_prefix}H.h: JobProvenanceIS.xh
-       ${gsoap_prefix}/bin/soapcpp2 -n -w -c -p ${is_prefix} JobProvenanceIS.xh
+# ${is_prefix}ClientLib.c ${is_prefix}H.h: JobProvenanceIS.xh
+#      ${gsoap_prefix}/bin/soapcpp2 -n -w -c -p ${is_prefix} JobProvenanceIS.xh
 
 env_C.c env_Server.c:
        touch env.xh
@@ -98,7 +103,8 @@ env_C.c env_Server.c:
 #
 
 
-simple_server.o: ${is_prefix}H.h ${ps_prefix}H.h
+# simple_server.o: ${is_prefix}H.h ${ps_prefix}H.h
+simple_server.o: ${ps_prefix}H.h
 
 check: 
        -echo nothing yet

diff --git a/org.glite.jp.primary/examples/jpps-test.c b/org.glite.jp.primary/examples/jpps-test.c
index 484dba5..038e1f8 100644 (file)
--- a/org.glite.jp.primary/examples/jpps-test.c
+++ b/org.glite.jp.primary/examples/jpps-test.c
@@ -13,7 +13,7 @@ static void usage(const char *me)
        fprintf(stderr,"%s: [-s server-url] operation args \n\n"
                        "       operations are:\n"
                        "               RegisterJob jobid\n"
-                       "               StartUpload\n"
+                       "               StartUpload jobi jobidd\n"
                        "               CommitUpload\n"
                        "               RecordTag\n"
                        "               GetJob\n"
@@ -128,9 +128,24 @@ int main(int argc,char *argv[])
                        printf("FeedId: %s\nExpires: %s\n",r.feedId,ctime(&r.expires));
                }
        }
+       else if ((!strcasecmp(argv[1],"StartUpload"))) {
+               struct jpsrv__StartUploadResponse       r;
+               time_t now = time(NULL) + 120;
+
+               if (argc != 3) usage(argv[0]);
+
+               if (!check_fault(soap,soap_call_jpsrv__StartUpload(soap,server,"",
+                               argv[2],JOB_LOG,now,"text/plain",&r)))
+               {
+                       printf("Destination: %s\nCommitBefore: %s\n",
+                                       r.destination,ctime(&r.commitBefore));
+               }
+       }
        else usage(argv[0]);
 
        return 0;
 }
 
 
+/* XXX: we don't use it */
+SOAP_NMAC struct Namespace namespaces[] = { {NULL,NULL} };

diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index 1f7c2ac..a6d7ceb 100644 (file)
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -126,7 +126,9 @@ static int match_feed(
        }
 
        /* matched completely */
-       return glite_jpps_single_feed(ctx,feed->destination,job,attrs);
+       /* FIXME: dont' call it yet 
+       return glite_jpps_single_feed(ctx,feed->destination,job,attrs); */
+       return 0;
 }
 
 int glite_jpps_match_attr(

diff --git a/org.glite.jp.primary/src/ftp_backend.c b/org.glite.jp.primary/src/ftp_backend.c
index f25c514..cd6d53c 100644 (file)
--- a/org.glite.jp.primary/src/ftp_backend.c
+++ b/org.glite.jp.primary/src/ftp_backend.c
@@ -146,7 +146,7 @@ static int mkdirpath(const char* path, int prefixlen)
                *p = '/';
        }
        free(wpath);
-       return ret;
+       return goout ? 0 : ret;
 }
 
 static long regtime_trunc(long tv_sec)

diff --git a/org.glite.jp.primary/src/simple_server.c b/org.glite.jp.primary/src/simple_server.c
index e6e285f..c6263e2 100644 (file)
--- a/org.glite.jp.primary/src/simple_server.c
+++ b/org.glite.jp.primary/src/simple_server.c
@@ -25,9 +25,12 @@ int main(int argc, char *argv[]) {
    }
 
    soap.user = (void *) ctx;
+
+/* not yet client of JPIS 
    ctx->other_soap = soap_new();
    soap_init(ctx->other_soap);
    soap_set_namespaces(ctx->other_soap,jpis__namespaces);
+*/
 
    srand48(time(NULL)); /* feed id generation */
 
@@ -53,3 +56,6 @@ int main(int argc, char *argv[]) {
 
    return 0;
 }
+
+/* XXX: we don't use it */
+SOAP_NMAC struct Namespace namespaces[] = { {NULL,NULL} };

diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c
index 19cc22b..e9fe8a2 100644 (file)
--- a/org.glite.jp.primary/src/soap_ops.c
+++ b/org.glite.jp.primary/src/soap_ops.c
@@ -7,7 +7,8 @@
 #include "feed.h"
 
 #include "jpps_H.h"
-#include "jpps_.nsmap"
+/* #include "JobProvenancePS.nsmap" */
+#include "jpps_.nsmap" 
 
 #include "jptype_map.h"