Changeset 28486 for trunk/ippTools/src/pxtools.c

Timestamp:

Jun 24, 2010, 3:02:57 PM (16 years ago)

Author:

Paul Price

Message:

Merging (reintegrating) branches/pap (background restoration).

Location:

trunk

Files:

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

trunk/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

trunk/ippTools/src/pxtools.c

@@ -48 +48 @@
 }
 
+bool pxIsValidCleanedState(const char *state)
+{
+    PS_ASSERT_PTR_NON_NULL(state, false);
+
+    if (!strcmp(state, "cleaned")) return true;
+    if (!strcmp(state, "purged")) return true;
+    if (!strcmp(state, "scrubbed")) return true;
+    return false;
+}
+
 psString pxMergeCodeVersions(psString version1, psString version2)
 {
@@ -211 +221 @@
 
 // change the value for tableName.columName from 'full' to 'cleaned' if necessary
-bool pxSetStateCleaned(const psString tableName, const psString columnName, psArray *rows)
+bool pxSetStateCleaned(const char *tableName, const char *columnName, psArray *rows)
 {
     for (long i = 0; i < psArrayLength(rows); i++) {
         psMetadata *row = rows->data[i];
-        psString state = psMetadataLookupStr(NULL, row, columnName);
+        const char *state = psMetadataLookupStr(NULL, row, columnName);
         if (!state) {
             psError(PS_ERR_PROGRAMMING, false, "%s not found in row %ld of table %s",

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool