Changeset 15052

Timestamp:

Sep 27, 2007, 2:38:19 PM (19 years ago)

Author:

eugene

Message:

handle MULTI entries in FILTER.ID

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -132 +132 @@
     // the metadata is in the format (internal) STR (external)
     // find the first internal name that matches
-    psString value = psMetadataLookupStr(&mdok, filters, key); // Value to use
-    if (!mdok || !value || strlen(value) == 0) {
+    psMetadataItem *item = psMetadataLookup (filters, key);
+    if (!item) {
         psError(PS_ERR_UNEXPECTED_NULL, true,
                 "Unable to find %s in FILTER.ID in camera configuration.\n", key);
@@ -139 +139 @@
     }
 
-    return psMetadataItemAllocStr(concept->name, concept->comment, value);
+    if (item->type == PS_DATA_STRING) {
+        return psMetadataItemAllocStr(concept->name, concept->comment, item->data.V);
+    }
+
+    if (item->type == PS_DATA_METADATA_MULTI) {
+        psMetadataItem *entry = psListGet (item->data.list, PS_LIST_HEAD);
+        if (!entry) {
+            psError(PS_ERR_UNEXPECTED_NULL, true,
+                    "List for %s in FILTER.ID in camera configuration is empty.\n", key);
+            return NULL;
+        }
+        return psMetadataItemAllocStr(concept->name, concept->comment, entry->data.V);
+    }
+
+    psError(PS_ERR_UNEXPECTED_NULL, true,
+            "Unable to find %s in FILTER.ID in camera configuration.\n", key);
+    return NULL;
 }