Changeset 28856 for trunk/ippTools/src/addtool.c

Timestamp:

Aug 5, 2010, 5:38:46 PM (16 years ago)

Author:

Serge CHASTEL

Message:

addtool -definebyquery optimization

File:

• trunk/ippTools/src/addtool.c (modified) (1 diff)

trunk/ippTools/src/addtool.c

@@ -144 +144 @@
     PXOPT_LOOKUP_BOOL(simple,     config->args, "-simple", false);
 
-
-
-    // find the cam_id of all the exposures that we want to queue up.
-    psString bare_query = pxDataGet("addtool_find_cam_id.sql");
-    if (!bare_query) {
-        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
-        psFree(where);
-        return false;
-    }
-
     // prevent queueing an addRun if a given exposure has already been added to
     // the given dvo database
     psString dvodb_string = NULL;
+    psString bare_query = NULL;
     if (dvodb) {
-        // user supplied dvodb
-        psStringAppend(&dvodb_string, "(previous_dvodb = '%s')", dvodb);
+      psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_cam_id_dvo.sql\n", dvodb);
+        // find the cam_id of all the exposures that we want to queue up.
+        bare_query = pxDataGet("addtool_find_cam_id_dvo.sql");
+        // user supplied dvodb
+        psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb);
     } else {
+        psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_cam_id.sql\n");
+        // find the cam_id of all the exposures that we want to queue up.
+        bare_query = pxDataGet("addtool_find_cam_id.sql");
         // inherit dvodb from camRun, avoid matching NULL
         psStringAppend(&dvodb_string, "(camRun.dvodb IS NOT NULL AND previous_dvodb = camRun.dvodb)");
+    }
+    if (!bare_query) {
+        psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement");
+        psFree(where);
+        return false;
     }
     // Take the bare query and add the dvodb selector