Changeset 27838 for branches/tap_branches/ippTools/src/pxmagic.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pxmagic.c (modified) (3 diffs)

branches/tap_branches/ippTools/src

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

branches/tap_branches/ippTools/src/pxmagic.c

@@ -35 +35 @@
     psString query_temp = pxDataGet(queryFile);
     if (!query_temp) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", queryFile);
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement from %s", queryFile);
         psFree(queryFile);
         if (!psDBRollback(config->dbh)) {
@@ -75 +75 @@
     if (not_destreaked) {
         if (destreaked) {
-            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
+            psError(PXTOOLS_ERR_CONFIG, true, "providing -not_destreaked and -destreaked makes no sense");
             return false;
         }
         if (magicked) {
-            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
+            psError(PXTOOLS_ERR_CONFIG, true, "providing -not_destreaked and -magicked makes no sense");
             return false;
         }
@@ -87 +87 @@
         psStringAppend(out, " AND %s.magicked != 0", table);
     }
+    // Note -magicked is  handled by the caller. XXX: Why?
     return true;
 }

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr