build ws_joblog with gsoap 2.7.6d

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index ba744a3..f265c8b 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -61,6 +61,10 @@ install:
                ${INSTALL} -m 755 $$f ${PREFIX}/examples/glite-lb-$$f; \
        done
 
+clean:
+       rm -rf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo LoggingAndBookkeeping.nsmap soap_version.h ${CEXAMPLES}
+       
+
 
 LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
        cp ${stagedir}/interface/LBTypes.wsdl .
@@ -69,6 +73,6 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null 
-       perl -ne '$$. == 2 && /.*([0-9])\.([0-9])\.([0-9]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 

diff --git a/org.glite.lb.ws-test/examples/ws_joblog.c b/org.glite.lb.ws-test/examples/ws_joblog.c
index f0e742d..0e7a9de 100644 (file)
--- a/org.glite.lb.ws-test/examples/ws_joblog.c
+++ b/org.glite.lb.ws-test/examples/ws_joblog.c
@@ -87,8 +87,11 @@ int main(int argc,char** argv)
        memset(&qr,0,sizeof qr);
        qr.op = lbt__queryOp__EQUAL;
        qr.value1 = &qv;
-       qv.__union_2 = SOAP_UNION_lbt__union_2_c;
-       qv.union_2.c = jobid;
+
+       GLITE_SECURITY_GSOAP_CHOICE_SET(&qv,c,lbt,queryRecValue,2,jobid);
+
+//     qv.__union_2 = SOAP_UNION_lbt__union_2_c;
+//     qv.union_2.c = jobid;
 
        switch (err = soap_call___lb__QueryEvents(mydlo, server, "",&in,&out))
        {