Changeset 15032

Timestamp:

Sep 26, 2007, 11:13:41 AM (19 years ago)

Author:

jhoblitt

Message:

fix -copydone to work with exp's with more than 1 imfile
add -pending[exp|imfile] -limit n options

Location:

trunk/ippTools/src

Files:

• pztool.c (modified) (6 diffs)
• pztoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/pztool.c

@@ -137 +137 @@
     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 = psStringCopy(
             "SELECT"
@@ -151 +158 @@
     }
 
+    // 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");
@@ -196 +210 @@
     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 = psStringCopy(
             "SELECT"
@@ -208 +229 @@
         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);
     }
 
@@ -478 +506 @@
         psS64 exp_id = psDBLastInsertID(config->dbh);
 
-        // insert new pzDoneImfile into newImfile
+        // insert new all pzDoneImfile for the exp into newImfile
         {
             char *query =
@@ -503 +531 @@
             } 
 
-            // sanity check: we should have inserted only one row
+            // sanity check: we should have inserted at least one row
             psU64 affected = psDBAffectedRows(config->dbh);
-            if (psDBAffectedRows(config->dbh) != 1) {
+            if (psDBAffectedRows(config->dbh) < 1) {
                 // rollback
                 if (!psDBRollback(config->dbh)) {
                     psError(PS_ERR_UNKNOWN, false, "database error");
                 }
-                psError(PS_ERR_UNKNOWN, false, "should have affected 1 row but %" PRIu64 " rows were modified", affected);
+                psError(PS_ERR_UNKNOWN, false, "should have affected at least 1 row but %" PRIu64 " rows were modified", affected);
                 psFree(doneExp);
                 psFree(output);

trunk/ippTools/src/pztoolConfig.c

@@ -66 +66 @@
     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0,
             "define exposure type", NULL); 
+    psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,
             "use the simple output format", false);
@@ -79 +81 @@
     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_type", 0,
             "define exposure type", NULL); 
+    psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0,
             "use the simple output format", false);
@@ -85 +89 @@
     psMetadata *copydoneArgs = psMetadataAlloc();
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_name", 0,
-            "define exposure ID", NULL); 
+            "define exposure ID (required)", NULL); 
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-inst", 0,
-            "define camera ID", NULL); 
+            "define camera ID (required)", NULL); 
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-telescope", 0,
-            "define telescope ID", NULL); 
+            "define telescope ID (required)", NULL); 
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0,
             "define class", NULL);