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

Timestamp:

Mar 24, 2011, 11:03:32 AM (15 years ago)

Author:

rhenders

Message:

Changes to reflect those in Logger class

File:

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

trunk/ippToPsps/src/InitData.c

@@ -60 +60 @@
 
     this->logger->print(this->logger, MSG_ERROR, 
-            "InitData: Could not find value for '%s' for '%s' with value '%s'\n", 
+            "InitData", "Could not find value for '%s' for '%s' with value '%s'\n", 
             attName, keyName, keyValue);
 
@@ -84 +84 @@
     if (strcmp((const char*)rootElement->name, "tabledata")!=0) {
         this->logger->print(this->logger, MSG_ERROR, 
-                "InitData: Root node of XML is not 'tabledata', as it should be\n");
+                "InitData", "Root node of XML is not 'tabledata', as it should be\n");
         return false;
     }
@@ -156 +156 @@
     }
 
-    this->logger->print(this->logger, MSG_DEBUG, "InitData: destructor\n");
+    this->logger->print(this->logger, MSG_DEBUG, "InitData", "Destructor\n");
 
     free(this);
@@ -166 +166 @@
 InitData* new_InitData(const char* path, Logger* logger) {
 
-
-
     InitData* this = (InitData*)calloc(1, sizeof(InitData));
     this->logger = logger;
 
-    this->logger->print(this->logger, MSG_DEBUG, "InitData: Constructor\n");
+    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);
-    this->logger->print(this->logger, MSG_ERROR, 
-            "InitData: Unable to open XML file at %s\n", this->path);
+
+    if (this->doc == NULL)
+        this->logger->print(this->logger, MSG_ERROR, 
+                "InitData", "Unable to open init data file at '%s'\n", this->path);
+    else
+        this->logger->print(this->logger, MSG_INFO, 
+                "InitData", "Using init data file at '%s'\n", this->path);
+
 
     // method pointers