Changeset 31015 for trunk/ippToPsps/src

Timestamp:

Mar 23, 2011, 9:33:05 AM (15 years ago)

Author:

rhenders

Message:

New class to encapsulate initialization data

Location:

trunk/ippToPsps/src

Files:

• Batch.c (modified) (6 diffs)
• Batch.h (modified) (2 diffs)
• Config.c (modified) (6 diffs)
• Config.h (modified) (1 diff)
• DetectionBatch.c (modified) (1 diff)
• InitData.c (added)
• InitData.h (added)
• Makefile.am (modified) (3 diffs)
• StackBatch.c (modified) (1 diff)

trunk/ippToPsps/src/Batch.c

@@ -87 +87 @@
     if (this->dvoConfig != NULL) dvoConfigFree(this->dvoConfig);
 
+    // destroy objects
     this->config->destroy(this->config);
+    this->initData->destroy(this->initData);
 
     pmConfigDone();
@@ -210 +212 @@
     }
 
-
-
+    // check we have some input paths
     if (haveFitsInPath && !readInputFilePaths(this)) {
 
@@ -218 +219 @@
     }
 
-    // create a config object
+    // create an InitData object and get survey ID
+    this->initData = new_InitData(configsBaseDir);
+    if (strlen(this->surveyType) > 0 && 
+            !this->initData->getSurveyId(this->initData, this->surveyType, &this->surveyID)) {
+
+        this->exitCode = PS_EXIT_CONFIG_ERROR;
+        return false;
+    }
+
+    // create a Config object
     strcat(configsBaseDir, configsDir);
     this->config = new_Config(configsBaseDir);
@@ -227 +237 @@
     }
 
-    // get survey ID using config object
-    if (strlen(this->surveyType) > 0 && !this->config->getSurveyId(this->config, this->surveyType, &this->surveyID)) {
-
-        this->exitCode = PS_EXIT_CONFIG_ERROR;
-        return false;
-    }
     // create full FITS out path
-    sprintf (fitsOutPath, "%s/%s", fitsOutPath, fitsOutFile);
+    sprintf(fitsOutPath, "%s/%s", fitsOutPath, fitsOutFile);
 
     // create an output FITS file
@@ -321 +325 @@
     // set up function pointers
     this->parseArguments = parseArguments;
-    //this->init = init;
     this->print = print;
-    this->destroy = destroy;
-
     this->gotResultsPath = gotResultsPath;
     this->gotFitsInPath = gotFitsInPath;
@@ -330 +331 @@
     this->gotConfig = gotConfig;
     this->gotSurveyType = gotSurveyType;
+    this->destroy = destroy;
 
     assert(this);

trunk/ippToPsps/src/Batch.h

@@ -12 +12 @@
 #define IPPTOPSPS_BATCH_H
 
-#include <psmodules.h>
-#include <dvo_util.h>
-#include "Config.h"
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <psmodules.h>
+#include <dvo_util.h>
+
+#include "Config.h"
 #include "Fits.h"
+#include "InitData.h"
 
 /**
@@ -42 +44 @@
     pmConfig* pmconfig;         // pmConfig
     dvoConfig* dvoConfig;       // dvo database
-    Config* config;    // config structure
+    Config* config;             // Config object
+    InitData* initData;         // InitData object
     char todaysDate[20];        // today's date
     int exitCode;               // ps exit code

trunk/ippToPsps/src/Config.c

@@ -15 +15 @@
 
 /**
-   Gets PS type from string
+   Gets PS type from string TODO FITS types? should be in Fits class
    */
 static int ippToPsps_GetDataType(char *typename) {
@@ -199 +199 @@
             default:
                 break;
-
         }
     }
@@ -230 +229 @@
 }
 
-/**
-  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) {
-
-    xmlNode* node = NULL;
-
-    char buffer[100];
-
-    // loop round all available rows for this table
-    for (node = tableNode->children; node; node = node->next) {
-        if (node->type == XML_ELEMENT_NODE) {
-            //psLogMsg("ippToPsps", PS_LOG_INFO, "Node name '%s'",  (const char*)node->name );
-
-            if (strcmp((const char*)node->name, "row")==0) {
-                //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;
-                getAttribute(node, attName, attValue);
-                //printf("FOUND %s %s %s %s \n", keyName, buffer, attName, attValue );
-                return true;
-
-            }
-        }
-    }
-
-    psLogMsg("ippToPsps", PS_LOG_INFO, "Could not find value for '%s' for '%s' with value '%s'", attName, keyName, keyValue );
-    return false;
-}
-
 /*
    opens an XML file and returns the document
@@ -283 +247 @@
     xmlCleanupParser();
 
-    return true;
-}
-
-/**
-  Gets a value from the 'init' data 
-  */
-static bool getInitValue(
-        Config* this, 
-        const char* tableName,
-        const char* keyName, const char* keyValue,
-        const char* attName, char* attValue) {
-
-    bool ret = true;
-
-    psString path = NULL;
-    psStringAppend(&path, "%s/../init/data.xml", this->configsPath); // TODO nasty
-
-    xmlDoc* doc = openXmlFile(path);
-
-    if (doc == NULL) {
-        psFree(path);
-        return false;
-    }
-    psFree(path);
-
-    xmlNode* rootElement = xmlDocGetRootElement(doc);
-
-    if (strcmp((const char*)rootElement->name, "tabledata")!=0) {
-        psError(PS_ERR_IO, false, "Root node of XML is not 'tabledata', as it should be");
-        return false;
-    }
-
-    xmlNode* node = NULL;
-    char tempStr[100];
-
-    // loop round all available tables
-    for (node = rootElement->children; node; node = node->next) {
-        if (node->type == XML_ELEMENT_NODE) {
-
-            if (strcmp((const char*)node->name, "table")!=0) continue;
-            if (!getAttribute(node, "name", tempStr)) continue;
-            if (strcmp(tempStr, tableName)!=0) continue;
-
-            ret = getRowAttribute(this, node, keyName, keyValue, attName, attValue);
-            break;
-        }
-
-    }
-
-    closeXmlFile(doc);
-
-    return ret;
-}
-
-/*
-   Gets survey ID from survey name
-   */
-static bool getSurveyId(Config* this, const char* surveyType, int8_t* surveyId) {
-
-    char buffer[10];
-    if (!getInitValue(this, "Survey", "name", surveyType, "surveyID", buffer)) {
-
-        *surveyId = -1;
-        return false;
-    }
-
-    *surveyId = atoi(buffer);
-    return true;
-}
-
-/*
-   Gets filter ID from filter type
-   */
-static bool getFilterId(Config* this, const char* filterType, int8_t* filterId) {
-
-    char tmp[2];
-    strncpy(tmp,filterType,1);
-    tmp[1] = '\0';
-    char buffer[10];
-    if (!getInitValue(this, "Filter", "filterType", tmp, "filterID", buffer)) {
-
-        *filterId = -1;
-        return false;
-    }
-
-    *filterId = atoi(buffer);
     return true;
 }
@@ -859 +737 @@
 static void destroy(Config* this) {
 
-    if (this != NULL ) {
-
-        // TODO check logic here
-        for (int i=0;i<this->numOfTables;i++)
-            free(this->tables[i].columns);
-
-        free(this->tables);
-        psFree(this->configsPath);
-        free(this);
-    }
+    if (this == NULL) return;
+
+    // TODO check logic here
+    for (int i=0;i<this->numOfTables;i++)
+        free(this->tables[i].columns);
+
+    free(this->tables);
+    psFree(this->configsPath);
+    free(this);
 }
 
@@ -882 +759 @@
 
     // method pointers
-    this->getFilterId = getFilterId;
-    this->getSurveyId = getSurveyId;
     this->createAndPopulateTable = createAndPopulateTable;
     this->populateFromFile = populateFromFile;

trunk/ippToPsps/src/Config.h

@@ -51 +51 @@
 
     // methods
-    bool (*getFilterId)();
-    bool (*getSurveyId)();
     bool (*createAndPopulateTable)();
     bool (*populateFromFile)();

trunk/ippToPsps/src/DetectionBatch.c

@@ -63 +63 @@
     // FrameMeta values
     int8_t filterID = -1;
-    if (!this->base.config->getFilterId(this->base.config, filterType, &filterID)) {
+    if (!this->base.initData->getFilterId(this->base.initData, filterType, &filterID)) {
     
         this->base.exitCode = PS_EXIT_DATA_ERROR;

trunk/ippToPsps/src/Makefile.am

@@ -32 +32 @@
         Version.c \
         Fits.c \
+        InitData.c \
         Config.c
 
@@ -42 +43 @@
         Version.c \
         Fits.c \
+        InitData.c \
         Config.c
 
@@ -52 +54 @@
         Version.c \
         Fits.c \
+        InitData.c \
         Config.c
 

trunk/ippToPsps/src/StackBatch.c

@@ -323 +323 @@
 
     int8_t filterID = -1;
-    if (!this->base.config->getFilterId(this->base.config, filterType, &filterID)) {
+    if (!this->base.initData->getFilterId(this->base.initData, filterType, &filterID)) {
 
         //        this->base.exitCode = PS_EXIT_DATA_ERROR;