Changeset 13794 for trunk/ppStats/src/ppStatsLoop.c

Timestamp:

Jun 13, 2007, 11:55:33 AM (19 years ago)

Author:

Paul Price

Message:

Only read header when it's there to be read.
When reading concepts, do all levels as appropriate.

File:

• trunk/ppStats/src/ppStatsLoop.c (modified) (4 diffs)

trunk/ppStats/src/ppStatsLoop.c

@@ -103 +103 @@
     }
     if (psListLength(data->concepts) > 0) {
-        if (fits && !pmCellReadHeader(cell, fits)) {
+        if (fits && cell->hdu && !pmCellReadHeader(cell, fits)) {
             psError (PS_ERR_IO, false, "trouble reading cell header\n");
             psFree(cellResults);
             return PS_EXIT_DATA_ERROR;
         }
-        pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_ALL, false, config->database);
+        pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_ALL, true, config->database);
         getMetadata(cellResults, cell->concepts, data->concepts);
     }
@@ -299 +299 @@
     }
     if (psListLength(data->concepts) > 0) {
-        if (fits && !pmChipReadHeader(chip, fits)) {
+        if (fits && chip->hdu && !pmChipReadHeader(chip, fits)) {
             psError (PS_ERR_IO, false, "trouble reading chip header\n");
             psFree(chipResults);
             return PS_EXIT_DATA_ERROR;
         }
-        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_ALL, false, false, config->database);
+        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_ALL, true, true, config->database);
         getMetadata(chipResults, chip->concepts, data->concepts);
     }
@@ -375 +375 @@
     }
     if (psListLength(data->concepts) > 0) {
-        if (fits && !pmFPAReadHeader(fpa, fits)) {
+        if (fits && fpa->hdu && !pmFPAReadHeader(fpa, fits)) {
             psError(PS_ERR_IO, false, "Unable to read header for FPA.");
             psFree(view);
@@ -382 +382 @@
             return NULL;
         }
-        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, false, config->database);
+        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_ALL, true, config->database);
         getMetadata(newResults, fpa->concepts, data->concepts);
     }