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

Timestamp:

Oct 9, 2007, 9:18:01 AM (19 years ago)

Author:

Paul Price

Message:

Turning warnings into traces when going through the cameras to replace
file rules ('-F' command-line option) --- in response to bug 975.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -705 +705 @@
         psMetadataItem *cameraItem;     // Item from iteration
         while ((cameraItem = psMetadataGetAndIncrement(camerasIter))) {
+            // Silently ignore problems --- they will be caught later, because if the user wants the nominated
+            // file and it's not available for that camera, then they will know.
+
             if (cameraItem->type != PS_DATA_METADATA) {
-                psWarning("Entry %s in CAMERAS is not of type METADATA --- ignored.", cameraItem->name);
+                psTrace("psModules.config", 2,
+                        "Entry %s in CAMERAS is not of type METADATA --- ignored.", cameraItem->name);
                 continue;
             }
@@ -713 +717 @@
             psMetadata *newRule = pmConfigFileRule(config, camera, new); // The rule of interest
             if (!newRule) {
-                psWarning("Unable to find filerule %s in camera %s --- ignored.", new, cameraItem->name);
+                psTrace("psModules.config", 2,
+                        "Unable to find filerule %s in camera %s --- ignored.", new, cameraItem->name);
                 continue;
             }
@@ -720 +725 @@
             psMetadata *filerules = psMetadataLookupMetadata(NULL, camera, "FILERULES"); // File rules
             if (!filerules) {
-                psWarning("Can't find FILERULES of type METADATA in camera %s --- ignored.",
-                          cameraItem->name);
+                psTrace("psModules.config", 2,
+                        "Can't find FILERULES of type METADATA in camera %s --- ignored.", cameraItem->name);
                 continue;
             }