Changeset 10405 for trunk/ippTools/src/pzgetimfiles.c

Timestamp:

Dec 1, 2006, 2:31:01 PM (20 years ago)

Author:

jhoblitt

Message:

add DataStore file_id support

File:

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

trunk/ippTools/src/pzgetimfiles.c

@@ -215 +215 @@
     {
         char *query = 
-            "CREATE TEMPORARY TABLE incoming (exp_id VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), bytes INT, md5sum VARCHAR(32), class VARCHAR(64), class_id VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_id, camera, telescope, class, class_id)) ENGINE=MEMORY";
+            "CREATE TEMPORARY TABLE incoming (exp_id VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), file_id VARCHAR(64), bytes INT, md5sum VARCHAR(32), class VARCHAR(64), class_id VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_id, camera, telescope, class, class_id)) ENGINE=MEMORY";
 
         if (!p_psDBRunQuery(config->dbh, query)) {
@@ -230 +230 @@
     // load the imfiles (files) into the temp table
     {
-        char *query = "INSERT INTO incoming (exp_id, camera, telescope, bytes, md5sum, class, class_id, uri) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+        char *query = "INSERT INTO incoming (exp_id, camera, telescope, file_id, bytes, md5sum, class, class_id, uri) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
         long inserted = p_psDBRunQueryPrepared(config->dbh, newImfiles, query);
@@ -303 +303 @@
             "       incoming.bytes,"
             "       incoming.md5sum,"
+            "       incoming.file_id,"
             "       incoming.class,"
             "       incoming.class_id,"
@@ -569 +570 @@
         // check that we have the right number of tokens
         // print "# uri fileid bytes md5sum type \n";
-        if (psListLength(tokens) != 5) {
+        if (!psListLength(tokens) > 5) {
             psError(PS_ERR_UNKNOWN, true, "invalid line format: %s", line);
+            psFree(tokens);
+            psFree(pzPendingImfiles);                
+            psFree(lineCursor);
+            psFree(doc);
             return false;
         }
@@ -577 +582 @@
         psListIterator *tokenCursor = psListIteratorAlloc(tokens, 0, false);
         char *uri       = psListGetAndIncrement(tokenCursor);
-        char *class_id  = psListGetAndIncrement(tokenCursor); // fileid
+        char *file_id   = psListGetAndIncrement(tokenCursor); // fileid
         char *bytes     = psListGetAndIncrement(tokenCursor); // bytes
         char *md5sum    = psListGetAndIncrement(tokenCursor); // md5sum
         char *class     = psListGetAndIncrement(tokenCursor); // type
+        char *class_id  = psListGetAndIncrement(tokenCursor); // chipname
 
         // create a new metadata to represent this line and it's values
@@ -600 +606 @@
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, telescope)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item telescope");
+            psFree(md);
+            psFree(tokenCursor);
+            psFree(tokens);
+            return NULL;
+        }
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "file_id", 0, NULL, file_id)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item bytes");
             psFree(md);
             psFree(tokenCursor);