From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 24 Oct 2006 15:22:44 +0000 (+0000)
Subject: Child histogram saving/retreival. Retreival not tested yet. Encoding/Decoding works... 
X-Git-Tag: merge_connpool_dst~26
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ba3d757b375fe6ca024365fc0ca70c5ceba07ef9;p=jra1mw.git

Child histogram saving/retreival. Retreival not tested yet. Encoding/Decoding works all right.
---

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index d3661c0..9a4efae 100644
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -712,7 +712,7 @@ edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx,
 edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId parent_jobid, intJobStat **ijs)
 {
 
-        char    *stmt = NULL,*out = NULL;
+        char    *stmt = NULL,*out = NULL, *res_rest;
         edg_wll_Stmt    sh;
         int     f = -1;
 
@@ -723,21 +723,26 @@ edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId
                 return edg_wll_SetError(ctx,ENOMEM, NULL);
         }
 
-/* XXX: Untested  */
-
-/* XXX: This positively does not work, needs finishing: */
-
         if (edg_wll_ExecStmt(ctx,stmt,&sh) >= 0) {
                 f=edg_wll_FetchRow(sh,&out);
                 if (f == 0) {
                         if (out) free(out);
                         out = NULL;
-                        edg_wll_SetError(ctx, ENOENT, NULL);
+                        return edg_wll_SetError(ctx, ENOENT, NULL);
                 }
         }
         edg_wll_FreeStmt(&sh);
         free(stmt);
 
+/* XXX: Untested  */
+
+        *ijs = dec_intJobStat(out, &res_rest);
+        if (res_rest == NULL) {
+                edg_wll_SetError(ctx, EDG_WLL_ERROR_DB_CALL,
+                                "error decoding DB intJobStatus");
+        }
+
+
 	return edg_wll_Error(ctx, NULL, NULL);
 }
 
@@ -761,10 +766,6 @@ edg_wll_ErrorCode edg_wll_SetSubjobHistogram(edg_wll_Context ctx, edg_wlc_JobId
 		return edg_wll_SetError(ctx,ENOMEM, NULL);
 	}
 
-/* XXX: Untested  */
-
-//printf ("Would like to run SQL statament: %s\n", stmt);
-
         if ((dbret = edg_wll_ExecStmt(ctx,stmt,NULL)) < 0) goto cleanup;
 
 	assert(dbret);	/* update should come through OK as the record exists */