Build fixes:

- parsing of timeval type (failing test for CREAM)
- include path for wsdl2h
- generate soap list in glue's getActivityInfo
- update due to DB API change in server test
- linking log4c in server test

diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T
index 910d25c..5bba166 100644 (file)
--- a/org.glite.lb.common/src/events_parse.c.T
+++ b/org.glite.lb.common/src/events_parse.c.T
@@ -263,7 +263,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
        if ($tl =~ m/^condor/) { $tl = ucfirst $tl; }
        my $free = "";
        gen $indent."case EDG_WLL_EVENT_$tu :\n";
-       gen "\t\{";
+       gen "\t\{\n";
        selectType $event $t;
 # if there are some _code_, convert them from string:
        for ($event->getFieldsOrdered) {
@@ -271,19 +271,23 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                my $fn = $f->{name};
                my $fnu = ucfirst $fn;
                if ($f->{codes}) {
-                       gen "\tchar \*$fn\_code = edg_wll\_$t${fnu}ToString(event->$tl.$fn);\n"; 
+                       gen "\t\tchar \*$fn\_code = edg_wll\_$t${fnu}ToString(event->$tl.$fn);\n"; 
                        $free = $free . "free($fn\_code); ";
                }
-               if ($f->{type} eq 'jobid') {
-                       gen "\tchar \*$fn\_str = edg_wlc_JobIdUnparse(event->$tl.$fn);\n";
+               elsif ($f->{type} eq 'jobid') {
+                       gen "\t\tchar \*$fn\_str = edg_wlc_JobIdUnparse(event->$tl.$fn);\n";
                        $free .= "free($fn\_str); ";
                }
-               if ($f->{type} eq 'notifid') {
-                       gen "\tchar \*$fn\_str = edg_wll_NotifIdUnparse(event->$tl.$fn);\n";
+               elsif ($f->{type} eq 'notifid') {
+                       gen "\t\tchar \*$fn\_str = edg_wll_NotifIdUnparse(event->$tl.$fn);\n";
                        $free .= "free($fn\_str); ";
                }
-               if ($ULMasString{$f->{type}}) {
-                       gen "\tchar \*$fn\_str = ".$f->getType()."ToString(event->$tl.$fn);\n";
+               elsif ($f->{type} eq 'timeval') {
+                       gen "\t\tchar $fn\_str[ULM_DATE_STRING_LENGTH + 1];\n";
+                       gen "\t\t".toString $f "event->$tl.$fn", "$fn\_str"; gen "\n";
+               }
+               elsif ($ULMasString{$f->{type}}) {
+                       gen "\t\tchar \*$fn\_str = ".$f->getType()."ToString(event->$tl.$fn);\n";
                        $free .= "free($fn\_str); ";
                }
        }
@@ -295,7 +299,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                gen "\t\tif (!nonulls.$tl.$fn) nonulls.$tl.$fn = \"\";\n"
                        if $f->{type} eq 'string';
        }
-       gen "\tif (trio_asprintf(&var,EDG_WLL_FORMAT_$tu";
+       gen "\t\tif (trio_asprintf(&var,EDG_WLL_FORMAT_$tu";
 # now format remaining parapteres for trio_asprintf:
        for ($event->getFieldsOrdered) {
                my $f = selectField $event $_;
@@ -303,7 +307,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                if ($f->{codes}) {
                        gen ",$fn\_code";
                }
-               elsif ($f->{type} eq 'jobid' || $f->{type} eq 'notifid' || $ULMasString{$f->{type}}) {
+               elsif ($f->{type} eq 'jobid' || $f->{type} eq 'notifid' || $f->{type} eq 'timeval' || $ULMasString{$f->{type}}) {
                        gen ",$fn\_str?$fn\_str:\"\"";
                } else {
                        gen ",nonulls.$tl.$fn";
@@ -311,7 +315,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
        }
        gen ") == -1 ) \{\n";
                gen "\t".$indent.$free."NOMEM \}\n";
-       if ($free) { gen "\t$free\n"; }
+       if ($free) { gen "\t\t$free\n"; }
        gen "\t\}\n";
        gen $indent.$indent."break;\n";
 }

diff --git a/org.glite.lb.common/test/parse.cpp.T b/org.glite.lb.common/test/parse.cpp.T
index c7e97d1..c690be9 100644 (file)
--- a/org.glite.lb.common/test/parse.cpp.T
+++ b/org.glite.lb.common/test/parse.cpp.T
@@ -96,6 +96,8 @@ void EventParseTest::$l()
                                        $value = "edg_wlc_JobIdParse(\"https://some.host:1234/x67qr549qc\",&e1->$l.$fn);";
                                } elsif ($f->{type} eq "notifid") { 
                                        $value = "edg_wll_NotifIdParse(\"https://some.host:1234/NOTIF:x67qr549qc\",&e1->$l.$fn);";
+                               } elsif ($f->{type} eq "timeval") { 
+                                       $value = "e1->$l.$fn.tv_sec = 326890800; e1->$l.$fn.tv_usec = 1;";
                                } else { 
                                        gen "% FIXME: unknown type $f->{type} for $fn \n"; 
                                }

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index eae5528..8c244fc 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -293,9 +293,7 @@ ${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c
 #      { sleep 16 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; }
 
 LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
-       cp ${stagedir}/interface/LBTypes.wsdl .
-       ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl
-       rm -f LBTypes.wsdl
+       ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -I${stagedir}/interface -o $@ ${stagedir}/interface/LB.wsdl
 
 test.xml: test_xml
        ./test_xml
@@ -313,7 +311,7 @@ query_events_objs := test_query_events.o query.o get_events.o jobstat_supp.o ind
 
 test_query_events: ${query_events_objs}
        ${LINKXX} -o $@ ${query_events_objs} \
-       ${TEST_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib}
+       ${TEST_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib} ${LOG4C_LIBS}
 
 test.soapconv: test_soap_conv
        ./test_soap_conv

diff --git a/org.glite.lb.server/src/ws_lb4agu.c b/org.glite.lb.server/src/ws_lb4agu.c
index ce6b522..06b9282 100644 (file)
--- a/org.glite.lb.server/src/ws_lb4agu.c
+++ b/org.glite.lb.server/src/ws_lb4agu.c
@@ -94,6 +94,8 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityInfo(
        if (!in->id) return SOAP_FAULT;
        out = soap_malloc(soap, sizeof(*out));
 
+       GLITE_SECURITY_GSOAP_LIST_CREATE(soap, out, status, struct glue__ComputingActivity_USCOREt, 1);
+
        /* process each request individually: */
        for (i=0; in->id[i]; i++) {
                /* first parse jobId */
@@ -125,8 +127,8 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityInfo(
                }
 
                /* fill in the response fields */
-               out->status->ID = in->id[i];
-               out->status->State = edg_wll_StatToString(s.state);
+               GLITE_SECURITY_GSOAP_LIST_GET(out->status, i)->ID = in->id[i];
+               GLITE_SECURITY_GSOAP_LIST_GET(out->status, i)->State = edg_wll_StatToString(s.state);
        }
 
        return SOAP_OK;

diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp
index 5224281..ab2a9a3 100644 (file)
--- a/org.glite.lb.server/test/test_query_events.cpp
+++ b/org.glite.lb.server/test/test_query_events.cpp
@@ -112,7 +112,7 @@ int QueryEventsTest::ExecStmt(const char *qry, glite_lbu_Statement *stmt_out)
 }
 
 extern "C" {
-int glite_lbu_InitDBContext(glite_lbu_DBContext *ctx) { return 0; }
+int glite_lbu_InitDBContext(glite_lbu_DBContext *ctx, int backend) { return 0; }
 void glite_lbu_FreeDBContext(glite_lbu_DBContext ctx) { }
 int glite_lbu_DBConnect(glite_lbu_DBContext ctx, const char*str) { return 0; }
 void glite_lbu_DBClose(glite_lbu_DBContext ctx) { }
@@ -145,8 +145,8 @@ void glite_lbu_FreeStmt(glite_lbu_Statement *) {}
 int debug;
 
 int glite_lbu_QueryColumns(glite_lbu_Statement stmt, char**cols) { return 0; }
-void glite_lbu_TimeToDB(long t, char **s) { *s = NULL; }
-time_t glite_lbu_DBToTime(const char *c) { return (time_t)-1; }
+void glite_lbu_TimeToStr(long t, char **s) { *s = NULL; }
+time_t glite_lbu_StrToTime(const char *c) { return (time_t)-1; }
 
 int glite_lbu_Transaction(glite_lbu_DBContext ctx) { return 0; }
 int glite_lbu_Commit(glite_lbu_DBContext ctx) { return 0; }

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 81759cb..bf6bef8 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -73,9 +73,7 @@ clean:
 
 
 LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
-       cp ${stagedir}/interface/LBTypes.wsdl .
-       ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl
-       rm -f LBTypes.wsdl
+       ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}/interface -o $@ ${stagedir}/interface/LB.wsdl
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null