Changeset 6618 for branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

Timestamp:

Mar 16, 2006, 3:47:44 PM (20 years ago)

Author:

Paul Price

Message:

PHU=NONE (i.e., megacam split) now working, with concept ingest; changed definition of pmFPAAddSource to return a pmFPAview

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

@@ -2 +2 @@
 
 #include "pslib.h"
+#include "psMetadataItemParse.h"
 
 #include "pmFPA.h"
@@ -12 +13 @@
 // File-static functions
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-static float parseF32(psMetadataItem *item
-                     )
-{
-    switch (item->type) {
-    case PS_DATA_F32:
-        return item->data.F32;
-    case PS_DATA_F64:
-        // Assume it's OK to truncate to floating point from double
-        return (float)item->data.F64;
-    case PS_DATA_S32:
-        // Promote to float
-        return (float)item->data.S32;
-    default:
-        psError(PS_ERR_IO, true, "Concept %s (%s) is not of floating point type (%x) --- treating as NaN.\n",
-                item->name, item->comment, item->type);
-        return NAN;
-    }
-}
-
-static double parseF64(psMetadataItem *item
-                      )
-{
-    switch (item->type) {
-    case PS_TYPE_F64:
-        return item->data.F64;
-    case PS_TYPE_F32:
-        // Promote to double
-        return (double)item->data.F32;
-    case PS_TYPE_S32:
-        // Promote to double
-        return (double)item->data.S32;
-    default:
-        psError(PS_ERR_IO, true, "Concept %s (%s) is not of double-precision floating point type (%x) "
-                "--- treating as NaN.\n", item->name, item->comment, item->type);
-        return NAN;
-    }
-}
-
-static int parseS32(psMetadataItem *item
-                   )
-{
-    switch (item->type) {
-    case PS_TYPE_S32:
-        return item->data.S32;
-    case PS_TYPE_F32:
-        psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) should be S32, but is F32 --- converting.\n",
-                 item->name, comment);
-        return (int)item->data.F32;
-    case PS_TYPE_F64:
-        psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) should be S32, but is F64 --- converting.\n",
-                 item->name, comment);
-        return (int)item->data.F64;
-    default:
-        psError(PS_ERR_IO, true, "Concept %s (%s) is not of integer type (%x) --- treating as zero.\n",
-                item->name, item->comment, item->type);
-        return 0;
-    }
-}
-
-static psString parseString(psMetadataItem *item
-                           )
-{
-    switch (item->type) {
-    case PS_DATA_STRING:
-        return psMemIncrRefCounter(item->data.V);
-    case PS_DATA_F32: {
-            psString value = NULL;    // String to return
-            psStringAppend(&value, "%f", item->data.F32);
-            return value;
-        }
-    case PS_DATA_S32: {
-            psString value = NULL;    // String to return
-            psStringAppend(&value, "%d", item->data.S32);
-            return value;
-        }
-    default:
-        psError(PS_ERR_IO, true, "Concept %s (%s) is not of string type (%x) --- treating as "
-                "undefined.\n", item->name, item->comment, item->type);
-        return psStringCopy("");
-    }
-}
-
 
 // This function gets called for the really boring concepts --- where all you have to do is parse from a
@@ -106 +23 @@
     switch (pattern->type) {
     case PS_DATA_STRING: {
-            psString string = parseString(concept); // Get the string, so I can free it after it goes on the MDI
+            psString string = psMetadataItemParseString(concept); // Get the string, so I can free it after it
+            // goes on the MetadataItem
             psMetadataItem *item = psMetadataItemAllocStr(pattern->name, pattern->comment, string);
             psFree(string);
@@ -112 +30 @@
         }
     case PS_DATA_S32:
-        return psMetadataItemAllocS32(pattern->name, pattern->comment, parseS32(concept));
+        return psMetadataItemAllocS32(pattern->name, pattern->comment, psMetadataItemParseS32(concept));
     case PS_DATA_F32:
-        return psMetadataItemAllocF32(pattern->name, pattern->comment, parseF32(concept));
+        return psMetadataItemAllocF32(pattern->name, pattern->comment, psMetadataItemParseF32(concept));
     case PS_DATA_F64:
-        return psMetadataItemAllocF64(pattern->name, pattern->comment, parseF64(concept));
+        return psMetadataItemAllocF64(pattern->name, pattern->comment, psMetadataItemParseF64(concept));
     default:
         psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) is not of a standard type (%x)\n",