Changeset 14023 for trunk/ippTools/src/pztool.c

Timestamp:

Jul 5, 2007, 3:16:08 PM (19 years ago)

Author:

jhoblitt

Message:

rename exp_id -> exp_name
rename exp_tag -> exp_id
add add rawExp.exp_tag for use as an external name only

File:

• trunk/ippTools/src/pztool.c (modified) (11 diffs)

trunk/ippTools/src/pztool.c

@@ -140 +140 @@
             " FROM pzPendingExp"
             " JOIN summitExp"
-            "   USING(exp_id, camera, telescope)"
+            "   USING(exp_name, camera, telescope)"
         );
 
@@ -197 +197 @@
             "SELECT"
             "   summitImfile.*,"
-            "   pzPendingImfile.exp_tag"
+            "   pzPendingImfile.exp_id"
             " FROM pzPendingImfile"
             " JOIN summitImfile"
-            "   USING(exp_id, camera, telescope, class, class_id)"
+            "   USING(exp_name, camera, telescope, class, class_id)"
         );
 
@@ -255 +255 @@
 
     bool status = false;
-    psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
-        return false;
-    }
-    if (!exp_id) {
-        psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
+    psString exp_name = psMetadataLookupStr(&status, config->args, "-exp_name");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_name");
+        return false;
+    }
+    if (!exp_name) {
+        psError(PS_ERR_UNKNOWN, true, "-exp_name is required");
         return false;
     }
@@ -315 +315 @@
     }
 
-    // need to know exp_id, camera, telescope, class, class_id (to find the
+    // need to know exp_name, camera, telescope, class, class_id (to find the
     // pzPendingImfile entry and the URI for the newImfile entry.
 
@@ -329 +329 @@
             "INSERT INTO newImfile"
             "   SElECT"
-            "       pzPendingImfile.exp_tag,"
+            "       pzPendingImfile.exp_id,"
             "       pzPendingImfile.class,"
             "       pzPendingImfile.class_id,"
@@ -336 +336 @@
             "   FROM pzPendingImfile"
             "   WHERE"
-            "       pzPendingImfile.exp_id = '%s'"
+            "       pzPendingImfile.exp_name = '%s'"
             "       AND pzPendingImfile.camera = '%s'"
             "       AND pzPendingImfile.telescope = '%s'"
@@ -342 +342 @@
             "       AND pzPendingImfile.class_id = '%s'";
 
-        if (!p_psDBRunQuery(config->dbh, query, uri, exp_id, camera, telescope, class, class_id)) {
+        if (!p_psDBRunQuery(config->dbh, query, uri, exp_name, camera, telescope, class, class_id)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -372 +372 @@
             "   FROM pzPendingImfile"
             "   WHERE"
-            "       pzPendingImfile.exp_id = '%s'"
+            "       pzPendingImfile.exp_name = '%s'"
             "       AND pzPendingImfile.camera = '%s'"
             "       AND pzPendingImfile.telescope = '%s'"
@@ -378 +378 @@
             "       AND pzPendingImfile.class_id = '%s'";
 
-        if (!p_psDBRunQuery(config->dbh, query, uri, exp_id, camera, telescope, class, class_id)) {
+        if (!p_psDBRunQuery(config->dbh, query, uri, exp_name, camera, telescope, class, class_id)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -404 +404 @@
             "DELETE FROM pzPendingImfile"
             "   WHERE"
-            "       pzPendingImfile.exp_id = '%s'"
+            "       pzPendingImfile.exp_name = '%s'"
             "       AND pzPendingImfile.camera = '%s'"
             "       AND pzPendingImfile.telescope = '%s'"
@@ -410 +410 @@
             "       AND pzPendingImfile.class_id = '%s'";
 
-        if (!p_psDBRunQuery(config->dbh, query, exp_id, camera, telescope, class, class_id)) {
+        if (!p_psDBRunQuery(config->dbh, query, exp_name, camera, telescope, class, class_id)) {
             // rollback
             if (!psDBRollback(config->dbh)) {