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

Timestamp:

Mar 22, 2011, 4:11:23 PM (15 years ago)

Author:

rhenders

Message:

Using new Fits class and Config class

File:

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

trunk/ippToPsps/src/Config.c

@@ -1 @@
-/** @file ippToPspsConfig.c
+/** @file Config.c
  *
  *  @ingroup ippToPsps
@@ -7 +7 @@
  */
 
-#include "ippToPspsConfig.h"
+#include "Config.h"
 #include <ctype.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-// Gets PS type from string
+#include "Fits.h"
+
+/**
+   Gets PS type from string
+   */
 static int ippToPsps_GetDataType(char *typename) {
 
@@ -28 +32 @@
 }
 
-// finds a column within this table
-static IppToPspsConfig_Column* ippToPspsConfig_findColumn(IppToPspsConfig_Table* table, const char* name) {
-
-    IppToPspsConfig_Column* column = NULL;
+/**
+  Finds a column within this table
+  */
+static Column* findColumn(Table* table, const char* name) {
+
+    Column* column = NULL;
 
     for (uint32_t i=0; i<table->numOfColumns; i++) {
@@ -46 +52 @@
 }
 
-// finds a table from the array of tables
-static IppToPspsConfig_Table* ippToPspsConfig_findTable(IppToPspsConfig* this, const char* name) {
-
-    IppToPspsConfig_Table* table = NULL;
+/**
+  Finds a table from the array of tables
+  */
+static Table* findTable(Config* this, const char* name) {
+
+    Table* table = NULL;
 
     for (uint32_t i=0; i<this->numOfTables; i++) {
@@ -64 +72 @@
 }
 
-// gets an attribute value from XML node
-static bool ippToPspsConfig_getAttribute(xmlNode* node, const char* attName, char* _value) {
+/**
+  Gets an attribute value from XML node
+  */
+static bool getAttribute(xmlNode* node, const char* attName, char* _value) {
 
     xmlChar* value = xmlGetProp(node, (const xmlChar*)attName);
@@ -75 +85 @@
 }
 
-// creates a FITS binary table and populates it with defaults based on definition in schema XML
-static bool ippToPspsConfig_createTable(IppToPspsConfig_Table* table, fitsfile* fitsOut, const long nRows) {
+/**
+  Creates a FITS binary table and populates it with defaults based on definition in schema XML
+  */
+static bool createTable(Table* table, Fits* fitsOut, const long nRows) {
 
     if (!table) return false;
@@ -98 +110 @@
         switch (table->columns[i].pspsType) {
 
-            case TBYTE:
-                sprintf(colTypes[i],"1B");
-                break;
-            case TSHORT:
-                sprintf(colTypes[i],"1I");
-                break;
-            case TLONG:
-                sprintf(colTypes[i],"1J"); // TODO
-                break;
-            case TLONGLONG:
-                sprintf(colTypes[i],"1K");
-                break;
-            case TFLOAT:
-                sprintf(colTypes[i],"1E");
-                break;
-            case TDOUBLE:
-                sprintf(colTypes[i],"1D");
-                break;
-            case TSTRING:
-                sprintf(colTypes[i],"32A"); // TODO width?
-                break;
+            case TBYTE: sprintf(colTypes[i],"1B");
+                        break;
+            case TSHORT: sprintf(colTypes[i],"1I");
+                         break;
+            case TLONG: sprintf(colTypes[i],"1J"); // TODO
+                        break;
+            case TLONGLONG: sprintf(colTypes[i],"1K");
+                            break;
+            case TFLOAT: sprintf(colTypes[i],"1E");
+                         break;
+            case TDOUBLE: sprintf(colTypes[i],"1D");
+                          break;
+            case TSTRING: sprintf(colTypes[i],"32A"); // TODO width?
+                          break;
 
             default:
-                break;
+                          break;
         }
 
@@ -127 +132 @@
     }
 
-    int status = 0;
-    if (fits_create_tbl(fitsOut, BINARY_TBL, nRows, nCols, colNames, colTypes, NULL, table->name, &status)) {
-
-        fits_report_error(stderr, status);
-        psError(PS_ERR_IO,"Unable to create table: %s", table->name);
-    }
+    fitsOut->createBinaryTable(fitsOut, nRows, nCols, colNames, colTypes, table->name);
 
     for (i=0;i<nCols;i++) free(colTypes[i]);
@@ -166 +166 @@
             case TBYTE:
                 for(j=0;j<nRows;j++) int8col[j] = (int8_t)tempLong;
-                fits_write_col(fitsOut, TBYTE, col, 1, 1, nRows, int8col, &status);
+                fitsOut->writeColumn(fitsOut, TBYTE, col, 1, 1, nRows, int8col);
                 break;
             case TSHORT:
                 for(j=0;j<nRows;j++) int16col[j] = (int16_t)tempLong;
-                fits_write_col(fitsOut, TSHORT, col, 1, 1, nRows, int16col, &status);
+                fitsOut->writeColumn(fitsOut, TSHORT, col, 1, 1, nRows, int16col);
                 break;
             case TLONG:
                 for(j=0;j<nRows;j++) longcol[j] = (long)tempLong;
-                fits_write_col(fitsOut, TLONG, col, 1, 1, nRows, longcol, &status);
+                fitsOut->writeColumn(fitsOut, TLONG, col, 1, 1, nRows, longcol);
                 break;
 
             case TLONGLONG:
                 for(j=0;j<nRows;j++) longcol[j] = tempLong;
-                fits_write_col(fitsOut, TLONGLONG, col, 1, 1, nRows, longcol, &status);
+                fitsOut->writeColumn(fitsOut, TLONGLONG, col, 1, 1, nRows, longcol);
                 break;
 
             case TFLOAT:
                 for(j=0;j<nRows;j++) floatcol[j] = (float)tempDouble;
-                fits_write_col(fitsOut, TFLOAT, col, 1, 1, nRows, floatcol, &status);
+                fitsOut->writeColumn(fitsOut, TFLOAT, col, 1, 1, nRows, floatcol);
                 break;
 
             case TDOUBLE:
                 for(j=0;j<nRows;j++) doublecol[j] = tempDouble;
-                fits_write_col(fitsOut, TDOUBLE, col, 1, 1, nRows, doublecol, &status);
+                fitsOut->writeColumn(fitsOut, TDOUBLE, col, 1, 1, nRows, doublecol);
                 break;
 
             case TSTRING:
                 for(j=0;j<nRows;j++) strcpy(strcol[j], tempStr);
-                fits_write_col(fitsOut, TSTRING, col, 1, 1, nRows, strcol, &status);
+                fitsOut->writeColumn(fitsOut, TSTRING, col, 1, 1, nRows, strcol);
                 break;
 
@@ -214 +214 @@
 }
 
-// count number of children with the provided name
-static int ippToPspsConfig_countChildren(xmlNode* rootNode, const char* name) {
+/*
+   Counts number of children with the provided name
+   */
+static int countChildren(xmlNode* rootNode, const char* name) {
 
     int count = 0;
@@ -228 +230 @@
 }
 
-// searches through this table and finds attribute value for a provided key
-static bool ippToPspsConfig_getRowAttribute(IppToPspsConfig* this, xmlNode* tableNode, 
+/**
+  Searches through this table and finds attribute value for a provided key
+  */
+static bool getRowAttribute(Config* this, xmlNode* tableNode, 
         const char* keyName, const char* keyValue, 
         const char* attName, char* attValue) {
@@ -243 +247 @@
 
             if (strcmp((const char*)node->name, "row")==0) {
-            //psLogMsg("ippToPsps", PS_LOG_INFO, " Looking for key '%s'",  keyName );
-
-                if (!ippToPspsConfig_getAttribute(node, keyName, buffer)) continue;
-            //psLogMsg("ippToPsps", PS_LOG_INFO, "Found key '%s' value '%s'",  keyName, buffer );
+                //psLogMsg("ippToPsps", PS_LOG_INFO, " Looking for key '%s'",  keyName );
+
+                if (!getAttribute(node, keyName, buffer)) continue;
+                //psLogMsg("ippToPsps", PS_LOG_INFO, "Found key '%s' value '%s'",  keyName, buffer );
 
                 if (strcmp(buffer, keyValue) != 0) continue;
-                ippToPspsConfig_getAttribute(node, attName, attValue);
+                getAttribute(node, attName, attValue);
                 //printf("FOUND %s %s %s %s \n", keyName, buffer, attName, attValue );
                 return true;
@@ -261 +265 @@
 }
 
-// opens an XML file and returns the document
-static xmlDoc* ippToPspsConfig_openXmlFile(const char* path) {
+/*
+   opens an XML file and returns the document
+   */
+static xmlDoc* openXmlFile(const char* path) {
 
     xmlDoc* doc = xmlReadFile(path, NULL, 0);
@@ -269 +275 @@
 }
 
-// closes an XML file 
-static bool ippToPspsConfig_closeXmlFile(xmlDoc* doc) {
+/*
+   closes an XML file 
+   */
+static bool closeXmlFile(xmlDoc* doc) {
 
     xmlFreeDoc(doc);
@@ -278 +286 @@
 }
 
-// gets filter ID for this filter name from 'init' data 
-static bool ippToPspsConfig_getInitValue(
-        IppToPspsConfig* this, 
+/**
+  Gets a value from the 'init' data 
+  */
+static bool getInitValue(
+        Config* this, 
         const char* tableName,
         const char* keyName, const char* keyValue,
@@ -290 +300 @@
     psStringAppend(&path, "%s/../init/data.xml", this->configsPath); // TODO nasty
 
-    xmlDoc* doc = ippToPspsConfig_openXmlFile(path);
+    xmlDoc* doc = openXmlFile(path);
 
     if (doc == NULL) {
@@ -313 +323 @@
 
             if (strcmp((const char*)node->name, "table")!=0) continue;
-            if (!ippToPspsConfig_getAttribute(node, "name", tempStr)) continue;
+            if (!getAttribute(node, "name", tempStr)) continue;
             if (strcmp(tempStr, tableName)!=0) continue;
 
-            ret = ippToPspsConfig_getRowAttribute(this, node, keyName, keyValue, attName, attValue);
+            ret = getRowAttribute(this, node, keyName, keyValue, attName, attValue);
             break;
         }
@@ -322 +332 @@
     }
 
-    ippToPspsConfig_closeXmlFile(doc);
+    closeXmlFile(doc);
 
     return ret;
 }
 
-// gets survey ID from survey name
-bool ippToPspsConfig_getSurveyId(IppToPspsConfig* this, const char* surveyType, int8_t* surveyId) {
+/*
+   Gets survey ID from survey name
+   */
+static bool getSurveyId(Config* this, const char* surveyType, int8_t* surveyId) {
 
     char buffer[10];
-    if (!ippToPspsConfig_getInitValue(this, "Survey", "name", surveyType, "surveyID", buffer)) {
+    if (!getInitValue(this, "Survey", "name", surveyType, "surveyID", buffer)) {
 
         *surveyId = -1;
@@ -341 +353 @@
 }
 
-// gets filter ID from filter type
-bool ippToPspsConfig_getFilterId(IppToPspsConfig* this, const char* filterType, int8_t* filterId) {
+/*
+   Gets filter ID from filter type
+   */
+static bool getFilterId(Config* this, const char* filterType, int8_t* filterId) {
 
     char tmp[2];
@@ -348 +362 @@
     tmp[1] = '\0';
     char buffer[10];
-    if (!ippToPspsConfig_getInitValue(this, "Filter", "filterType", tmp, "filterID", buffer)) {
+    if (!getInitValue(this, "Filter", "filterType", tmp, "filterID", buffer)) {
 
         *filterId = -1;
@@ -358 +372 @@
 }
 
-// populate the provided table with data from XML
-static bool ippToPspsConfig_populateTable(IppToPspsConfig_Table* table, xmlNode* rootElement, fitsfile *fitsOut) {
+/**
+  Populates the provided table with data from XML
+  */
+static bool populateTable(Table* table, xmlNode* rootElement, Fits *fitsOut) {
 
     char tempStr[100];
@@ -370 +386 @@
 
             if (strcmp((const char*)node->name, "table")!=0) continue;
-            if (!ippToPspsConfig_getAttribute(node, "name", tempStr)) continue;
+            if (!getAttribute(node, "name", tempStr)) continue;
             if (strcmp(tempStr, table->name)==0) {tableNode = node; break;}
         }
@@ -382 +398 @@
 
     // now count the number of rows
-    int nRows = ippToPspsConfig_countChildren(tableNode, "row");
+    int nRows = countChildren(tableNode, "row");
     if (nRows < 1) return false;
-    if (!ippToPspsConfig_createTable(table, fitsOut, nRows)) return false;
+    if (!createTable(table, fitsOut, nRows)) return false;
 
     int rows=0;
@@ -411 +427 @@
             col = i+1;
 
-            if (!ippToPspsConfig_getAttribute(node, table->columns[i].pspsName, tempStr)) continue;
+            if (!getAttribute(node, table->columns[i].pspsName, tempStr)) continue;
 
             strncpy(strcol[0], tempStr, 32);
@@ -420 +436 @@
                 case TBYTE:
                     bytecol[0] = atoi(tempStr);
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, bytecol, &status); 
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, bytecol); 
                     break;
                 case TSHORT:
                     shortcol[0] = atoi(tempStr);
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, shortcol, &status); 
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, shortcol); 
                     break;
                 case TLONG:
                 case TLONGLONG:
                     longcol[0] = atol(tempStr);
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, longcol, &status); 
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, longcol); 
                     break;
                 case TFLOAT:
                     floatcol[0] = atof(tempStr);
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, floatcol, &status);
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, floatcol);
                     break;
                 case TDOUBLE:
                     doublecol[0] = atof(tempStr);
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, doublecol, &status);
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, doublecol);
                     break;
                 case TSTRING:
-                    fits_write_col(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, strcol, &status); 
+                    fitsOut->writeColumn(fitsOut, table->columns[i].pspsType, col, rows, 1, 1, strcol); 
                     break;
 
@@ -460 +476 @@
 }
 
-// loads a table description from XML
-static bool ippToPspsConfig_loadTableDescription(IppToPspsConfig_Table* table, xmlNode* tableNode) {
+/**
+  Loads a table description from XML
+  */
+static bool loadTableDescription(Table* table, xmlNode* tableNode) {
 
     bool ret = true;
     char tableName[100];
-    ippToPspsConfig_getAttribute(tableNode, "name", tableName);
+    getAttribute(tableNode, "name", tableName);
     strcpy(table->name, tableName);
 
     // count how many columns we have coming in and allocate memory for them
-    table->numOfColumns = ippToPspsConfig_countChildren(tableNode, "column");
-    table->columns = calloc(table->numOfColumns, sizeof(IppToPspsConfig_Column));
+    table->numOfColumns = countChildren(tableNode, "column");
+    table->columns = calloc(table->numOfColumns, sizeof(Column));
     //    psLogMsg("ippToPsps", PS_LOG_INFO, " Found '%d' columns", table->numOfColumns);
 
@@ -484 +502 @@
 
         // column name
-        ippToPspsConfig_getAttribute(node, "name", buffer);
+        getAttribute(node, "name", buffer);
         sprintf(table->columns[columnNum].pspsName, buffer);
 
         // column type
-        ippToPspsConfig_getAttribute(node, "type", buffer);
+        getAttribute(node, "type", buffer);
         table->columns[columnNum].pspsType = ippToPsps_GetDataType(buffer);
 
         // default value
-        ippToPspsConfig_getAttribute(node, "default", buffer);
+        getAttribute(node, "default", buffer);
         sprintf(table->columns[columnNum].defaultValue, buffer);
 
         // comment
-        ippToPspsConfig_getAttribute(node, "comment", buffer);
+        getAttribute(node, "comment", buffer);
         sprintf(table->columns[columnNum].comment, buffer);
 
@@ -523 +541 @@
 }
 
-// read table shapes from XML file
-bool ippToPspsConfig_loadTableDescriptions(IppToPspsConfig* this) {
+/**
+  Reads table shapes from XML file
+  */
+static bool loadTableDescriptions(Config* this) {
 
     bool ret = true;
@@ -531 +551 @@
     psStringAppend(&path, "%s/tables.xml", this->configsPath);
 
-    xmlDoc* doc = ippToPspsConfig_openXmlFile(path);
+    xmlDoc* doc = openXmlFile(path);
 
     if (doc == NULL) {
@@ -549 +569 @@
 
     // count how many tables we have coming in and allocate memory for them
-    this->numOfTables = ippToPspsConfig_countChildren(rootElement, "table");
-    this->tables = calloc(this->numOfTables, sizeof(IppToPspsConfig_Table));
+    this->numOfTables = countChildren(rootElement, "table");
+    this->tables = calloc(this->numOfTables, sizeof(Table));
     //    psLogMsg("ippToPsps", PS_LOG_INFO, " Found '%d' tables", this->numOfTables);
 
     xmlNode* node = NULL;
-    IppToPspsConfig_Table* table = NULL;
+    Table* table = NULL;
 
     int tableNum = 0;
@@ -565 +585 @@
                 table = this->tables+tableNum;
 
-                if (!ippToPspsConfig_loadTableDescription(table, node)) ret = false;
+                if (!loadTableDescription(table, node)) ret = false;
                 else tableNum++;
             }
@@ -574 +594 @@
         psError(PS_ERR_IO, false, "Mismatch between number of tables expected (%d) and those found (%d)", this->numOfTables, tableNum);
 
-    ippToPspsConfig_closeXmlFile(doc);
+    closeXmlFile(doc);
 
     return ret;
 }
 
-// loads mappings from XML for a particular table
-static bool ippToPspsConfig_loadTableMappings(IppToPspsConfig* this, xmlNode* tableNode) {
+/**
+  Loads mappings from XML for a particular table
+  */
+static bool loadTableMappings(Config* this, xmlNode* tableNode) {
 
     bool ret = false;
@@ -587 +609 @@
 
     char tableName[100];
-    ippToPspsConfig_getAttribute(tableNode, "name", tableName);
-
-    IppToPspsConfig_Table* table = ippToPspsConfig_findTable(this, tableName);
-    IppToPspsConfig_Column* column = NULL;
+    getAttribute(tableNode, "name", tableName);
+
+    Table* table = findTable(this, tableName);
+    Column* column = NULL;
     if (!table) return false;
 
@@ -603 +625 @@
 
                 // column type
-                ippToPspsConfig_getAttribute(node, "pspsName", buffer);
-                column = ippToPspsConfig_findColumn(table, buffer);
+                getAttribute(node, "pspsName", buffer);
+                column = findColumn(table, buffer);
 
                 if (!column) continue;
 
                 // IPP name
-                ippToPspsConfig_getAttribute(node, "ippName", buffer);
+                getAttribute(node, "ippName", buffer);
                 strcpy(column->ippName, buffer);
 
                 // IPP type
-                ippToPspsConfig_getAttribute(node, "ippType", buffer);
+                getAttribute(node, "ippType", buffer);
                 column->ippType = ippToPsps_GetDataType(buffer); 
 
@@ -626 +648 @@
 }
 
-// reads table mappings from XML file
-static bool ippToPspsConfig_loadMappings(IppToPspsConfig* this) {
+/**
+  Reads table mappings from XML file
+  */
+static bool loadMappings(Config* this) {
 
     bool ret = true;
@@ -634 +658 @@
     psStringAppend(&path, "%s/map.xml", this->configsPath);
 
-    xmlDoc* doc = ippToPspsConfig_openXmlFile(path);
+    xmlDoc* doc = openXmlFile(path);
 
     if (doc == NULL) {
@@ -657 +681 @@
             if (strcmp((const char*)node->name, "table")==0) {
 
-                if (!ippToPspsConfig_loadTableMappings(this, node)) ret = false;
+                if (!loadTableMappings(this, node)) ret = false;
             }
         }
     }
 
-    ippToPspsConfig_closeXmlFile(doc);
+    closeXmlFile(doc);
 
     return ret;
 }
 
-// populate the provided table with data from XML
-bool ippToPspsConfig_populateFromFile(IppToPspsConfig* this, fitsfile *fitsOut) {
+/**
+  Populate the provided table with data from XML
+  */
+static bool populateFromFile(Config* this, Fits *fitsOut) {
 
     bool ret = true;
@@ -674 +700 @@
     psStringAppend(&path, "%s/data.xml", this->configsPath);
 
-    xmlDoc* doc = ippToPspsConfig_openXmlFile(path);
+    xmlDoc* doc = openXmlFile(path);
 
     if (doc == NULL) {
@@ -690 +716 @@
 
     for (uint32_t i=0; i<this->numOfTables; i++) {
-        if (!ippToPspsConfig_populateTable(this->tables+i, rootElement, fitsOut)) {
+        if (!populateTable(this->tables+i, rootElement, fitsOut)) {
             ret = false;
         }
     }
 
-    ippToPspsConfig_closeXmlFile(doc);
+    closeXmlFile(doc);
 
     return ret;
 }
 
-// gets the contents of a FITS column vector
-bool ippToPspsConfig_getColumnVector(
-        int col,
-        long row,
-        int type,
-        int repeat,
-        float* vector,
-        fitsfile *fitsIn) {
-
-    int status = 0;
-    int anynull = 0;  
-
-    fits_read_col(fitsIn, type, col, row, 1, repeat, NULL, vector, &anynull, &status);
-
-    if (status) {
-        psError(PS_ERR_IO, false, "Failed to read vector column %d row %ld", col, row);
-        return false;
-    }
-
-    int i;
-    for(i=0; i<repeat; i++) printf("JJJ %f\n", vector[i]);
-
-    return true;
-}
-
-// gets metadata about a column 
-bool ippToPspsConfig_getFitsColumnMeta(
-        char* name,
-        int* colNum,
-        int* type,
-        long* repeat,
-        fitsfile *fitsIn) {
-
-    int status = 0;
-    fits_get_colnum(fitsIn, CASESEN, name, colNum, &status);
-    if (status) {
-        psError(PS_ERR_IO, false, "Unable to read col '%s'", name);
-        return false;
-    }
-
-    status = 0;
-    fits_get_eqcoltype(fitsIn, *colNum, type, repeat, NULL, &status);
-    if (status) {
-        psError(PS_ERR_IO, false, "Unable to read type info for '%s'", name);
-        return false;
-    }
-
-    return true;
-}
-
-// populate with data from another FITS table into this one
-static bool ippToPspsConfig_populateTableFromFits(
-        IppToPspsConfig_Table* table,
-        fitsfile *fitsIn, 
-        fitsfile *fitsOut,
+/**
+  Populate with data from another FITS table into this one
+  */
+static bool populateTableFromFits(
+        Table* table,
+        Fits *fitsIn, 
+        Fits *fitsOut,
         const long nRows, 
         const bool fromHeader) {
@@ -770 +748 @@
         strcol[i] = (char*)calloc(50,sizeof(char)); // TODO 20? size issue
 
-    int8_t int8null = -99;
-    int16_t int16null = -999;
-    long longnull = -999;
-    float floatnull = -999.0;
-    double doublenull = -999.0;
-
-    int anynull = 0;
-    int readStatus = 0;
-    int writeStatus = 0;
-
     // first loop round all columns and get IPP col numbers for provided column names TODO only do once, first time in
     if(!fromHeader) {
@@ -787 +755 @@
             if (strlen(table->columns[i].ippName) < 1) continue;
 
-int dummy;
-
-            if (!ippToPspsConfig_getFitsColumnMeta(
-                        table->columns[i].ippName,
-                        &table->columns[i].ippColNum,
-          //              &table->columns[i].ippType,  TODO getting wrong type for some reason
-                        &dummy,
-                        &table->columns[i].ippRepeat,
-                        fitsIn)) {return false;}
+            int dummy; // TODO getting wrong type for some reason
+            if (!fitsIn->getColumnMeta(fitsIn, table->columns[i].ippName, &table->columns[i].ippColNum, &dummy, &table->columns[i].ippRepeat)) return false;
         }
     }
@@ -802 +763 @@
     for (uint32_t i=0; i<table->numOfColumns; i++) {
 
-        readStatus = 0;
-        writeStatus = 0;
-
         if (!table->columns[i].usingDefault) {
 
@@ -813 +771 @@
                 case TBYTE:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TBYTE, table->columns[i].ippName, &int8col[0], NULL, &readStatus);
-                        if (!isfinite(int8col[0])) int8col[0] = int8null;
+                        fitsIn->getHeaderKeyValue(fitsIn, TBYTE, table->columns[i].ippName, &int8col[0]); 
                     }
-                    else fits_read_col(fitsIn, TBYTE, table->columns[i].ippColNum, 1, 1, nRows, &int8null, int8col, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TBYTE, col, 1, 1, nRows, int8col, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TBYTE, table->columns[i].ippColNum, 1, 1, nRows, int8col);
+                    fitsOut->writeColumn(fitsOut, TBYTE, col, 1, 1, nRows, int8col);
                     break;
                 case TSHORT:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TSHORT, table->columns[i].ippName, &int16col[0], NULL, &readStatus);
-                        if (!isfinite(int16col[0])) int16col[0] = int16null;
+                        fitsIn->getHeaderKeyValue(fitsIn, TSHORT, table->columns[i].ippName, &int16col[0]);
                     }
-                    else fits_read_col(fitsIn, TSHORT, table->columns[i].ippColNum, 1, 1, nRows, &int16null, int16col, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TSHORT, col, 1, 1, nRows, int16col, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TSHORT, table->columns[i].ippColNum, 1, 1, nRows, int16col);
+                    fitsOut->writeColumn(fitsOut, TSHORT, col, 1, 1, nRows, int16col);
                     break;
                 case TLONG:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TLONG, table->columns[i].ippName, &longcol[0], NULL, &readStatus);
-                        if (!isfinite(longcol[0])) longcol[0] = longnull;
+                        fitsIn->getHeaderKeyValue(fitsIn, TLONG, table->columns[i].ippName, &longcol[0]);
                     }
-                    else fits_read_col(fitsIn, TLONG, table->columns[i].ippColNum, 1, 1, nRows, &longnull, longcol, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TLONG, col, 1, 1, nRows, longcol, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TLONG, table->columns[i].ippColNum, 1, 1, nRows, longcol);
+                    fitsOut->writeColumn(fitsOut, TLONG, col, 1, 1, nRows, longcol);
                     break;
                 case TLONGLONG:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TLONGLONG, table->columns[i].ippName, &longcol[0], NULL, &readStatus);
-                        if (!isfinite(longcol[0])) longcol[0] = longnull;
+                        fitsIn->getHeaderKeyValue(fitsIn, TLONGLONG, table->columns[i].ippName, &longcol[0]);
                     }
-                    else fits_read_col(fitsIn, TLONGLONG, table->columns[i].ippColNum, 1, 1, nRows, &longnull, longcol, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TLONGLONG, col, 1, 1, nRows, longcol, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TLONGLONG, table->columns[i].ippColNum, 1, 1, nRows, longcol);
+                    fitsOut->writeColumn(fitsOut, TLONGLONG, col, 1, 1, nRows, longcol);
                     break;
                 case TFLOAT:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TFLOAT, table->columns[i].ippName,&floatcol[0], NULL, &readStatus); 
-                        if (!isfinite(floatcol[0])) floatcol[0] = floatnull;
+                        fitsIn->getHeaderKeyValue(fitsIn, TFLOAT, table->columns[i].ippName,&floatcol[0]); 
                     }
-                    else fits_read_col(fitsIn, TFLOAT, table->columns[i].ippColNum, 1, 1, nRows, &floatnull, floatcol, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TFLOAT, col, 1, 1, nRows, floatcol, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TFLOAT, table->columns[i].ippColNum, 1, 1, nRows, floatcol);
+                    fitsOut->writeColumn(fitsOut, TFLOAT, col, 1, 1, nRows, floatcol);
                     break;
                 case TDOUBLE:
                     if (fromHeader) {
-                        fits_read_key(fitsIn, TDOUBLE, table->columns[i].ippName, &doublecol[0], NULL, &readStatus);
-                        if (!isfinite(doublecol[0])) doublecol[0] = doublenull;
+                        fitsIn->getHeaderKeyValue(fitsIn, TDOUBLE, table->columns[i].ippName, &doublecol[0]);
                     }
-                    else fits_read_col(fitsIn, TDOUBLE, table->columns[i].ippColNum, 1, 1, nRows, &doublenull, doublecol, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TDOUBLE, col, 1, 1, nRows, doublecol, &writeStatus);
+                    else fitsIn->readColumn(fitsIn, TDOUBLE, table->columns[i].ippColNum, 1, 1, nRows, doublecol);
+                    fitsOut->writeColumn(fitsOut, TDOUBLE, col, 1, 1, nRows, doublecol);
                     break;
                 case TSTRING:
-                    if (fromHeader) fits_read_key(fitsIn, TSTRING, table->columns[i].ippName, strcol[0], NULL, &readStatus);
-                    else fits_read_col(fitsIn, TSTRING, table->columns[i].ippColNum, 1, 1, nRows, " ", strcol, &anynull, &readStatus);
-                    fits_write_col(fitsOut, TSTRING, col, 1, 1, nRows, strcol, &writeStatus);
+                    if (fromHeader) fitsIn->getHeaderKeyValue(fitsIn, TSTRING, table->columns[i].ippName, strcol[0]);
+                    else fitsIn->readColumn(fitsIn, TSTRING, table->columns[i].ippColNum, 1, 1, nRows, strcol);
+                    fitsOut->writeColumn(fitsOut, TSTRING, col, 1, 1, nRows, strcol);
                     break;
 
@@ -870 +822 @@
                     break;
             }
-
-            // TODO need these errors, but strange error handling runs out of memory
-            //if (readStatus) {
-            //    psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s', type %d", 
-            //        table->columns[i].ippColNum, table->columns[i].ippName, table->columns[i].ippType);
-            //    fits_report_error(stderr, readStatus);
-            //}
-            //if (writeStatus) {
-            //    psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
-            //    fits_report_error(stderr, writeStatus);
-            //}
         }
     }
@@ -895 +836 @@
 }
 
-// creates and populates a table
-bool ippToPspsConfig_writeTable(
-        IppToPspsConfig* this, 
-        fitsfile* fitsIn,
-        fitsfile* fitsOut,
+/**
+  Creates and populates a table
+  */
+static bool createAndPopulateTable(
+        Config* this, 
+        Fits* fitsIn,
+        Fits* fitsOut,
         const long nRows,
         const char* tableName,
-        const bool fromHeader) {
-
-
-    IppToPspsConfig_Table* table = ippToPspsConfig_findTable(this, tableName);
+        const int fromHeader) {
+
+    Table* table = findTable(this, tableName);
     if (!table) return false;
 
-    if(!ippToPspsConfig_createTable(table, fitsOut, nRows)) return false;
-    return ippToPspsConfig_populateTableFromFits(table, fitsIn, fitsOut, nRows, fromHeader);
-}
-
-// Destructor.
-void ippToPspsConfig_Destructor(IppToPspsConfig* this) {
+    if(!createTable(table, fitsOut, nRows)) return false;
+    return populateTableFromFits(table, fitsIn, fitsOut, nRows, fromHeader);
+}
+
+/**
+  Destructor.
+  */
+static void destroy(Config* this) {
 
     if (this != NULL ) {
@@ -927 +871 @@
 }
 
-// Constructor. Loads IPP -> PSPS mappings from a csv
-IppToPspsConfig* ippToPspsConfig_Constructor(const char* path) {
-
-    IppToPspsConfig* this = NULL;
-
-    this = malloc(sizeof(IppToPspsConfig));
+/**
+  Constructor. Loads IPP -> PSPS mappings from an XML file
+  */
+Config* new_Config(const char* path) {
+
+    Config* this = (Config*)calloc(1, sizeof(Config));
 
     this->configsPath = NULL;
     psStringAppend(&this->configsPath, path);
 
+    // method pointers
+    this->getFilterId = getFilterId;
+    this->getSurveyId = getSurveyId;
+    this->createAndPopulateTable = createAndPopulateTable;
+    this->populateFromFile = populateFromFile;
+    this->destroy = destroy;
+
     // load tables descriptions from XML
-    if (ippToPspsConfig_loadTableDescriptions(this)) {
+    if (loadTableDescriptions(this)) {
 
         // load any mappings we may have from XML        
-        ippToPspsConfig_loadMappings(this);
+        loadMappings(this);
     }