Changeset 31030 for trunk/ippToPsps/src/InitData.c

Timestamp:

Mar 23, 2011, 4:27:17 PM (15 years ago)

Author:

rhenders

Message:

Introduced new logging system in order to provide proper audit trail

File:

• trunk/ippToPsps/src/InitData.c (modified) (6 diffs)

trunk/ippToPsps/src/InitData.c

@@ -28 +28 @@
   */
 static bool getRowAttribute(
+        InitData* this, 
         xmlNode* tableNode,
         const char* keyName, 
@@ -58 +59 @@
     }
 
-    psError(PS_ERR_UNKNOWN, 
-            false, 
-            "* InitData: Could not find value for '%s' for '%s' with value '%s'", 
+    this->logger->print(this->logger, MSG_ERROR, 
+            "InitData: Could not find value for '%s' for '%s' with value '%s'\n", 
             attName, keyName, keyValue);
 
@@ -83 +83 @@
 
     if (strcmp((const char*)rootElement->name, "tabledata")!=0) {
-        psError(PS_ERR_IO, false, "* InitData: Root node of XML is not 'tabledata', as it should be");
+        this->logger->print(this->logger, MSG_ERROR, 
+                "InitData: Root node of XML is not 'tabledata', as it should be\n");
         return false;
     }
@@ -98 +99 @@
             if (strcmp(tempStr, tableName)!=0) continue;
 
-            ret = getRowAttribute(node, keyName, keyValue, attName, attValue);
+            ret = getRowAttribute(this, node, keyName, keyValue, attName, attValue);
             break;
         }
@@ -155 +156 @@
     }
 
-    psLogMsg("ippToPsps", PS_LOG_INFO, "* InitData: destructor");
+    this->logger->print(this->logger, MSG_DEBUG, "InitData: destructor\n");
 
     free(this);
@@ -163 +164 @@
   Constructor.
   */
-InitData* new_InitData(const char* path) {
+InitData* new_InitData(const char* path, Logger* logger) {
 
-    psLogMsg("ippToPsps", PS_LOG_INFO, "* InitData: constructor");
+
 
     InitData* this = (InitData*)calloc(1, sizeof(InitData));
+    this->logger = logger;
+
+    this->logger->print(this->logger, MSG_DEBUG, "InitData: Constructor\n");
 
     sprintf(this->path, "%s/init/data.xml", path);
 
     this->doc = xmlReadFile(this->path, NULL, 0);
-    if (this->doc == NULL) psError(PS_ERR_IO, false, "* InitData: Unable to open XML file at %s", this->path);
+    this->logger->print(this->logger, MSG_ERROR, 
+            "InitData: Unable to open XML file at %s\n", this->path);
 
     // method pointers