Changeset 15533 for trunk/ippdb/src/ippdb.c

Timestamp:

Nov 8, 2007, 5:34:06 PM (19 years ago)

Author:

jhoblitt

Message:

VERSION 1.1.29 (again)

File:

• trunk/ippdb/src/ippdb.c (modified) (9 diffs)

trunk/ippdb/src/ippdb.c

@@ -9592 +9592 @@
 static void warpSkyfileRowFree(warpSkyfileRow *object);
 
-warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF64 good_frac, bool ignore, psS16 fault)
+warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF64 good_frac, bool ignored, psS16 fault)
 {
     warpSkyfileRow  *_object;
@@ -9607 +9607 @@
     _object->bg_stdev = bg_stdev;
     _object->good_frac = good_frac;
-    _object->ignore = ignore;
+    _object->ignored = ignored;
     _object->fault = fault;
 
@@ -9664 +9664 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignore", PS_DATA_BOOL, "Key", 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item ignore");
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignored", PS_DATA_BOOL, "Key", 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item ignored");
         psFree(md);
         return false;
@@ -9687 +9687 @@
 }
 
-bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF64 good_frac, bool ignore, psS16 fault)
+bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF64 good_frac, bool ignored, psS16 fault)
 {
     psMetadata *md = psMetadataAlloc();
@@ -9730 +9730 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignore", PS_DATA_BOOL, NULL, ignore)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item ignore");
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignored", PS_DATA_BOOL, NULL, ignored)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item ignored");
         psFree(md);
         return false;
@@ -9763 +9763 @@
 bool warpSkyfileInsertObject(psDB *dbh, warpSkyfileRow *object)
 {
-    return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->good_frac, object->ignore, object->fault);
+    return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->good_frac, object->ignored, object->fault);
 }
 
@@ -9876 +9876 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignore", PS_DATA_BOOL, NULL, object->ignore)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item ignore");
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "ignored", PS_DATA_BOOL, NULL, object->ignored)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item ignored");
         psFree(md);
         return false;
@@ -9935 +9935 @@
         return false;
     }
-    bool ignore = psMetadataLookupBool(&status, md, "ignore");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ignore");
+    bool ignored = psMetadataLookupBool(&status, md, "ignored");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ignored");
         return false;
     }
@@ -9946 +9946 @@
     }
 
-    return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev, good_frac, ignore, fault);
+    return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev, good_frac, ignored, fault);
 }
 psArray *warpSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)