Changeset 18163 for trunk/psModules/src/concepts/pmConceptsWrite.c

Timestamp:

Jun 17, 2008, 12:16:38 PM (18 years ago)

Author:

Paul Price

Message:

Changing use of psDB* to pmConfig* so that the database handle only has to be set up when required.

File:

• trunk/psModules/src/concepts/pmConceptsWrite.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -9 +9 @@
 #include <pslib.h>
 
+#include "pmConfig.h"
 #include "pmHDU.h"
 #include "pmFPA.h"
@@ -427 +428 @@
 // XXX Warning: This code has not been tested at all
 bool p_pmConceptsWriteToDatabase(const psMetadata *specs, const pmFPA *fpa, const pmChip *chip,
-                                 const pmCell *cell, psDB *db, const psMetadata *concepts)
+                                 const pmCell *cell, pmConfig *config, const psMetadata *concepts)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);
     PS_ASSERT_PTR_NON_NULL(concepts, false);
-
-    if (!db) {
-        return false;
-    }
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     #ifndef HAVE_PSDB
@@ -456 +454 @@
         psString name = specItem->name; // The concept name
 
-        psMetadataItem *dbItem = p_pmConceptsReadSingleFromDatabase(name, database, db, fpa, chip, cell);
+        psMetadataItem *dbItem = p_pmConceptsReadSingleFromDatabase(name, database, config, fpa, chip, cell);
         if (!dbItem) {
             continue;