Changeset 6341 for trunk/ippTools/src/pxframes.c

Timestamp:

Feb 7, 2006, 10:36:15 AM (20 years ago)

Author:

jhoblitt

Message:

rename pxConfig database -> dbh

File:

• trunk/ippTools/src/pxframes.c (modified) (6 diffs)

trunk/ippTools/src/pxframes.c

@@ -79 +79 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL); \
  \
-    psArray *exposures = exptype##SelectRowObjects(config->database, \
+    psArray *exposures = exptype##SelectRowObjects(config->dbh, \
         config->where, MAX_ROWS); \
     if (!exposures) { \
@@ -97 +97 @@
             exposure->exp_id); \
  \
-        psArray *images = imfiletype##SelectRowObjects(config->database, where, \
+        psArray *images = imfiletype##SelectRowObjects(config->dbh, where, \
             MAX_ROWS); \
         psFree(where); \
@@ -155 +155 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_PTR_NON_NULL(config->database, false);
+    PS_ASSERT_PTR_NON_NULL(config->dbh, false);
     PS_ASSERT_PTR_NON_NULL(frame, false);
 
-    psDB *dbh = config->database;
+    psDB *dbh = config->dbh;
 
     if (!rawScienceExpInsertObject(dbh, frame->exposure)) {
-        psError(PS_ERR_UNKNOWN, false, "database access failed");
+        psError(PS_ERR_UNKNOWN, false, "dbh access failed");
         return false;
     }
@@ -168 +168 @@
     for (long i = 0; i < images->n; i++) {
         if (!rawImfileInsertObject(dbh, images->data[i])) {
-            psError(PS_ERR_UNKNOWN, false, "database access failed");
+            psError(PS_ERR_UNKNOWN, false, "dbh access failed");
             return false;
         }
@@ -214 +214 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_PTR_NON_NULL(config->database, false);
+    PS_ASSERT_PTR_NON_NULL(config->dbh, false);
     PS_ASSERT_PTR_NON_NULL(frame, false);
 
-    psDB *dbh = config->database;
+    psDB *dbh = config->dbh;
 
     if (!rawDetrendExpInsertObject(dbh, frame->exposure)) {
-        psError(PS_ERR_UNKNOWN, false, "database access failed");
+        psError(PS_ERR_UNKNOWN, false, "dbh access failed");
         return false;
     }
@@ -227 +227 @@
     for (long i = 0; i < images->n; i++) {
         if (!rawImfileInsertObject(dbh, images->data[i])) {
-            psError(PS_ERR_UNKNOWN, false, "database access failed");
+            psError(PS_ERR_UNKNOWN, false, "dbh access failed");
             return false;
         }