Changeset 10013

Timestamp:

Nov 15, 2006, 5:52:57 PM (20 years ago)

Author:

jhoblitt

Message:

rename *.time filed -> dateobs
call gentag() stored func to generate exp_tag

File:

• trunk/ippTools/src/pzgetexp.c (modified) (6 diffs)

trunk/ippTools/src/pzgetexp.c

@@ -41 +41 @@
     psString lastFileSet = NULL;
     {
-        char *query = "SELECT * from summitExp ORDER BY time DESC LIMIT 1";
+        char *query = "SELECT * from summitExp ORDER BY dateobs DESC LIMIT 1";
         if (!p_psDBRunQuery(config->dbh, query)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -104 +104 @@
     {
         char *query = "CREATE TEMPORARY TABLE incoming" 
-            " (exp_id VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), time DATETIME, exp_type VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_id, camera, telescope))"
+            " (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))"
            " ENGINE=MEMORY";
         if (!p_psDBRunQuery(config->dbh, query)) {
@@ -114 +114 @@
 
     {
-        char *query = "INSERT INTO incoming (exp_id, camera, telescope, time, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+        char *query = "INSERT INTO incoming (exp_id, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
 
         long inserted = p_psDBRunQueryPrepared(config->dbh, newSummitExps, query);
@@ -132 +132 @@
     psFree(newSummitExps);
 
+    // add new exps to pzPendingExp -- must be done before the new exps are
+    // added to summitExp because of the SQL logic
+    {
+        char *query = 
+            "INSERT INTO pzPendingExp" 
+            "   SElECT"
+            "       incoming.exp_id,"
+            "       incoming.camera,"
+            "       incoming.telescope,"
+            "       gentag(incoming.exp_id)"
+            "   FROM incoming"
+            "   LEFT JOIN summitExp"
+            "       USING(exp_id, camera, telescope)"
+            "   WHERE"
+            "       summitExp.exp_id is NULL"
+            "       AND summitExp.camera is NULL"
+            "       AND summitExp.telescope is NULL";
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            goto FAIL;
+        }
+    }
+
+    // add new exps to summitExp
     {
         char *query = 
@@ -210 +235 @@
         char *uri       = psListGetAndIncrement(tokenCursor);
         char *exp_id    = psListGetAndIncrement(tokenCursor); // fileset
-        char *timeStr   = psListGetAndIncrement(tokenCursor); // datetime
+        char *dateobsStr= psListGetAndIncrement(tokenCursor); // datetime
         char *exp_type  = psListGetAndIncrement(tokenCursor); // type
 
@@ -236 +261 @@
             return NULL;
         }
-        psTime *time = psTimeFromISO(timeStr, PS_TIME_UTC);
-        if (!psMetadataAddTime(md, PS_LIST_TAIL, "time", 0, NULL, time)) {
+        psTime *dateobs = psTimeFromISO(dateobsStr, PS_TIME_UTC);
+        if (!psMetadataAddTime(md, PS_LIST_TAIL, "dateobs", 0, NULL, dateobs)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item telescope");
-            psFree(time);
-            psFree(md);
-            psFree(tokenCursor);
-            psFree(tokens);
-            return NULL;
-        }
-        psFree(time);
+            psFree(dateobs);
+            psFree(md);
+            psFree(tokenCursor);
+            psFree(tokens);
+            return NULL;
+        }
+        psFree(dateobs);
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, exp_type)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type");