Changeset 18076 for branches/cleanup/ippTools/src/pztool.c

Timestamp:

Jun 10, 2008, 4:02:14 PM (18 years ago)

Author:

jhoblitt

Message:

MERGE from HEAD

Location:

branches/cleanup/ippTools/src

Files:

• . (modified) (1 prop)
• pztool.c (modified) (5 diffs)

branches/cleanup/ippTools/src

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect

branches/cleanup/ippTools/src/pztool.c

@@ -111 +111 @@
             camera,
             telescope,
-            uri
+            uri,
+            NULL  // epoch
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -370 +371 @@
             class_id,
             uri,
-            code
+            code,
+            NULL    // epoch
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -484 +486 @@
 
         pzDownloadExpRow *doneExp = pzDownloadExpObjectFromMetadata(row);
+        if (!doneExp) {
+            psError(PS_ERR_UNKNOWN, false, "pzDownloadExpObjectFromMetadata() failed");
+            psFree(doneExp);
+            psFree(output);
+            return false;
+        }
 
         if (!newExpInsert(config->dbh,
@@ -497 +505 @@
                     tess_id,            // tess_id
                     end_stage,          // end_stage
-                   label
+                    label,
+                    NULL                // epoch
                 )
         ) {
@@ -515 +524 @@
                 "       %" PRId64 "," // exp_id
                 "       pzDownloadImfile.class_id," // tmp_class_id
-                "       pzDownloadImfile.uri" // uri
+                "       pzDownloadImfile.uri," // uri
+                "       NULL" // epoch
                 "   FROM pzDownloadImfile"
                 "   WHERE"

@@ -23 +23 @@
 difftool
 stacktool
+faketool
 dettool
 detselect