Changeset 16544

Timestamp:

Feb 19, 2008, 10:41:00 AM (18 years ago)

Author:

bills

Message:

having status for a column name causes build issues. change to result.
Also changes to the pstampDataStore table.

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/pstamptool.c

@@ -108 +108 @@
 
     psString lastFileset = psMetadataLookupStr(&status, config->args, "-last_fileset");
+    psString state = psMetadataLookupStr(&status, config->args, "-state");
+    if (!state) {
+        state = "enabled";
+    }
 
     if (!pstampDataStoreInsert(config->dbh,
             0,
             uri,
-            lastFileset
+            lastFileset,
+            state
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -182 +187 @@
         return false;
     }
-    if (!lastFileset) {
-        psError(PS_ERR_UNKNOWN, true, "-last_fileset is required");
-        return false;
-    }
-
-    char *query ="UPDATE pstampDataStore"
-                 " SET lastFileset = '%s'"
-                 " WHERE ds_id = '%s'";
-
-    if (!p_psDBRunQuery(config->dbh, query, lastFileset, ds_id)) {
+    psString state = psMetadataLookupStr(&status, config->args, "-state");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -state");
+        return false;
+    }
+
+    if (!state && !lastFileset) {
+        psError(PS_ERR_UNKNOWN, true, "one of -last_fileset or -state is required");
+        return false;
+    }
+
+    char *query = NULL;
+    bool needComma = false;
+    
+    psStringAppend(&query, "UPDATE pstampDataStore SET");
+
+    if (lastFileset) {
+        psStringAppend(&query, " lastFileset = '%s'", lastFileset);
+        needComma = true;
+    }
+
+    if (state) {
+        psStringAppend(&query, "%s state = '%s'", needComma ? "," : " ",
+            state);
+        needComma = true; // be ready in case we add another field
+    }
+                
+    psStringAppend(&query, " WHERE ds_id = '%s'", ds_id);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);

trunk/ippTools/src/pstamptoolConfig.c

@@ -49 +49 @@
     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
             "define storage uri", NULL);
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-state", 0,
+            "define storage uri", NULL);
     
     // -datastore
@@ -60 +62 @@
             "define ds_id", NULL); 
     psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
+            "define storage uri", NULL);
+    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-state", 0,
             "define storage uri", NULL);
 
@@ -123 +127 @@
     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0,
             "new state", NULL); 
-    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-status", 0,
-            "new status", NULL); 
+    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-result", 0,
+            "new result", NULL); 
 
 #define PXTOOL_MODE(option, modeval, argset) \