Changeset 14023 for trunk/ippTools/src/pzgetexp.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/pzgetexp.c (modified) (8 diffs)

trunk/ippTools/src/pzgetexp.c

@@ -68 +68 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
-    // find last fileset/exp_id (if we have one)
+    // find last fileset/exp_name (if we have one)
     bool haveLastFileSet = false;
     psString lastFileSet = NULL;
@@ -90 +90 @@
             haveLastFileSet = true;
             bool status = false;
-            lastFileSet = psStringCopy(psMetadataLookupStr(&status, output->data[0], "exp_id"));
+            lastFileSet = psStringCopy(psMetadataLookupStr(&status, output->data[0], "exp_name"));
             psFree(output);
         }
@@ -142 +142 @@
     {
         char *query = "CREATE TEMPORARY TABLE incoming" 
-            " (exp_id VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), dateobs DATETIME, exp_type VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_id, camera, telescope))"
+            " (exp_name VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), dateobs DATETIME, exp_type VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_name, camera, telescope))"
            " ENGINE=MEMORY";
         if (!p_psDBRunQuery(config->dbh, query)) {
@@ -156 +156 @@
 
     {
-        char *query = "INSERT INTO incoming (exp_id, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+        char *query = "INSERT INTO incoming (exp_name, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
 
         long inserted = p_psDBRunQueryPrepared(config->dbh, newSummitExps, query);
@@ -188 +188 @@
             "INSERT INTO pzPendingExp" 
             "   SElECT"
-            "       incoming.exp_id,"
+            "       incoming.exp_name,"
             "       incoming.camera,"
             "       incoming.telescope"
             "   FROM incoming"
             "   LEFT JOIN summitExp"
-            "       USING(exp_id, camera, telescope)"
+            "       USING(exp_name, camera, telescope)"
             "   WHERE"
-            "       summitExp.exp_id is NULL"
+            "       summitExp.exp_name is NULL"
             "       AND summitExp.camera is NULL"
             "       AND summitExp.telescope is NULL";
@@ -218 +218 @@
             "   FROM incoming"
             "   LEFT JOIN summitExp"
-            "       USING(exp_id, camera, telescope)"
+            "       USING(exp_name, camera, telescope)"
             "   WHERE"
-            "       summitExp.exp_id is NULL"
+            "       summitExp.exp_name is NULL"
             "       AND summitExp.camera is NULL"
             "       AND summitExp.telescope is NULL";
@@ -296 +296 @@
         psListIterator *tokenCursor = psListIteratorAlloc(tokens, 0, false);
         char *uri       = psListGetAndIncrement(tokenCursor);
-        char *exp_id    = psListGetAndIncrement(tokenCursor); // fileset
+        char *exp_name    = psListGetAndIncrement(tokenCursor); // fileset
         char *dateobsStr= psListGetAndIncrement(tokenCursor); // datetime
         char *exp_type  = psListGetAndIncrement(tokenCursor); // type
@@ -302 +302 @@
         // create a new metadata to represent this line and it's values
         psMetadata *md = psMetadataAlloc();
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, exp_id)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_name", 0, NULL, exp_name)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_name");
             psFree(md);
             psFree(tokenCursor);