Changeset 9057 for trunk/ippTools/src/pxinject.c

Timestamp:

Sep 28, 2006, 5:25:54 PM (20 years ago)

Author:

jhoblitt

Message:

require ippdb 0.0.38
the "big" exp_id -> exp_tag conversion

File:

• trunk/ippTools/src/pxinject.c (modified) (4 diffs)

trunk/ippTools/src/pxinject.c

@@ -52 +52 @@
     bool status = false;
 
+    psString exp_tag = psMetadataLookupStr(&status, config->args, "-exp_tag");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_tag");
+        return false;
+    }
+    if (!exp_tag) {
+        psError(PS_ERR_UNKNOWN, true, "-exp_tag is required");
+        return false;
+    }
     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
     if (!status) {
@@ -98 +107 @@
     }
 
-    if (!newExpInsert(config->dbh, exp_id, camera, telescope, exp_type, imfiles)) {
+    if (!newExpInsert(config->dbh, exp_tag, exp_id, camera, telescope, exp_type, imfiles)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -110 +119 @@
     bool status = false;
 
-    psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
+    psString exp_tag = psMetadataLookupStr(&status, config->args, "-exp_tag");
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_tag");
         return false;
     }
-    if (!exp_id) {
-        psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
+    if (!exp_tag) {
+        psError(PS_ERR_UNKNOWN, true, "-exp_tag is required");
         return false;
     }
@@ -147 +156 @@
     }
 
-    if (!newImfileInsert(config->dbh, exp_id, class, class_id, uri)) {
+    if (!newImfileInsert(config->dbh, exp_tag, class, class_id, uri)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;