edg_wll_JobStatus renamed to edg_wll_JobStatusServer

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index 2130ba0..42192dd 100644 (file)
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -66,7 +66,7 @@ static char* matched_substr(char *in, regmatch_t match)
 }
 
 
-int edg_wll_JobStatus(
+int edg_wll_JobStatusServer(
        edg_wll_Context ctx,
        glite_jobid_const_t             job,
        int             flags,

diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h
index 58d34ce..964aa7a 100644 (file)
--- a/org.glite.lb.server/src/jobstat.h
+++ b/org.glite.lb.server/src/jobstat.h
@@ -94,7 +94,7 @@ typedef enum _subjobClassCodes {
        SUBJOB_CLASS_REST
 } subjobClassCodes;
 
-int edg_wll_JobStatus(edg_wll_Context, glite_jobid_const_t, int, edg_wll_JobStat *);
+int edg_wll_JobStatusServer(edg_wll_Context, glite_jobid_const_t, int, edg_wll_JobStat *);
 
 void destroy_intJobStat(intJobStat *);
 void destroy_intJobStat_extension(intJobStat *p);

diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c
index 07711aa..f4d418c 100644 (file)
--- a/org.glite.lb.server/src/lb_proto.c
+++ b/org.glite.lb.server/src/lb_proto.c
@@ -479,7 +479,7 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
                                edg_wll_SetError(ctx,EDG_WLL_ERROR_JOBID_FORMAT,fullid);
                                ret = HTTP_BADREQ;
                        }
-                       else switch (edg_wll_JobStatus(ctx,jobId,0,&stat)) {
+                       else switch (edg_wll_JobStatusServer(ctx,jobId,0,&stat)) {
                                case 0: if (html) edg_wll_JobStatusToHTML(ctx,stat,&message); 
                                        else ret = HTTP_OK;
                                        break;

diff --git a/org.glite.lb.server/src/load.c b/org.glite.lb.server/src/load.c
index 183c2d0..21d8e48 100644 (file)
--- a/org.glite.lb.server/src/load.c
+++ b/org.glite.lb.server/src/load.c
@@ -138,7 +138,7 @@ int edg_wll_LoadEventsServer(edg_wll_Context ctx,const edg_wll_LoadRequest *req,
                                {
                                        edg_wll_JobStat st;
 
-                                       edg_wll_JobStatus(ctx, jobid, 0, &st);
+                                       edg_wll_JobStatusServer(ctx, jobid, 0, &st);
                                        edg_wll_FreeStatus(&st);
 
                                        edg_wlc_JobIdFree(jobid);
@@ -160,7 +160,7 @@ cycle_clean:
        {
                edg_wll_JobStat st;
 
-               edg_wll_JobStatus(ctx, jobid, 0, &st);
+               edg_wll_JobStatusServer(ctx, jobid, 0, &st);
                edg_wll_FreeStatus(&st);
                edg_wlc_JobIdFree(jobid);
        }

diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index 0c9f5be..2ec8236 100644 (file)
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -186,7 +186,7 @@ int edg_wll_QueryEventsServer(
                                        
                                        if (j_old) edg_wll_FreeStatus(&state_out);
 
-                                       if ( edg_wll_JobStatus(ctx, out[i].any.jobId, 0, &state_out) )
+                                       if ( edg_wll_JobStatusServer(ctx, out[i].any.jobId, 0, &state_out) )
                                        {
                                                edg_wll_FreeEvent(out+i);
                                                if (edg_wll_Error(ctx,NULL,NULL) == EPERM) eperm = 1;
@@ -416,7 +416,7 @@ int edg_wll_QueryJobsServer(
                        
                        // if some condition hits unindexed column or states of matching jobs wanted
                        if ((where_flags & FL_FILTER) || !(flags & EDG_WLL_STAT_NO_STATES)) {
-                               if ( edg_wll_JobStatus(ctx, jobs_out[i], flags, &states_out[i]) )
+                               if ( edg_wll_JobStatusServer(ctx, jobs_out[i], flags, &states_out[i]) )
                                {
                                        edg_wlc_JobIdFree(jobs_out[i]);
                                        if (edg_wll_Error(ctx,NULL,NULL) == EPERM) eperm = 1;

diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c
index ae7a4aa..47f1227 100644 (file)
--- a/org.glite.lb.server/src/srv_purge.c
+++ b/org.glite.lb.server/src/srv_purge.c
@@ -297,7 +297,7 @@ int edg_wll_PurgeServer(edg_wll_Context ctx,const edg_wll_PurgeRequest *request)
                                }
 
                                memset(&stat,0,sizeof stat);
-                               if (edg_wll_JobStatus(ctx,job,0,&stat)) {  /* FIXME: replace by intJobStatus ?? */
+                               if (edg_wll_JobStatusServer(ctx,job,0,&stat)) {  /* FIXME: replace by intJobStatus ?? */
                                        edg_wll_FreeStatus(&stat);
                                        goto abort; 
                                }

diff --git a/org.glite.lb.server/src/userjobs.c b/org.glite.lb.server/src/userjobs.c
index 01f0cf0..61063a3 100644 (file)
--- a/org.glite.lb.server/src/userjobs.c
+++ b/org.glite.lb.server/src/userjobs.c
@@ -72,7 +72,7 @@ int edg_wll_UserJobsServer(
 
        *states = calloc(njobs, sizeof(**states));
        for (i = 0; i < njobs; i++) {
-               if (edg_wll_JobStatus(ctx, out[i], -1, &(*states)[i]) != 0) {
+               if (edg_wll_JobStatusServer(ctx, out[i], -1, &(*states)[i]) != 0) {
                        for (j = 0; j < i; j++) edg_wll_FreeStatus(&(*states)[j]);
                        *states = NULL;
                        break;

diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c
index 2ca013c..ca5d0eb 100644 (file)
--- a/org.glite.lb.server/src/ws_query.c
+++ b/org.glite.lb.server/src/ws_query.c
@@ -79,7 +79,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__JobStatus(
                free(cflags);
        }
 
-       if ( edg_wll_JobStatus(ctx, j, flags, &s) )
+       if ( edg_wll_JobStatusServer(ctx, j, flags, &s) )
        {
                edg_wll_ErrToFault(ctx, soap);
                return SOAP_FAULT;