c++ examples

diff --git a/org.glite.lb.doc/examples/cons_example1.cpp b/org.glite.lb.doc/examples/cons_example1.cpp
index 17134e9..3b82a0a 100644 (file)
--- a/org.glite.lb.doc/examples/cons_example1.cpp
+++ b/org.glite.lb.doc/examples/cons_example1.cpp
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
                /*end querycond*/
 
                /*query*/
-               statesOut = lb_server.queryJobStates(job_cond, 0);  //* \label{l:queryjobs}
+               statesOut = lb_server.queryJobStates(job_cond, 0);  //* \label{l:cppqueryjobs}
                /*end query*/
                        
                /*printstates*/

diff --git a/org.glite.lb.doc/examples/cons_example2.cpp b/org.glite.lb.doc/examples/cons_example2.cpp
index 47d2786..09aa9ae 100644 (file)
--- a/org.glite.lb.doc/examples/cons_example2.cpp
+++ b/org.glite.lb.doc/examples/cons_example2.cpp
@@ -23,11 +23,15 @@ limitations under the License.
 #include <errno.h>
 
 /*headers*/
-#include "glite/jobid/cjobid.h" 
-#include "glite/lb/events.h"
-#include "glite/lb/consumer.h" 
+#include "glite/jobid/JobId.h" 
+#include "glite/lb/Event.h"
+#include "glite/lb/ServerConnection.h" 
 /*end headers*/
 
+#include <iostream>
+
+using namespace glite::lb;
+using namespace std;
 
 static struct option opts[] = {
        {"help",                0,      NULL,   'h'},
@@ -39,23 +43,22 @@ static struct option opts[] = {
 
 static void usage(char *me)
 {
-       fprintf(stderr, "usage: %s [option]\n"
-                       "\t-h, --help      Shows this screen.\n"
-                       "\t-s, --server    LB server.\n"
-                       "\t-p, --port      LB server port.\n"
-                       "\t-j, --jobid     ID of requested job.\n"
-                       "\t-u, --user      User DN.\n"
-                       , me);
+       cerr <<  "usage: " << me << "[option]\n"
+               "\t-h, --help      Shows this screen.\n"
+               "\t-s, --server    LB server.\n"
+               "\t-p, --port      LB server port.\n"
+               "\t-j, --jobid     ID of requested job.\n"
+               "\t-u, --user      User DN.\n";
 }
 
 
 int main(int argc, char *argv[])
 {
-       char                       *server, *jobid_s, *user;
-       edg_wlc_JobId                   jobid = NULL;
-       int                                     opt, err = 0;
-       long                            i;
-       int port = 0; 
+       char                    *server, *jobid_s, *user;
+       glite::jobid::JobId     jobid;
+       int                     opt, err = 0;
+       long                    i;
+       int                     port = 0; 
 
        server = jobid_s = user = NULL;
        while ( (opt = getopt_long(argc, argv, "hs:p:j:u:c:n:v:", opts, NULL)) != EOF)
@@ -68,84 +71,49 @@ int main(int argc, char *argv[])
                case '?': usage(argv[0]); return 1;
                }
 
-       if ( !jobid_s ) { fprintf(stderr, "JobId not given\n"); return 1; }
+       if ( !jobid_s ) { cerr << "JobId not given\n"; return 1; }
 
        /*variables*/
-       edg_wll_Context         ctx;
-       edg_wll_QueryRec        *jc[4];
-       edg_wll_JobStat         *statesOut = NULL;
-       edg_wlc_JobId           *jobsOut = NULL;
+       ServerConnection        lb_server;
+       std::vector<std::vector<QueryRecord>> jc;
+       std::vector<QueryRecord> jc_part;
+       std::vector<JobStatus>   statesOut;
        /*end variables*/
 
-       if ( (errno = edg_wlc_JobIdParse(jobid_s, &jobid)) ) { perror(jobid_s); return 1; }
-
-       /*context*/
-       edg_wll_InitContext(&ctx);
-       
-       edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER, server);
-       if (port) edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER_PORT, port);
-       /*end context*/
-
-       /*queryrec*/
-       jc[0] = (edg_wll_QueryRec *) malloc(2*sizeof(edg_wll_QueryRec));
-       jc[0][0].attr = EDG_WLL_QUERY_ATTR_OWNER;
-       jc[0][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       jc[0][0].value.c = NULL;
-       jc[0][1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       jc[1] = (edg_wll_QueryRec *) malloc(2*sizeof(edg_wll_QueryRec));
-       jc[1][0].attr = EDG_WLL_QUERY_ATTR_STATUS;
-       jc[1][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       jc[1][0].value.i = EDG_WLL_JOB_RUNNING;
-       jc[1][1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       jc[2] = (edg_wll_QueryRec *) malloc(3*sizeof(edg_wll_QueryRec));
-       jc[2][0].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
-       jc[2][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       jc[2][0].value.c = "XXX";
-       jc[2][1].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
-       jc[2][1].op = EDG_WLL_QUERY_OP_EQUAL;
-       jc[2][1].value.c = "YYY";
-       jc[2][2].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       jc[3] = NULL;
-       /*end queryrec*/
-
-       /*query*/
-       err = edg_wll_QueryJobsExt(ctx, (const edg_wll_QueryRec **)jc, 
-                                  0, &jobsOut, &statesOut); 
-       /*end query*/
-
-       if ( err == E2BIG ) {
-               fprintf(stderr,"Warning: only limited result returned!\n");
-               return 0;
-       } else if (err) {
-               char    *et,*ed;
-               
-               edg_wll_Error(ctx,&et,&ed);
-               fprintf(stderr,"%s: edg_wll_QueryJobs(): %s (%s)\n",argv[0],et,ed);
-
-               free(et); free(ed);
-       }
+       try {
+               jobid = glite::jobid::JobId(jobid_s);
 
-       /*printstates*/
-       for (i = 0; statesOut[i].state; i++ ) {
-               printf("jobId : %s\n", edg_wlc_JobIdUnparse(statesOut[i].jobId));
-               printf("state : %s\n\n", edg_wll_StatToString(statesOut[i].state));
-       }
-       /*end printstates*/
+               /*context*/
+               lb_server.setQueryServer(jobid.host(), jobid.port());
+               /*end context*/
 
-       if ( jobsOut ) {
-               for (i=0; jobsOut[i]; i++) edg_wlc_JobIdFree(jobsOut[i]);
-               free(jobsOut);
-       }
-       if ( statesOut ) {
-               for (i=0; statesOut[i].state; i++) edg_wll_FreeStatus(&statesOut[i]);
-               free(statesOut);
-       }
-       free(jc[0]); free(jc[1]); free(jc[2]);
+               /*queryrec*/
+               jc_part.push_back(QueryRecord(QueryRecord::OWNER, QueryRecord::EQUAL, ""));
+               jc.push_back(jc_part);
 
-       edg_wll_FreeContext(ctx);
+               jc_part.clear();
+               jc_part.push_back(QueryRecord(QueryRecord::STATUS, QueryRecord::EQUAL, JobStatus::RUNNING));
+               jc.push_back(jc_part);
 
-       return err;
+               jc_part.clear();
+               jc_part.push_back(QueryRecord(QueryRecord::DESTINATION, QueryRecord::EQUAL, "XXX"));
+               jc_part.push_back(QueryRecord(QueryRecord::DESTINATION, QueryRecord::EQUAL, "YYY"));
+               jc.push_back(jc_part);
+               /*end queryrec*/
+
+               /*query*/
+               statesOut = lb_server.queryJobStates(jc, 0);
+               /*end query*/
+
+               /*printstates*/
+               for (i = 0; i< statesOut.size(); i++ ) {
+                       cout << "jobId : " <<  statesOut[i].getValJobId(JobStatus::JOB_ID).toString() << endl;
+                       cout << "state : " <<  statesOut[i].name() << endl << endl;
+               }
+               /*end printstates*/
+
+       } catch(std::exception e) {
+               cerr << e.what() << endl;
+       }
+       return 0;
 }