Changeset 16957

Timestamp:

Mar 12, 2008, 11:20:53 AM (18 years ago)

Author:

bills

Message:

added mode to list a request. Used by the web interface to check request
status

Location:

trunk/ippTools/src

Files:

• pstamptool.c (modified) (5 diffs)
• pstamptool.h (modified) (1 diff)
• pstamptoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/pstamptool.c

@@ -35 +35 @@
 static bool moddatastoreMode(pxConfig *config);
 static bool addReqMode(pxConfig *config);
+static bool listReqMode(pxConfig *config);
 static bool pendingReqMode(pxConfig *config);
 static bool processedReqMode(pxConfig *config);
@@ -65 +66 @@
         MODECASE(PSTAMPTOOL_MODE_MODDATASTORE, moddatastoreMode);
         MODECASE(PSTAMPTOOL_MODE_ADDREQ, addReqMode);
+        MODECASE(PSTAMPTOOL_MODE_LISTREQ, listReqMode);
         MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingReqMode);
         MODECASE(PSTAMPTOOL_MODE_PROCESSEDREQ, processedReqMode);
@@ -254 +256 @@
 }
 
+#define  MAGIC_STR  "$REQ_ID"
+
+// Replace $REQ_ID with the value of the request id if present in the outFileset
+
+static bool
+updateFilesetID(pxConfig *config, psS64 req_id, psString outFileset)
+{
+    char *magic;
+
+    magic = strcasestr(outFileset, MAGIC_STR);
+    if (magic == NULL) {
+        return true;
+    }
+
+    // find part of the string after the magic
+    char *after = magic + strlen(MAGIC_STR);
+
+    if (*after == 0) {
+        after = NULL;
+    }
+
+    psString converted = NULL;
+    if (magic > outFileset) {
+        int len = magic - outFileset;
+        converted = psStringAlloc(len + 1);
+        strncpy(converted, outFileset, len);
+        converted[len] = 0;
+    }
+
+    psStringAppend(&converted, "%" PRId64, req_id);
+    if (after) {
+        psStringAppend(&converted, after);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, "UPDATE pstampRequest set outFileset = '%s' WHERE req_id = %" PRId64,
+            converted, req_id)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
 static bool addReqMode(pxConfig *config)
 {
@@ -307 +352 @@
 
     psS64 req_id = psDBLastInsertID(config->dbh);
+    if (!updateFilesetID(config, req_id, outFileset)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to update fileset id\n");
+        return false;
+    }
+
     printf("%" PRId64 "\n", req_id);
 
@@ -334 +384 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    }
+
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("pstamptool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            psFree(output);
+            return false;
+        }
+    }
+
+    // negative simple so the default is true
+    if (!ippdbPrintMetadatas(stdout, output, "pstampRequest", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
+
+    return true;
+}
+static bool listReqMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
+        return false;
+    }
+
+    psString query = NULL;
+
+    psString req_id = psMetadataLookupStr(&status, config->args, "-req_id");
+    
+    if (req_id) {
+        psStringAppend(&query,
+                "SELECT"
+                " *"
+                " FROM pstampRequest"
+                " WHERE req_id = %s", req_id
+            );
+    } else {
+        fprintf(stderr, "req_id must be specified\n");
+        exit (1);
     }
 

trunk/ippTools/src/pstamptool.h

@@ -29 +29 @@
     PSTAMPTOOL_MODE_MODDATASTORE,
     PSTAMPTOOL_MODE_ADDREQ,
+    PSTAMPTOOL_MODE_LISTREQ,
     PSTAMPTOOL_MODE_PENDINGREQ,
     PSTAMPTOOL_MODE_PROCESSEDREQ,

trunk/ippTools/src/pstamptoolConfig.c

@@ -89 +89 @@
             "limit result set to N items", 0);
     psMetadataAddBool(pendingreqArgs, PS_LIST_TAIL, "-simple", 0,
+            "use the simple output format", false);
+
+    // -listreq
+    psMetadata *listreqArgs = psMetadataAlloc();
+    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,
+            "define req_id", NULL); 
+    psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
+    psMetadataAddBool(listreqArgs, PS_LIST_TAIL, "-simple", 0,
             "use the simple output format", false);
 
@@ -165 +174 @@
     PXOPT_ADD_MODE("-pendingreq",      "", PSTAMPTOOL_MODE_PENDINGREQ,   pendingreqArgs);
     PXOPT_ADD_MODE("-processedreq",    "", PSTAMPTOOL_MODE_PROCESSEDREQ, processedreqArgs);
+    PXOPT_ADD_MODE("-listreq",         "", PSTAMPTOOL_MODE_LISTREQ,      listreqArgs);
 
     PXOPT_ADD_MODE("-addjob",          "", PSTAMPTOOL_MODE_ADDJOB,       addjobArgs);