Changeset 17874

Timestamp:

May 30, 2008, 5:19:49 PM (18 years ago)

Author:

Paul Price

Message:

Finally finished and tested code to get concepts from the database.

Location:

trunk/psModules/src

Files:

• concepts/pmConcepts.c (modified) (2 diffs)
• concepts/pmConceptsRead.c (modified) (1 diff)
• config/pmConfig.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -1226 +1226 @@
         replace[0] = '{'; \
         strcpy(replace + 1, concept); \
-        strcpy(replace + length + 1, "}"); \
+        strcpy(replace + length, "}"); \
         \
         psTrace("psModules.concepts", 10, "Interpolating concept %s for %s", replace, value); \
@@ -1259 +1259 @@
         char concept[length];  // Name of concept
         strncpy(concept, start + 1, length - 1);
-        concept[length] = '\0';
+        concept[length - 1] = '\0';
 
         psTrace("psModules.concepts", 7, "Interpolating concept %s", concept);

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -373 +373 @@
 }
 
-// XXX --- the below code has NOT been tested!
 bool p_pmConceptsReadFromDatabase(psMetadata *target, const psMetadata *specs,
                                   const pmFPA *fpa, const pmChip *chip, const pmCell *cell, psDB *db)

trunk/psModules/src/config/pmConfig.c

@@ -880 +880 @@
     }
 
+    if (!config->database) {
+        psDB *dbh = pmConfigDB(config); // Database handle
+        if (!dbh) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to open database connection.");
+            psFree(config);
+            return NULL;
+        }
+        config->database = dbh;
+    }
 
     psErrorClear();   // we may have failed to find some items in the metadata
@@ -1344 +1353 @@
     }
 
-    // no files found: this is not really an error 
+    // no files found: this is not really an error
     if (files->n == 0) {
         psFree (files);
@@ -1553 +1562 @@
     psMetadata *scheme = psMetadataLookupMetadata(&mdok, fitstypes, fitsType);
     if (!scheme) {
-        psWarning("Unable to find specified FITS Type %s in camera configuration.", fitsType);
-        return NULL;
+        psWarning("Unable to find specified FITS Type %s in camera configuration.", fitsType);
+        return NULL;
     }
 
     return scheme;
 }
+
+
+#if 0
+bool pmConfigDump(const pmConfig *config, const pmFPA *source, const char *outroot)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_STRING_NON_EMPTY(outroot, false);
+
+    pmFPAview *view = source ? pmFPAviewTop(source) : pmFPAviewAlloc(0);// View to top level
+    if (!view) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to determine top view for FPA.");
+        return false;
+    }
+
+    psMetadata *dumpRules = psMetadataLookupMetadata(NULL, config->system, "CONFIG.RULES"); // Name rules
+    if (!dumpRules) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to find CONFIG.RULES in system configuration");
+        psFree(view);
+        return false;
+    }
+
+    const char *name =
+#endif