Changeset 22557 for main/trunk/greenstone2/runtime-src/src/oaiservr/identifyaction.cpp

Timestamp:

2010-08-03T13:41:27+12:00 (14 years ago)

Author:

kjdon

Message:

in oai.cfg can define oaiinfo elements, which are addition items describing the repository. previously they were just output as elements, which invalidates the schema. Added them into the description element, using the new gsdl_oaiinfo schema

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/identifyaction.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/identifyaction.cpp

@@ -87 +87 @@
     output << "    <oai-identifier xmlns=\"http://www.openarchives.org/OAI/1.1/oai-identifier\"\n";
     output << "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-    output << "        xsi:schemaLocation=\"http://www.openarchives.org/OAI/1.1/oai-identifier    http://www.openarchives.org/OAI/1.1/oai-identifier.xsd\">\n";
+    output << "        xsi:schemaLocation=\"http://www.openarchives.org/OAI/1.1/oai-identifier\n";
+    output << "           http://www.openarchives.org/OAI/1.1/oai-identifier.xsd\">\n";
   } else {
 
@@ -93 +94 @@
     output << "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
     output << "      xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai-identifier\n";
-    output << "      http://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n";
+    output << "        http://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n";
 
     
   }
 
-  output << "    <scheme>oai</scheme>\n";
-  output << "    <repositoryIdentifier>"<< repositoryId <<"</repositoryIdentifier>\n";
-  output << "    <delimiter>:</delimiter>\n";
-  output << "    <sampleIdentifier>oai:"<<repositoryId<<":demo:HASH983080b052e9230b7ccf94</sampleIdentifier>\n";
-  output << "  </oai-identifier>\n";
+  output << "      <scheme>oai</scheme>\n";
+  output << "      <repositoryIdentifier>"<< repositoryId <<"</repositoryIdentifier>\n";
+  output << "      <delimiter>:</delimiter>\n";
+  output << "      <sampleIdentifier>oai:"<<repositoryId<<":demo:HASH983080b052e9230b7ccf94</sampleIdentifier>\n";
+  output << "    </oai-identifier>\n";
 
-  output << utf8convert << "  </description>\n";
   // list all configuration information
   text_tmap::iterator here = this->configuration->getInformation()->begin();
   text_tmap::iterator end  = this->configuration->getInformation()->end();
-  while (here != end) {
-    output << utf8convert << "  <" << here->first << ">" << here->second;
-    output << utf8convert << "  </" << here->first << ">\n";
-    ++here;
+  if (here != end) {
+    output << "    <gsdl xmlns=\"http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo\"\n";
+    output << "       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+    output << "       xsi:schemaLocation=\"http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo\n";
+    output << "         http://www.greenstone.org/namespace/gsdl_oaiinfo/1.0/gsdl_oaiinfo.xsd\">\n";
+  
+
+    while (here != end) {
+      output << utf8convert << "      <Metadata name=\"" << here->first << "\">" << here->second << "</Metadata>\n";
+      ++here;
+    }
+    output << "    </gsdl>\n";
   }
+  
+  output << utf8convert << "  </description>\n";
   
   return true;