Changeset 18076 for branches/cleanup/ippTools/src/pxinject.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)
• pxinject.c (modified) (3 diffs)

branches/cleanup/ippTools/src

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

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

branches/cleanup/ippTools/src/pxinject.c

@@ -91 +91 @@
 
     if (!newExpInsert(config->dbh,
-                0x0, // exp_id
+                0x0,    // exp_id
                 tmp_exp_name,
                 tmp_camera,
                 tmp_telescope,
-                "reg", // state
+                "reg",  // state
                 workdir,
                 "dirty",
@@ -101 +101 @@
                 dvodb,
                 tess_id,
-            end_stage,
-              label
+                end_stage,
+                label,
+                NULL    // epoch
             )
         ) {
@@ -141 +142 @@
 
     // insert with error flag state set to 0 (no errors)
-    if (!newImfileInsert(config->dbh, (psS64)atoll(exp_id), tmp_class_id, uri)) {
+    if (!newImfileInsert(config->dbh, (psS64)atoll(exp_id), tmp_class_id, uri, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;

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