Changeset 24557 for branches/eam_branches/20090522/ippTools/src/pxchip.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pxchip.c (modified) (5 diffs)

branches/eam_branches/20090522/ippTools/src

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

branches/eam_branches/20090522/ippTools/src/pxchip.c

@@ -175 +175 @@
     psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET state = '%s'");
 
-    if (where) {
+    if (where && psListLength(where->list) > 0) {
         psString whereClause = psDBGenerateWhereSQL(where, NULL);
         psStringAppend(&query, " %s", whereClause);
@@ -216 +216 @@
     psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET label = '%s'");
 
-    if (where) {
+    if (where && psListLength(where->list) > 0) {
         psString whereClause = psDBGenerateWhereSQL(where, NULL);
         psStringAppend(&query, " %s", whereClause);
@@ -264 +264 @@
             dvodb,
             tess_id,
-            end_stage, 
+            end_stage,
             0           // magicked
             )
@@ -277 +277 @@
     psS64 chip_id =  psDBLastInsertID(config->dbh);
 
-    // Create rows in chipImfile table for each input exposure. 
+    // Create rows in chipImfile table for each input exposure.
     // This creates the chip_image_id values
     psString query = "INSERT INTO chipImfile "
@@ -295 +295 @@
         return 0;
     }
-    
+
     return chip_id;
 }

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool