Changeset 18413 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Jul 3, 2008, 10:03:53 AM (18 years ago)

Author:

Paul Price

Message:

Making trace for format problems more easily accessible.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (10 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -415 +415 @@
             darkNorm->data.md = new;
         } else if (darkNorm->type != PS_DATA_METADATA) {
-            psWarning("DARK.NORM in camera %s is not of type STR or METADATA (%x)", cameraName, darkNorm->type);
+            psWarning("DARK.NORM in camera %s is not of type STR or METADATA (%x)",
+                      cameraName, darkNorm->type);
         }
     } else {
@@ -861 +862 @@
         } else {
             char *dbserver = argv[argNum]; // The camera configuration file to read
-            if (!psMetadataAddStr(config->complete, PS_LIST_TAIL, "DBSERVER", PS_META_REPLACE, NULL, dbserver)) {
+            if (!psMetadataAddStr(config->complete, PS_LIST_TAIL, "DBSERVER", PS_META_REPLACE,
+                                  NULL, dbserver)) {
                 psWarning("Failed to overwrite .ipprc DBSERVER value");
             }
@@ -973 +975 @@
         if (! headerItem) {
             // rule item not found in header
-            psTrace("psModules.config", 5, "Can't find %s", ruleItem->name);
+            psTrace("psModules.config.format", 5, "Can't find %s", ruleItem->name);
             *valid = false;
             continue;
@@ -982 +984 @@
             // Check to see if the rule works
             if (!psMetadataItemCompare(headerItem, ruleItem)) {
-                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
+                psTrace("psModules.config.format", 5, "%s doesn't match.", ruleItem->name);
                 *valid = false;
             }
@@ -996 +998 @@
                 if (psMetadataItemCompare(headerItem, entry)) {
                     found = true;
-                    psTrace("psModules.config", 5, "%s in multi list matches.", ruleItem->name);
+                    psTrace("psModules.config.format", 5, "%s in multi list matches.", ruleItem->name);
                     break;
                 }
@@ -1002 +1004 @@
             if (!found) {
                 *valid = false;
-                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
+                psTrace("psModules.config.format", 5, "%s doesn't match.", ruleItem->name);
             }
             continue;
@@ -1060 +1062 @@
         psMetadata *testFormat = formatsItem->data.md; // Format to test against
 
-        psTrace("psModules.config", 5, "trying format %s", formatsItem->name);
+        psTrace("psModules.config.format", 5, "trying format %s", formatsItem->name);
 
         bool valid = false;
@@ -1071 +1073 @@
         if (valid) {
             if (!*format) {
-                psLogMsg("psModules.config", PS_LOG_INFO, "Camera %s, format %s matches header.\n",
+                psLogMsg("psModules.config.format", PS_LOG_INFO, "Camera %s, format %s matches header.\n",
                          cameraName, formatsItem->name);
                 *format = psMemIncrRefCounter(testFormat);
@@ -1091 +1093 @@
 // camera.  If we are discovering the camera (config->camera == NULL), then we also load the
 // recipe files for the camera.
-psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *formatName, pmConfig *config, const psMetadata *header, bool readRecipes)
+psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *formatName, pmConfig *config,
+                                           const psMetadata *header, bool readRecipes)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -1123 +1126 @@
         while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
             // Open the camera information
-            psTrace("psModules.config", 3, "Inspecting camera %s (%s)\n", camerasItem->name,
+            psTrace("psModules.config.format", 3, "Inspecting camera %s (%s)\n", camerasItem->name,
                     camerasItem->comment);
             assert(camerasItem->type == PS_DATA_METADATA); // It should be because we've read it in or deleted