Index: trunk/ippdb/src/ippdb.c
===================================================================
--- trunk/ippdb/src/ippdb.c	(revision 16731)
+++ trunk/ippdb/src/ippdb.c	(revision 17142)
@@ -9503,5 +9503,5 @@
 static void warpRunRowFree(warpRunRow *object);
 
-warpRunRow *warpRunRowAlloc(psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
+warpRunRow *warpRunRowAlloc(psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
 {
     warpRunRow      *_object;
@@ -9516,4 +9516,5 @@
     _object->workdir = psStringCopy(workdir);
     _object->workdir_state = psStringCopy(workdir_state);
+    _object->label = psStringCopy(label);
     _object->dvodb = psStringCopy(dvodb);
     _object->tess_id = psStringCopy(tess_id);
@@ -9531,4 +9532,5 @@
     psFree(object->workdir);
     psFree(object->workdir_state);
+    psFree(object->label);
     psFree(object->dvodb);
     psFree(object->tess_id);
@@ -9570,4 +9572,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, "255")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb");
@@ -9608,5 +9615,5 @@
 }
 
-bool warpRunInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
+bool warpRunInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
 {
     psMetadata *md = psMetadataAlloc();
@@ -9638,4 +9645,9 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir_state", PS_DATA_STRING, NULL, workdir_state)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item workdir_state");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
         psFree(md);
         return false;
@@ -9689,5 +9701,5 @@
 bool warpRunInsertObject(psDB *dbh, warpRunRow *object)
 {
-    return warpRunInsert(dbh, object->warp_id, object->cam_id, object->mode, object->state, object->workdir, object->workdir_state, object->dvodb, object->tess_id, object->end_stage, object->registered, object->magiced);
+    return warpRunInsert(dbh, object->warp_id, object->cam_id, object->mode, object->state, object->workdir, object->workdir_state, object->label, object->dvodb, object->tess_id, object->end_stage, object->registered, object->magiced);
 }
 
@@ -9792,4 +9804,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, object->label)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, object->dvodb)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb");
@@ -9856,4 +9873,9 @@
         return false;
     }
+    char* label = psMetadataLookupPtr(&status, md, "label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label");
+        return false;
+    }
     char* dvodb = psMetadataLookupPtr(&status, md, "dvodb");
     if (!status) {
@@ -9882,5 +9904,5 @@
     }
 
-    return warpRunRowAlloc(warp_id, cam_id, mode, state, workdir, workdir_state, dvodb, tess_id, end_stage, registered, magiced);
+    return warpRunRowAlloc(warp_id, cam_id, mode, state, workdir, workdir_state, label, dvodb, tess_id, end_stage, registered, magiced);
 }
 psArray *warpRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -24898,5 +24920,5 @@
 static void pstampRequestRowFree(pstampRequestRow *object);
 
-pstampRequestRow *pstampRequestRowAlloc(psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri)
+pstampRequestRow *pstampRequestRowAlloc(psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri, psS16 resultsFile)
 {
     pstampRequestRow *_object;
@@ -24910,4 +24932,5 @@
     _object->outFileset = psStringCopy(outFileset);
     _object->uri = psStringCopy(uri);
+    _object->resultsFile = resultsFile;
 
     return _object;
@@ -24949,4 +24972,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
+        psFree(md);
+        return false;
+    }
 
     bool status = psDBCreateTable(dbh, PSTAMPREQUEST_TABLE_NAME, md);
@@ -24962,5 +24990,5 @@
 }
 
-bool pstampRequestInsert(psDB * dbh, psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri)
+bool pstampRequestInsert(psDB * dbh, psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri, psS16 resultsFile)
 {
     psMetadata *md = psMetadataAlloc();
@@ -24987,4 +25015,9 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, resultsFile)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
         psFree(md);
         return false;
@@ -25013,5 +25046,5 @@
 bool pstampRequestInsertObject(psDB *dbh, pstampRequestRow *object)
 {
-    return pstampRequestInsert(dbh, object->req_id, object->ds_id, object->state, object->outFileset, object->uri);
+    return pstampRequestInsert(dbh, object->req_id, object->ds_id, object->state, object->outFileset, object->uri, object->resultsFile);
 }
 
@@ -25111,4 +25144,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, object->resultsFile)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
+        psFree(md);
+        return false;
+    }
 
 
@@ -25145,6 +25183,11 @@
         return false;
     }
-
-    return pstampRequestRowAlloc(req_id, ds_id, state, outFileset, uri);
+    psS16 resultsFile = psMetadataLookupS16(&status, md, "resultsFile");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item resultsFile");
+        return false;
+    }
+
+    return pstampRequestRowAlloc(req_id, ds_id, state, outFileset, uri, resultsFile);
 }
 psArray *pstampRequestSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -25264,5 +25307,5 @@
 static void pstampJobRowFree(pstampJobRow *object);
 
-pstampJobRow *pstampJobRowAlloc(psS64 job_id, psS64 req_id, const char *state, psS32 result, const char *uri, const char *outputBase, const char *args)
+pstampJobRow *pstampJobRowAlloc(psS64 job_id, psS64 req_id, const char *state, const char *jobType, psS32 result, const char *uri, const char *outputBase, const char *args)
 {
     pstampJobRow    *_object;
@@ -25274,4 +25317,5 @@
     _object->req_id = req_id;
     _object->state = psStringCopy(state);
+    _object->jobType = psStringCopy(jobType);
     _object->result = result;
     _object->uri = psStringCopy(uri);
@@ -25285,4 +25329,5 @@
 {
     psFree(object->state);
+    psFree(object->jobType);
     psFree(object->uri);
     psFree(object->outputBase);
@@ -25308,4 +25353,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, "16")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "result", PS_DATA_S32, NULL, 0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item result");
@@ -25341,5 +25391,5 @@
 }
 
-bool pstampJobInsert(psDB * dbh, psS64 job_id, psS64 req_id, const char *state, psS32 result, const char *uri, const char *outputBase, const char *args)
+bool pstampJobInsert(psDB * dbh, psS64 job_id, psS64 req_id, const char *state, const char *jobType, psS32 result, const char *uri, const char *outputBase, const char *args)
 {
     psMetadata *md = psMetadataAlloc();
@@ -25356,4 +25406,9 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, state)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item state");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, jobType)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
         psFree(md);
         return false;
@@ -25402,5 +25457,5 @@
 bool pstampJobInsertObject(psDB *dbh, pstampJobRow *object)
 {
-    return pstampJobInsert(dbh, object->job_id, object->req_id, object->state, object->result, object->uri, object->outputBase, object->args);
+    return pstampJobInsert(dbh, object->job_id, object->req_id, object->state, object->jobType, object->result, object->uri, object->outputBase, object->args);
 }
 
@@ -25490,4 +25545,9 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, object->jobType)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "result", PS_DATA_S32, NULL, object->result)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item result");
@@ -25534,4 +25594,9 @@
         return false;
     }
+    char* jobType = psMetadataLookupPtr(&status, md, "jobType");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item jobType");
+        return false;
+    }
     psS32 result = psMetadataLookupS32(&status, md, "result");
     if (!status) {
@@ -25555,5 +25620,5 @@
     }
 
-    return pstampJobRowAlloc(job_id, req_id, state, result, uri, outputBase, args);
+    return pstampJobRowAlloc(job_id, req_id, state, jobType, result, uri, outputBase, args);
 }
 psArray *pstampJobSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)