Changeset 36622 for branches/eam_branches/ipp-20140226/ippTools/src/difftool.c

Timestamp:

Mar 31, 2014, 11:50:56 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140226

Files:

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

branches/eam_branches/ipp-20140226/ippTools/src/difftool.c

@@ -1349 +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");
@@ -1391 +1399 @@
                                         workdir,
                                         label,
-                                        data_group ? data_group : label,
+                                        data_group ? data_group : warpDataGroup,
                                         dist_group,
                                         reduction,