Changeset 18185

Timestamp:

Jun 18, 2008, 4:19:02 PM (18 years ago)

Author:

Paul Price

Message:

Check to see if we need to use the database *before* we actually do.

File:

• trunk/psModules/src/concepts/pmConceptsRead.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -371 +371 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psDB *db = pmConfigDB(config);      // Database handle
-    if (!db) {
-        psErrorClear();
-        psWarning("Unable to initialise database to write concepts.");
-        return NULL;
-    }
-
     psMetadataItem *item = psMetadataLookup(database, name); // Item to return
     if (item && item->type == PS_DATA_METADATA) {
@@ -389 +382 @@
     if (item->type != PS_DATA_STRING) {
         psWarning("%s in DATABASE in camera format is not of type STR --- ignored.", name);
+        return NULL;
+    }
+
+    psDB *db = pmConfigDB(config);      // Database handle
+    if (!db) {
+        psErrorClear();
+        psWarning("Unable to initialise database to write concepts.");
         return NULL;
     }