Index: trunk/psModules/src/concepts/pmConceptsWrite.c =================================================================== --- trunk/psModules/src/concepts/pmConceptsWrite.c (revision 7017) +++ trunk/psModules/src/concepts/pmConceptsWrite.c (revision 7278) @@ -1,3 +1,4 @@ #include +#include #include #include "pslib.h" @@ -110,4 +111,7 @@ ) { + assert(spec); + assert(cameraFormat); + if (concept) { psMetadataItem *formatted = NULL; // The formatted concept @@ -129,4 +133,8 @@ ) { + assert(hdu); + assert(keyword && strlen(keyword) > 0); + assert(item); + if (!hdu->header) { return false; @@ -166,4 +174,8 @@ ) { + assert(hdu); + assert(keywords); + assert(item); + bool status = true; // Status of writing headers, to be returned if (item->type == PS_DATA_LIST) { @@ -204,63 +216,66 @@ ) { - if (cell) { - pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level - if (!hdu) { - return false; - } - psMetadata *cameraFormat = hdu->format; // The camera format - psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator - psMetadataItem *specItem = NULL; // Item from the specs metadata - while ((specItem = psMetadataGetAndIncrement(specsIter))) { - pmConceptSpec *spec = specItem->data.V; // The specification - psString name = specItem->name; // The concept name - psMetadataItem *cameraItem = psMetadataLookup(cell->config, name); // The concept from the camera, - // or NULL - if (cameraItem) { - // Grab the concept - psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The concept - // Formatted version - psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, NULL, NULL, cell); - if (!formatted) { - continue; - } - psString nameSource = NULL; // String with the concept name and ".SOURCE" added - psStringAppend(&nameSource, "%s.SOURCE", name); - bool mdok = true; // Status of MD lookup - psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source - if (mdok && strlen(source) > 0) { - psTrace(__func__, 8, "%s is %s\n", nameSource, source); - if (strcasecmp(source, "HEADER") == 0) { - if (cameraItem->type != PS_DATA_STRING) { - psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by header, but is not " - "of type STR --- ignored.\n", conceptItem->name); - continue; - } - psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V); - writeHeader(hdu, cameraItem->data.V, formatted); - } else if (strcasecmp(source, "VALUE") == 0) { - psTrace(__func__, 8, "Checking %s against camera format.\n", name); - if (! compareConcepts(formatted, cameraItem)) { - psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera " - "format, but the values don't match.\n", name); - } - } else { - psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't " - "write\n", nameSource); + PS_ASSERT_PTR_NON_NULL(specs, false); + PS_ASSERT_PTR_NON_NULL(concepts, false); + if (!cell) { + return false; + } + + pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level + if (!hdu) { + return false; + } + psMetadata *cameraFormat = hdu->format; // The camera format + psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *specItem = NULL; // Item from the specs metadata + while ((specItem = psMetadataGetAndIncrement(specsIter))) { + pmConceptSpec *spec = specItem->data.V; // The specification + psString name = specItem->name; // The concept name + psMetadataItem *cameraItem = psMetadataLookup(cell->config, name); // The concept from the camera, + // or NULL + if (cameraItem) { + // Grab the concept + psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The concept + // Formatted version + psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, NULL, NULL, cell); + if (!formatted) { + continue; + } + psString nameSource = NULL; // String with the concept name and ".SOURCE" added + psStringAppend(&nameSource, "%s.SOURCE", name); + bool mdok = true; // Status of MD lookup + psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source + if (mdok && strlen(source) > 0) { + psTrace(__func__, 8, "%s is %s\n", nameSource, source); + if (strcasecmp(source, "HEADER") == 0) { + if (cameraItem->type != PS_DATA_STRING) { + psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by header, but is not " + "of type STR --- ignored.\n", conceptItem->name); + continue; } - } else if (! compareConcepts(formatted, cameraItem)) { - // Assume it's specified by value - psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera " - "format, but the values don't match.\n", name); - } - psFree(formatted); - psFree(nameSource); - } - - } - psFree(specsIter); - return true; - } - return false; + psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V); + writeHeader(hdu, cameraItem->data.V, formatted); + } else if (strcasecmp(source, "VALUE") == 0) { + psTrace(__func__, 8, "Checking %s against camera format.\n", name); + if (! compareConcepts(formatted, cameraItem)) { + psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera " + "format, but the values don't match.\n", name); + } + } else { + psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't " + "write\n", nameSource); + } + } else if (! compareConcepts(formatted, cameraItem)) { + // Assume it's specified by value + psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera " + "format, but the values don't match.\n", name); + } + psFree(formatted); + psFree(nameSource); + } + + } + psFree(specsIter); + return true; } @@ -272,4 +287,7 @@ ) { + PS_ASSERT_PTR_NON_NULL(specs, false); + PS_ASSERT_PTR_NON_NULL(concepts, false); + pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level if (!hdu) { @@ -279,51 +297,50 @@ bool mdok = true; // Status of MD lookup psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec - if (mdok && defaults) { - pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level - psMetadata *cameraFormat = hdu->format; // The camera format - psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator - psMetadataItem *specItem = NULL; // Item from the specs metadata - while ((specItem = psMetadataGetAndIncrement(specsIter))) { - pmConceptSpec *spec = specItem->data.V; // The specification - psString name = specItem->name; // The concept name - psMetadataItem *defaultItem = psMetadataLookup(defaults, name); // The item from the DEFAULTS - if (defaultItem) { - psMetadataItem *conceptItem = NULL; // The item from the concepts - if (defaultItem->type == PS_DATA_METADATA) { - // It's a menu --- need to look up the .DEPEND - psString dependName = NULL; // The concept name with ".DEPEND" on the end - psStringAppend(&dependName, ".DEPEND"); - psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword - psFree(dependName); - if (!mdok || !dependKey || strlen(dependKey) == 0) { - psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n", - dependName, name); - continue; - } - psString dependValue = psMetadataLookupStr(&mdok, concepts, dependName); // The value - if (!mdok || !dependKey || strlen(dependKey) == 0) { - psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- " - "ignored.\n", name, dependName); - continue; - } - conceptItem = psMetadataLookup(defaultItem->data.V, dependValue); - } else { - conceptItem = psMetadataLookup(concepts, name); // The item from the concepts - } - psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); - if (!formatted) { + if (!mdok || !defaults) { + return false; + } + + psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *specItem = NULL; // Item from the specs metadata + while ((specItem = psMetadataGetAndIncrement(specsIter))) { + pmConceptSpec *spec = specItem->data.V; // The specification + psString name = specItem->name; // The concept name + psMetadataItem *defaultItem = psMetadataLookup(defaults, name); // The item from the DEFAULTS + if (defaultItem) { + psMetadataItem *conceptItem = NULL; // The item from the concepts + if (defaultItem->type == PS_DATA_METADATA) { + // It's a menu --- need to look up the .DEPEND + psString dependName = NULL; // The concept name with ".DEPEND" on the end + psStringAppend(&dependName, ".DEPEND"); + psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword + psFree(dependName); + if (!mdok || !dependKey || strlen(dependKey) == 0) { + psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n", + dependName, name); continue; } - if (! compareConcepts(formatted, defaultItem)) { - psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera " - "format, but the values don't match.\n", name); - } - psFree(formatted); - } - } - psFree(specsIter); - return true; - } - return false; + psString dependValue = psMetadataLookupStr(&mdok, concepts, dependName); // The value + if (!mdok || !dependKey || strlen(dependKey) == 0) { + psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- " + "ignored.\n", name, dependName); + continue; + } + conceptItem = psMetadataLookup(defaultItem->data.V, dependValue); + } else { + conceptItem = psMetadataLookup(concepts, name); // The item from the concepts + } + psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); + if (!formatted) { + continue; + } + if (! compareConcepts(formatted, defaultItem)) { + psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera " + "format, but the values don't match.\n", name); + } + psFree(formatted); + } + } + psFree(specsIter); + return true; } @@ -336,4 +353,7 @@ ) { + PS_ASSERT_PTR_NON_NULL(specs, false); + PS_ASSERT_PTR_NON_NULL(concepts, false); + pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level if (!hdu) { @@ -343,54 +363,53 @@ bool mdok = true; // Status of MD lookup psMetadata *translation = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec - if (mdok && translation) { - pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level - psMetadata *cameraFormat = hdu->format; // The camera format - psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator - psMetadataItem *specItem = NULL; // Item from the specs metadata - while ((specItem = psMetadataGetAndIncrement(specsIter))) { - pmConceptSpec *spec = specItem->data.V; // The specification - psString name = specItem->name; // The concept name - psMetadataItem *headerItem = psMetadataLookup(translation, name); // The item from the TRANSLATION - if (headerItem) { - if (headerItem->type != PS_DATA_STRING) { - psLogMsg(__func__, PS_LOG_WARN, "TRANSLATION keyword for concept %s isn't of type STR ---" - " ignored.", name); - continue; - } - psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts - psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); - if (!formatted) { - continue; - } - psList *keywords = psStringSplit(headerItem->data.V, " ,;", true); // List of header keywords - if (formatted->type == PS_DATA_LIST) { - psList *values = formatted->data.V; // The values for the headers - if (values->n != keywords->n) { - psLogMsg(__func__, PS_LOG_WARN, "Number of headers specified does not match number " - "of values for concept %s.\n", name); + if (!mdok || !translation) { + return false; + } + + psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *specItem = NULL; // Item from the specs metadata + while ((specItem = psMetadataGetAndIncrement(specsIter))) { + pmConceptSpec *spec = specItem->data.V; // The specification + psString name = specItem->name; // The concept name + psMetadataItem *headerItem = psMetadataLookup(translation, name); // The item from the TRANSLATION + if (headerItem) { + if (headerItem->type != PS_DATA_STRING) { + psLogMsg(__func__, PS_LOG_WARN, "TRANSLATION keyword for concept %s isn't of type STR ---" + " ignored.", name); + continue; + } + psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts + psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); + if (!formatted) { + continue; + } + psList *keywords = psStringSplit(headerItem->data.V, " ,;", true); // List of header keywords + if (formatted->type == PS_DATA_LIST) { + psList *values = formatted->data.V; // The values for the headers + if (values->n != keywords->n) { + psLogMsg(__func__, PS_LOG_WARN, "Number of headers specified does not match number " + "of values for concept %s.\n", name); + } + psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); // Iterator + psListIterator *keywordsIter = psListIteratorAlloc(keywords, PS_LIST_HEAD, false); + psMetadataItem *valuesItem = NULL; // Item from list + while ((valuesItem = psListGetAndIncrement(valuesIter))) { + psString keyword = psListGetAndIncrement(keywordsIter); // Keyword from the list + if (strlen(keyword) > 0) { + writeHeader(hdu, keyword, formatted); } - psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); // Iterator - psListIterator *keywordsIter = psListIteratorAlloc(keywords, PS_LIST_HEAD, false); - psMetadataItem *valuesItem = NULL; // Item from list - while ((valuesItem = psListGetAndIncrement(valuesIter))) { - psString keyword = psListGetAndIncrement(keywordsIter); // Keyword from the list - if (strlen(keyword) > 0) { - writeHeader(hdu, keyword, formatted); - } - } - psFree(valuesIter); - psFree(keywordsIter); - } else { - psString keyword = psListGet(keywords, PS_LIST_HEAD); // The keyword - writeHeader(hdu, keyword, formatted); - } - psFree(formatted); - psFree(keywords); - } - } - psFree(specsIter); - return true; - } - return false; + } + psFree(valuesIter); + psFree(keywordsIter); + } else { + psString keyword = psListGet(keywords, PS_LIST_HEAD); // The keyword + writeHeader(hdu, keyword, formatted); + } + psFree(formatted); + psFree(keywords); + } + } + psFree(specsIter); + return true; } @@ -404,4 +423,11 @@ ) { + PS_ASSERT_PTR_NON_NULL(specs, false); + PS_ASSERT_PTR_NON_NULL(concepts, false); + + if (!db) { + return false; + } + #ifdef OMIT_PSDB return false; @@ -415,419 +441,111 @@ bool mdok = true; // Status of MD lookup psMetadata *database = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec - if (mdok && database) { - pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level - psMetadata *cameraFormat = hdu->format; // The camera format - psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator - psMetadataItem *specItem = NULL; // Item from the specs metadata - while ((specItem = psMetadataGetAndIncrement(specsIter))) { - pmConceptSpec *spec = specItem->data.V; // The specification - psString name = specItem->name; // The concept name - - psMetadataItem *dbItem = psMetadataLookup(database, name); // The item from the DATABASE - if (dbItem) { - if (dbItem->type != PS_DATA_METADATA) { - psLogMsg(__func__, PS_LOG_WARN, "DATABASE keyword for concept %s isn't of type METADATA " - "--- ignored.\n", name); - continue; - } - - psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts - psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); - if (!formatted) { - continue; - } - - psMetadata *dbLookup = dbItem->data.V; // How to look up the value of interest - // Name of the table - const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); - // Name of "where" columns - const char *givenCols = psMetadataLookupStr(&mdok, dbLookup, "GIVENDBCOL"); - // Values for "where" columns - const char *givenPS = psMetadataLookupStr(&mdok, dbLookup, "GIVENPS"); - - // Now, need to get the "given"s - if (strlen(givenCols) || strlen(givenPS)) { - psList *cols = psStringSplit(givenCols, ",;", true); // List of column names - psList *values = psStringSplit(givenPS, ",;", true); // List of value names for the columns - psMetadata *selection = psMetadataAlloc(); // The stuff to select in the DB - if (cols->n != values->n) { - psLogMsg(__func__, PS_LOG_WARN, - "The GIVENDBCOL and GIVENPS entries for %s do not have " - "the same number of entries --- ignored.\n", name); + if (!mdok || !database) { + return false; + } + psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *specItem = NULL; // Item from the specs metadata + while ((specItem = psMetadataGetAndIncrement(specsIter))) { + pmConceptSpec *spec = specItem->data.V; // The specification + psString name = specItem->name; // The concept name + + psMetadataItem *dbItem = psMetadataLookup(database, name); // The item from the DATABASE + if (dbItem) { + if (dbItem->type != PS_DATA_METADATA) { + psLogMsg(__func__, PS_LOG_WARN, "DATABASE keyword for concept %s isn't of type METADATA " + "--- ignored.\n", name); + continue; + } + + psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts + psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell); + if (!formatted) { + continue; + } + + psMetadata *dbLookup = dbItem->data.V; // How to look up the value of interest + // Name of the table + const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); + // Name of "where" columns + const char *givenCols = psMetadataLookupStr(&mdok, dbLookup, "GIVENDBCOL"); + // Values for "where" columns + const char *givenPS = psMetadataLookupStr(&mdok, dbLookup, "GIVENPS"); + + // Now, need to get the "given"s + if (strlen(givenCols) || strlen(givenPS)) { + psList *cols = psStringSplit(givenCols, ",;", true); // List of column names + psList *values = psStringSplit(givenPS, ",;", true); // List of value names for the columns + psMetadata *selection = psMetadataAlloc(); // The stuff to select in the DB + if (cols->n != values->n) { + psLogMsg(__func__, PS_LOG_WARN, + "The GIVENDBCOL and GIVENPS entries for %s do not have " + "the same number of entries --- ignored.\n", name); + } else { + // Iterators for the lists + psListIterator *colsIter = psListIteratorAlloc(cols, PS_LIST_HEAD, false); + psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); + char *column = NULL; // Name of the column + while ((column = psListGetAndIncrement(colsIter))) { + char *dependName = psListGetAndIncrement(valuesIter); // Name for the value + if (!strlen(column) || !strlen(name)) { + psLogMsg(__func__, PS_LOG_WARN, "One of the columns or value names for %s is " + " empty --- ignored.\n", name); + } else { + // Search for the value name + psMetadataItem *item = NULL; // The value + if (!item && cell) { + item = psMetadataLookup(cell->concepts, dependName); + } + if (!item && chip) { + item = psMetadataLookup(chip->concepts, dependName); + } + if (!item && fpa) { + item = psMetadataLookup(fpa->concepts, dependName); + } + if (! item) { + psLogMsg(__func__, PS_LOG_ERROR, + "Unable to find the value name %s for DB " + " lookup on %s --- ignored.\n", dependName, name); + } else { + // We need to create a new psMetadataItem. I don't think we can't simply + // hack the existing one, since that could conceivably cause memory leaks + psMetadataAddItem(selection, formatted, PS_LIST_TAIL, PS_META_REPLACE); + psFree(formatted); + } + } + psFree(dependName); + psFree(column); + } // Iterating through the columns + psFree(colsIter); + psFree(valuesIter); + + // Check first to make sure we're only going to touch one row + psArray *dbResult = psDBSelectRows(db, tableName, selection, 2); // Lookup result + // Note that we use limit=2 in order to test if there are multiple rows returned + if (! dbResult || dbResult->n == 0) { + psLogMsg(__func__, PS_LOG_WARN, "Unable to find any rows in DB for %s --- " + "ignored\n", name); + return false; } else { - // Iterators for the lists - psListIterator *colsIter = psListIteratorAlloc(cols, PS_LIST_HEAD, false); - psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); - char *column = NULL; // Name of the column - while ((column = psListGetAndIncrement(colsIter))) { - char *dependName = psListGetAndIncrement(valuesIter); // Name for the value - if (!strlen(column) || !strlen(name)) { - psLogMsg(__func__, PS_LOG_WARN, "One of the columns or value names for %s is " - " empty --- ignored.\n", name); - } else { - // Search for the value name - psMetadataItem *item = NULL; // The value - if (!item && cell) { - item = psMetadataLookup(cell->concepts, dependName); - } - if (!item && chip) { - item = psMetadataLookup(chip->concepts, dependName); - } - if (!item && fpa) { - item = psMetadataLookup(fpa->concepts, dependName); - } - if (! item) { - psLogMsg(__func__, PS_LOG_ERROR, - "Unable to find the value name %s for DB " - " lookup on %s --- ignored.\n", dependName, name); - } else { - // We need to create a new psMetadataItem. I don't think we can't simply - // hack the existing one, since that could conceivably cause memory leaks - psMetadataAddItem(selection, formatted, PS_LIST_TAIL, PS_META_REPLACE); - psFree(formatted); - } - } - psFree(dependName); - psFree(column); - } // Iterating through the columns - psFree(colsIter); - psFree(valuesIter); - - // Check first to make sure we're only going to touch one row - psArray *dbResult = psDBSelectRows(db, tableName, selection, 2); // Lookup result - // Note that we use limit=2 in order to test if there are multiple rows returned - if (! dbResult || dbResult->n == 0) { - psLogMsg(__func__, PS_LOG_WARN, "Unable to find any rows in DB for %s --- " - "ignored\n", name); - return false; - } else { - if (dbResult->n > 1) { - psLogMsg(__func__, PS_LOG_WARN, "Multiple rows returned in DB lookup for %s " - "--- ignored.\n", name); - } - // Update the DB - psMetadata *update = psMetadataAlloc(); - psMetadataAddItem(update, conceptItem, PS_LIST_HEAD, 0); - psDBUpdateRows(db, tableName, selection, update); - psFree(update); - return true; + if (dbResult->n > 1) { + psLogMsg(__func__, PS_LOG_WARN, "Multiple rows returned in DB lookup for %s " + "--- ignored.\n", name); } + // Update the DB + psMetadata *update = psMetadataAlloc(); + psMetadataAddItem(update, conceptItem, PS_LIST_HEAD, 0); + psDBUpdateRows(db, tableName, selection, update); + psFree(update); + return true; } - psFree(cols); - psFree(values); - } // Doing the "given"s. - } - } - psFree(specsIter); - return true; - } - return false; + } + psFree(cols); + psFree(values); + } // Doing the "given"s. + } + } + psFree(specsIter); + return true; #endif } - - - -#if 0 - -// Well, not really "write", but check to make sure it's there and matches -bool pmConceptWriteToCamera(pmCell *cell, // The cell - psMetadataItem *concept // Concept - ) -{ - if (! cell->config) { - return false; - } - if (cell) { - psMetadataItem *item = psMetadataLookup(cell->config, concept->name); // Info we want - return compareConcepts(item, concept); - } - - return false; -} - -// Write the concept to the header in the appropriate location -bool pmConceptWriteToHeader(pmFPA *fpa, // The FPA that contains the chip - pmChip *chip, // The chip that contains the cell - pmCell *cell, // The cell - psMetadataItem *concept // Concept - ) -{ - bool mdok = true; // Status of MD lookup - bool status = false; // Status of setting header - if (! fpa->camera) { - return false; - } - psMetadata *translation = psMetadataLookupMD(&mdok, fpa->camera, "TRANSLATION"); // FITS translation - if (! mdok) { - psError(PS_ERR_IO, false, "Unable to find TRANSLATION in camera configuration.\n"); - return false; - } - - // Look for how to translate the concept into a FITS header name - const char *keyword = psMetadataLookupStr(&mdok, translation, concept->name); - if (mdok && strlen(keyword) > 0) { - psTrace(__func__, 6, "It's in keyword %s\n", keyword); - psMetadataItem *headerItem = NULL; // Item to add to header - // XXX: Need to expand range of types - switch (concept->type) { - case PS_DATA_STRING: - headerItem = psMetadataItemAllocStr(keyword, concept->comment, concept->data.V); - break; - case PS_DATA_S32: - headerItem = psMetadataItemAllocS32(keyword, concept->comment, concept->data.S32); - break; - case PS_DATA_F32: - headerItem = psMetadataItemAllocF32(keyword, concept->comment, concept->data.F32); - break; - case PS_DATA_F64: - headerItem = psMetadataItemAllocF64(keyword, concept->comment, concept->data.F64); - break; - default: - headerItem = psMetadataItemAlloc(keyword, concept->type, concept->comment, - concept->data.V); // Item for the header - } - - // We have a FITS header to look up --- search each level - if (cell && cell->hdu) { - psTrace(__func__, 7, "Adding to the cell level header...\n"); - psMetadataAddItem(cell->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE); - status = true; - } else if (chip && chip->hdu) { - psTrace(__func__, 7, "Adding to the chip level header...\n"); - psMetadataAddItem(chip->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE); - status = true; - } else if (fpa->hdu) { - psTrace(__func__, 7, "Adding to the FPA level header...\n"); - psMetadataAddItem(fpa->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE); - status = true; - } - psFree(headerItem); - } - - // No header value - return status; -} - - -// Well, not really "write", but check to see if it's there, and matches -bool pmConceptWriteToDefault(pmFPA *fpa, // The FPA that contains the chip - pmChip *chip, // The chip that contains the cell - pmCell *cell, // The cell - psMetadataItem *concept // Concept - ) -{ - bool mdOK = true; // Status of MD lookup - if (! fpa->camera) { - return false; - } - psMetadata *defaults = psMetadataLookupMD(&mdOK, fpa->camera, "DEFAULTS"); - if (! mdOK || ! defaults) { - psError(PS_ERR_IO, false, "Unable to find DEFAULTS in camera configuration.\n"); - return false; - } - - psMetadataItem *defItem = psMetadataLookup(defaults, concept->name); - bool status = false; // Result of checking the database - if (defItem) { - if (defItem->type == PS_DATA_METADATA) { - // A dependent default - psTrace(__func__, 7, "Evaluating dependent default....\n"); - psMetadata *dependents = defItem->data.V; // The list of dependents - // Find out what it depends on - psString dependName = psStringCopy(concept->name); - psStringAppend(&dependName, ".DEPEND"); - psString dependsOn = psMetadataLookupStr(&mdOK, defaults, dependName); - if (! mdOK) { - psError(PS_ERR_IO, false, "Unable to find %s in camera configuration for dependent default" - " --- ignored\n", dependName); - // XXX: Need to clean up before returning - return false; - } - psFree(dependName); - // Find the value of the dependent concept - psMetadataItem *depItem = pmConceptReadFromHeader(fpa, chip, cell, dependsOn); - if (! depItem) { - psError(PS_ERR_IO, true, "Unable to find value for %s (required for %s)\n", dependsOn, - concept->name); - return false; - } - if (depItem->type != PS_DATA_STRING) { - psError(PS_ERR_IO, true, "Value of %s is not of type string, as required for dependency" - " --- ignored.\n", dependsOn); - } - - defItem = psMetadataLookup(dependents, depItem->data.V); // This is now what we were after - } - - status = compareConcepts(defItem, concept); - if (! status) { - psError(PS_ERR_IO, true, "Concept %s is specified by default in the camera configuration, " - "but doesn't match the actual value.\n", concept->name); - } - } - - // XXX: Need to clean up before returning - return status; -} - - -// XXX: Not tested at all -// XXX I WOULD NOT TRUST THIS FUNCTION IN THE SLIGHTEST YET! --- PAP -bool pmConceptWriteToDB(pmFPA *fpa, // The FPA that contains the chip - pmChip *chip, // The chip that contains the cell - pmCell *cell, // The cell - psDB *db, // DB handle - psMetadataItem *concept // Concept - ) -{ - if (! db) { - // No database initialised - return false; - } - - bool mdStatus = true; // Status of MD lookup - if (! fpa->camera) { - return false; - } - psMetadata *database = psMetadataLookupMD(&mdStatus, fpa->camera, "DATABASE"); - if (! mdStatus) { - // No error, because not everyone needs to use the DB - return NULL; - } - - psMetadata *dbLookup = psMetadataLookupMD(&mdStatus, database, concept->name); - if (dbLookup) { - const char *tableName = psMetadataLookupStr(&mdStatus, dbLookup, "TABLE"); // Name of the table - // const char *colName = psMetadataLookupStr(&mdStatus, dbLookup, "COLUMN"); // Name of the column - const char *givenCols = psMetadataLookupStr(&mdStatus, dbLookup, "GIVENDBCOL"); // Name of "where" - // columns - const char *givenPS = psMetadataLookupStr(&mdStatus, dbLookup, "GIVENPS"); // Values for "where" - // columns - - // Now, need to get the "given"s - if (strlen(givenCols) || strlen(givenPS)) { - psList *cols = psStringSplit(givenCols, ",;", true); // List of column names - psList *values = psStringSplit(givenPS, ",;", true); // List of value names for the columns - psMetadata *selection = psMetadataAlloc(); // The stuff to select in the DB - if (cols->n != values->n) { - psLogMsg(__func__, PS_LOG_WARN, "The GIVENDBCOL and GIVENPS entries for %s do not have " - "the same number of entries --- ignored.\n", concept); - } else { - // Iterators for the lists - psListIterator *colsIter = psListIteratorAlloc(cols, PS_LIST_HEAD, false); - psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); - char *column = NULL; // Name of the column - while ((column = psListGetAndIncrement(colsIter))) { - char *name = psListGetAndIncrement(valuesIter); // Name for the value - if (!strlen(column) || !strlen(name)) { - psLogMsg(__func__, PS_LOG_WARN, "One of the columns or value names for %s is " - " empty --- ignored.\n", concept); - } else { - // Search for the value name - psMetadataItem *item = pmConceptReadFromHeader(fpa, chip, cell, name); - if (! item) { - item = pmConceptReadFromDefault(fpa, chip, cell, name); - } - if (! item) { - psLogMsg(__func__, PS_LOG_ERROR, "Unable to find the value name %s for DB " - " lookup on %s --- ignored.\n", name, concept); - } else { - // We need to create a new psMetadataItem. I don't think we can't simply hack - // the existing one, since that could conceivably cause memory leaks - psMetadataItem *newItem = psMetadataItemAlloc(concept->name, item->type, - item->comment, item->data.V); - psMetadataAddItem(selection, newItem, PS_LIST_TAIL, PS_META_REPLACE); - psFree(newItem); - } - } - psFree(name); - psFree(column); - } // Iterating through the columns - psFree(colsIter); - psFree(valuesIter); - - // Check first to make sure we're only going to touch one row - psArray *dbResult = psDBSelectRows(db, tableName, selection, 2); // Lookup result - // Note that we use limit=2 in order to test if there are multiple rows returned - if (! dbResult || dbResult->n == 0) { - psLogMsg(__func__, PS_LOG_WARN, "Unable to find any rows in DB for %s --- ignored\n", - concept->name); - return false; - } else { - if (dbResult->n > 1) { - psLogMsg(__func__, PS_LOG_WARN, "Multiple rows returned in DB lookup for %s --- " - " ignored.\n", concept->name); - } - // Update the DB - psMetadata *update = psMetadataAlloc(); - psMetadataAddItem(update, concept, PS_LIST_HEAD, 0); - psDBUpdateRows(db, tableName, selection, update); - psFree(update); - return true; - } - } - psFree(cols); - psFree(values); - } - } // Doing the "given"s. - - psAbort(__func__, "Shouldn't ever get here?\n"); - return false; -} - - -// Concept write from item -bool pmConceptWriteItem(pmFPA *fpa, // The FPA - pmChip *chip, // The chip - pmCell *cell, // The cell - psDB *db, // DB handle - psMetadataItem *concept // Concept item - ) -{ - if (! fpa->camera) { - return false; - } - - // Try headers, database, defaults in order - psTrace(__func__, 3, "Trying to set concept %s...\n", concept->name); - bool status = pmConceptWriteToCamera(cell, concept); // Status for return - if (! status) { - psTrace(__func__, 5, "Trying header....\n"); - status = pmConceptWriteToHeader(fpa, chip, cell, concept); - } - if (! status) { - psTrace(__func__, 5, "Trying database....\n"); - status = pmConceptWriteToDB(fpa, chip, cell, db, concept); - } - if (! status) { - psTrace(__func__, 5, "Checking defaults....\n"); - status = pmConceptWriteToDefault(fpa, chip, cell, concept); - } - - if (! status) { - psError(PS_ERR_IO, true, "Unable to set %s (%s).\n", concept->name, concept->comment); - } - - return status; -} - - -// Concept write -bool pmConceptWrite(pmFPA *fpa, // The FPA - pmChip *chip,// The chip - pmCell *cell, // The cell - psDB *db, // DB handle - psMetadata *concepts, // Concepts MD from which to set - const char *name // Name of the concept - ) -{ - psMetadataItem *concept = psMetadataLookup(concepts, name); - if (! concept) { - psError(PS_ERR_IO, true, "No such concept as %s\n", name); - return false; - } - return pmConceptWriteItem(fpa, chip, cell, db, concept); -} - -#endif