Changeset 34047 for branches/eam_branches/ipp-20120601/ippTools

Timestamp:

Jun 20, 2012, 12:21:48 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601/ippTools

Files:

• share/addtool_find_sky_id_multi.sql (modified) (1 diff)
• share/addtool_find_sky_id_multi_dvo.sql (modified) (1 diff)
• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• share/warptool_towarped.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/addtool.c (modified) (5 diffs)
• src/magictool.c (modified) (1 prop)

branches/eam_branches/ipp-20120601/ippTools/share/addtool_find_sky_id_multi.sql

@@ -2 +2 @@
      distinct(sky_id) as stage_id,
      staticskyRun.*,
-    staticskyResult.num_inputs
+    staticskyResult.num_inputs, stack_id
 FROM 
      staticskyRun

branches/eam_branches/ipp-20120601/ippTools/share/addtool_find_sky_id_multi_dvo.sql

@@ -1 @@
-SELECT distinct(sky_id) as stage_id, staticskyRun.*, staticskyResult.num_inputs FROM staticskyResult
+SELECT distinct(sky_id) as stage_id, staticskyRun.*, staticskyResult.num_inputs, stack_id FROM staticskyResult
 JOIN staticskyRun USING(sky_id)
 join staticskyInput using(sky_id)

branches/eam_branches/ipp-20120601/ippTools/src/addtool.c

@@ -292 +292 @@
       // }
     if (strcmp(stage,"staticsky") == 0) {
-      psStringAppend(&query, " GROUP BY sky_id");  //some reason it needs this
+      psStringAppend(&query, " GROUP BY sky_id, stack_id");  //some reason it needs this
       }
 
@@ -525 +525 @@
         psS64 stage_id =0; 
         bool status = false;
-        psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
+        //psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
+        psS32 stack_id = psMetadataLookupS32(&status, md, "stack_id");
+
         if (!status) {
-          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs");
+          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stack_id");
           return false;
         }
@@ -540 +542 @@
 
         // queue the exp
-        for (int filter_id = 0; filter_id < num_inputs; filter_id++) {  
-        if (!pxaddQueueByCamID(config,
+        //for (int filter_id = 0; filter_id < num_inputs; filter_id++) {  
+          if (!pxaddQueueByCamID(config,
                                stage,
-                               stage_id,
-                               filter_id,
+                               stage_id,
+                               stack_id,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,
@@ -555 +557 @@
                                minidvodb_group,
                                minidvodb_name
-        )) {
+                                 )) {
             if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error sfg");
+              psError(PS_ERR_UNKNOWN, false, "database error sfg");
             }
             psError(PS_ERR_UNKNOWN, false,
@@ -564 +566 @@
             psFree(output);
             return false;
-        }
-        }
+          }
+          //}
         psFree(row);
     }