Changeset 16596 for trunk/ippTools/src/pstamptool.c

Timestamp:

Feb 21, 2008, 6:50:18 PM (18 years ago)

Author:

bills

Message:

Various updates

File:

• trunk/ippTools/src/pstamptool.c (modified) (6 diffs)

trunk/ippTools/src/pstamptool.c

@@ -106 +106 @@
         return false;
     }
+    psString outProduct = psMetadataLookupStr(&status, config->args, "-out_product");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to looku value for -out_product");
+        return false;
+    }
+    if (!outProduct) {
+        psError(PS_ERR_UNKNOWN, true, "-out_product is required");
+        return false;
+    }
 
     psString lastFileset = psMetadataLookupStr(&status, config->args, "-last_fileset");
@@ -115 +124 @@
     if (!pstampDataStoreInsert(config->dbh,
             0,
-            uri,
+            state,
             lastFileset,
-            state
+            outProduct,
+            uri
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -128 +138 @@
 static bool datastoreMode(pxConfig *config)
 {
-    PS_ASSERT_PTR_NON_NULL(config, false);
-
-    if (!p_psDBRunQuery(config->dbh, "SELECT * FROM pstampDataStore")) {
+    bool status = false;
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString ds_id = psMetadataLookupStr(&status, config->args, "-ds_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ds_id");
+        return false;
+    }
+
+    psString query = NULL;
+    psStringAppend(&query, "SELECT * FROM pstampDataStore");
+    if (ds_id) {
+        psStringAppend(&query, " WHERE ds_id = '%s'", ds_id);
+    }
+    if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -194 +216 @@
 
     if (!state && !lastFileset) {
-        psError(PS_ERR_UNKNOWN, true, "one of -last_fileset or -state is required");
+        psError(PS_ERR_UNKNOWN, true, "at least one of -last_fileset or -state is required");
         return false;
     }
@@ -247 +269 @@
         return false;
     }
+    psString outFileset = psMetadataLookupStr(&status, config->args, "-out_fileset");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -out_fileset");
+        return false;
+    }
+    if (!outFileset) {
+        psError(PS_ERR_UNKNOWN, true, "-out_fileset is required");
+        return false;
+    }
 
     // Data Store ID is optional
@@ -259 +290 @@
 
     char *query ="INSERT INTO pstampRequest"
-                 " (state, uri, ds_id)"
-                 " VALUES( 'new', '%s', %s)";
-
-    if (!p_psDBRunQuery(config->dbh, query, uri, ds_id)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
+                 " (state, uri, ds_id, outFileset)"
+                 " VALUES( 'new', '%s', %s, '%s')";
+
+    if (!p_psDBRunQuery(config->dbh, query, uri, ds_id, outFileset)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
     }