Changeset 16931

Timestamp:

Mar 10, 2008, 5:04:43 PM (18 years ago)

Author:

bills

Message:

changed to support get_image (no postage stamp) jobs

Location:

trunk/ippTools/src

Files:

• pstamptool.c (modified) (3 diffs)
• pstamptoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/pstamptool.c

@@ -290 +290 @@
 
     char *query ="INSERT INTO pstampRequest"
-                 " (state, uri, ds_id, outFileset)"
-                 " VALUES( 'new', '%s', %s, '%s')";
+                 " (state, uri, ds_id, outFileset, resultsFile)"
+                 " VALUES( 'new', '%s', %s, '%s', 1)";
 
     if (!p_psDBRunQuery(config->dbh, query, uri, ds_id, outFileset)) {
@@ -433 +433 @@
 {
     bool    status;
-
-    PS_ASSERT_PTR_NON_NULL(config, false);
+    bool    stampJob = false;
+
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString job_type = psMetadataLookupStr(&status, config->args, "-job_type");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -job_type");
+        return false;
+    }
+    if (job_type) {
+        if (!strcmp(job_type, "get_image")) {
+            stampJob = false;
+        } else if (!strcmp(job_type, "stamp")) {
+            stampJob = true;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "unknown value for -job_type: %s", job_type);
+            return false;
+        }
+    } else {
+        job_type = "stamp";
+        stampJob = true;
+    }
 
     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
@@ -472 +492 @@
     }
     if (!argString) {
-        psError(PS_ERR_UNKNOWN, true, "-args is required");
-        return false;
-    }
-
-    char *query ="INSERT INTO pstampJob"
-                 " (req_id, state, uri, outputBase, args)"
+        if (stampJob) {
+            psError(PS_ERR_UNKNOWN, true, "-args is required");
+            return false;
+        }
+    }
+
+    char *query;
+    
+    if (stampJob) {
+        query ="INSERT INTO pstampJob"
+                 " (req_id, state, jobType, uri, outputBase, args)"
+                 " VALUES( %s, 'run', '%s', '%s', '%s', '%s')";
+    } else {
+        query ="INSERT INTO pstampJob"
+                 " (req_id, state, jobType, uri, outputBase)"
                  " VALUES( %s, 'run', '%s', '%s', '%s')";
-
-    if (!p_psDBRunQuery(config->dbh, query, req_id, uri, outputBase, argString)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query, req_id, job_type, uri, outputBase, argString)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
     }

trunk/ippTools/src/pstamptoolConfig.c

@@ -104 +104 @@
     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0,
             "define job req_id", NULL); 
+    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,
+            "define job job_type", NULL); 
     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,
             "define job outputBase", NULL); 
@@ -160 +162 @@
     psMetadata *modes = psMetadataAlloc();
 
-    PXOPT_ADD_MODE("-adddatastore",    "", PSTAMPTOOL_MODE_ADDDATASTORE, adddatastoreArgs);
-    PXOPT_ADD_MODE("-datastore",       "", PSTAMPTOOL_MODE_DATASTORE,    datastoreArgs);
-    PXOPT_ADD_MODE("-moddatastore",    "", PSTAMPTOOL_MODE_MODDATASTORE, moddatastoreArgs);
-
     PXOPT_ADD_MODE("-addreq",          "", PSTAMPTOOL_MODE_ADDREQ,       addreqArgs);
     PXOPT_ADD_MODE("-pendingreq",      "", PSTAMPTOOL_MODE_PENDINGREQ,   pendingreqArgs);
@@ -172 +170 @@
     PXOPT_ADD_MODE("-pendingjob",      "", PSTAMPTOOL_MODE_PENDINGJOB,   pendingjobArgs);
     PXOPT_ADD_MODE("-processedjob",    "", PSTAMPTOOL_MODE_PROCESSEDJOB, processedjobArgs);
+
+    PXOPT_ADD_MODE("-adddatastore",    "", PSTAMPTOOL_MODE_ADDDATASTORE, adddatastoreArgs);
+    PXOPT_ADD_MODE("-datastore",       "", PSTAMPTOOL_MODE_DATASTORE,    datastoreArgs);
+    PXOPT_ADD_MODE("-moddatastore",    "", PSTAMPTOOL_MODE_MODDATASTORE, moddatastoreArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {