Changeset 27132 for trunk/ippTools/src/regtool.c

Timestamp:

Mar 2, 2010, 9:53:48 AM (16 years ago)

Author:

bills

Message:

accept -ra -decl -radius in regtool -processedexp

File:

• trunk/ippTools/src/regtool.c (modified) (3 diffs)

trunk/ippTools/src/regtool.c

@@ -347 +347 @@
     psString where2 = NULL;
     if (!pxmagicAddWhere(config, &where2, "rawImfile")) {
-        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxmagicAddWhere failed");
         return false;
     }
     if (!pxspaceAddWhere(config, &where2, "rawImfile")) {
-        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxspaceAddWhere failed");
         return false;
     }
@@ -965 +965 @@
     PXOPT_COPY_F32(config->args,   where,  "-sun_angle_max", "sun_angle", "<");
 
+    psString where2 = NULL;
+    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
+        return false;
+    }
+
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -973 +979 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
-    }
+    } 
     psFree(where);
+
+    if (where2) {
+        psStringAppend(&query, " %s ", where2);
+        psFree(where2);
+    }
 
     if (faulted) {