Changeset 31016 for trunk/ippToPsps/src/Config.c

Timestamp:

Mar 23, 2011, 9:53:44 AM (15 years ago)

Author:

rhenders

Message:

Added non-class utility method to Fits class for getting FITS data type from string

File:

• trunk/ippToPsps/src/Config.c (modified) (4 diffs)

trunk/ippToPsps/src/Config.c

@@ -4 +4 @@
  *
  *  @author IfA
- *  Copyright 2009 Institute for Astronomy, University of Hawaii
+ *  Copyright 2011 Institute for Astronomy, University of Hawaii
  */
 
@@ -13 +13 @@
 
 #include "Fits.h"
-
-/**
-   Gets PS type from string TODO FITS types? should be in Fits class
-   */
-static int ippToPsps_GetDataType(char *typename) {
-
-    if (!strncmp(typename, "TBYTE", 5))  return TBYTE;
-    if (!strncmp(typename, "TSHORT", 6)) return TSHORT;
-    if (!strncmp(typename, "TLONGLONG", 9)) return TLONGLONG;
-    if (!strncmp(typename, "TLONG", 5)) return TLONG;
-    if (!strncmp(typename, "TFLOAT", 6)) return TFLOAT;
-    if (!strncmp(typename, "TDOUBLE", 7)) return TDOUBLE;
-    if (!strncmp(typename, "TSTRING", 7)) return TSTRING;
-
-    psError(PS_ERR_IO, false, "Don't understand type '%s'", typename);
-
-    return 0;
-}
 
 /**
@@ -385 +367 @@
         // column type
         getAttribute(node, "type", buffer);
-        table->columns[columnNum].pspsType = ippToPsps_GetDataType(buffer);
+        table->columns[columnNum].pspsType = Fits_getDataType(buffer);
 
         // default value
@@ -514 +496 @@
                 // IPP type
                 getAttribute(node, "ippType", buffer);
-                column->ippType = ippToPsps_GetDataType(buffer); 
+                column->ippType = Fits_getDataType(buffer); 
 
                 column->usingDefault = false;