Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippTools/src/difftool.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/difftool.c (modified) (4 diffs)

branches/eam_branches/ps2-tc3-20130727/ippTools/src

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+

branches/eam_branches/ps2-tc3-20130727/ippTools/src/difftool.c

@@ -1253 +1253 @@
   PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
   PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false);
+  PXOPT_LOOKUP_STR(warp_data_group, config->args, "-data_group", false, false);
   
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -1260 +1261 @@
 
 
+  if (!data_group) {
+    if (warp_data_group) {
+      data_group = warp_data_group;
+    }
+  }
+  
   // Get query file
   psString query = pxDataGet("difftool_definewarpstack.sql");
@@ -1342 +1349 @@
     if (!mdok) {
         psError(PXTOOLS_ERR_PROG, false, "exp_id not found");
+        if (!psDBRollback(config->dbh)) {
+          psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        return false;
+    }
+    psString warpDataGroup = psMetadataLookupStr(&mdok, row, "warpDataGroup");
+    if (!mdok) {
+        psError(PXTOOLS_ERR_PROG, false, "warpDataGroup not found");
         if (!psDBRollback(config->dbh)) {
           psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1384 +1399 @@
                                         workdir,
                                         label,
-                                        data_group ? data_group : label,
+                                        data_group ? data_group : warpDataGroup,
                                         dist_group,
                                         reduction,

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+