Changeset 18895 for gsdl/trunk/runtime-src/src/oaiservr/metaformat.cpp

Timestamp:

2009-04-06T13:18:45+12:00 (15 years ago)

Author:

kjdon

Message:

added is_valid_element to metaformat, which checks elementSet for the element name. metaformat subclass constructors must set up elementSet. Currently they do this in the code. would be good if it could read in from a file eventually, maybe?? When metaformat is outputting the m,etadata, it checks whether the element is valid before outputting. otherwise it will invalidate the response as it won't conform to the schema. also, changed where we lowercased the entire name to lowercasing only the first letter - some qdc fields have an internal upper case letter.

File:

• gsdl/trunk/runtime-src/src/oaiservr/metaformat.cpp (modified) (3 diffs)

gsdl/trunk/runtime-src/src/oaiservr/metaformat.cpp

@@ -69 +69 @@
     if (metaItem == this->formatPrefix()) {
       metaItem = substr(last+1, here->first.end()); // Get the rest of the metadata tag (it's name) but without the '.'
-      lc(metaItem); // Convert it to lowercase for putting in the xml tags
-
+      lc(metaItem.begin(),metaItem.begin()+1); // We want lowercase, but some of the fields in qualified dublin core have internal upper case, eg instructionalMethod. So we assume that lowercasing the first letter is enough
       if (doOutput) {
-    this->output_item(output, utf8convert, headerDone, metaItem, here->second.values);
+    if (this->is_valid_element(metaItem)) {
+      
+      this->output_item(output, utf8convert, headerDone, metaItem, here->second.values);
+    }
       }
       else {
@@ -86 +88 @@
     // particular metadata is stuff we don't want?
     if (doOutput) {
-      this->output_item(output, utf8convert, headerDone, mapTo, here->second.values);
+      if (this->is_valid_element(mapTo)) {
+        this->output_item(output, utf8convert, headerDone, mapTo, here->second.values);
+      }
     }
     else {
@@ -115 +119 @@
   ofstream o("dummy", ios::out);
   return this->scan_metadata(o, collection, docInfo, false);
+}
+
+bool metaformat::is_valid_element(text_t &meta_name)
+{
+  if (elementSet.count(meta_name)==1) return true;
+  return false;
+  
 }