Changeset 20629 for gsdl/trunk

Timestamp:

2009-09-18T12:18:01+12:00 (15 years ago)

Author:

mdewsnip

Message:

Added new "oaisetname" and "oaisetdescription" configuration options in the oai.cfg file, for setting the setName and setDescription values in the ListSets response.

Location:

gsdl/trunk/runtime-src/src/oaiservr

Files:

• listsetsaction.cpp (modified) (2 diffs)
• oaiconfig.cpp (modified) (2 diffs)
• oaiconfig.h (modified) (2 diffs)

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

@@ -186 +186 @@
     output << "  <set>" << endl;
     output << "    <setSpec>" << collection << "</setSpec>" << endl;
-    output << "    <setName>" << collection << "</setName>" << endl;
+    if (this->configuration->getSetName(collection) != "")
+    {
+      output << "    <setName>" << this->configuration->getSetName(collection) << "</setName>" << endl;
+    }
+    else
+    {
+      output << "    <setName>" << collection << "</setName>" << endl;
+    }
+    if (this->configuration->getSetDescription(collection) != "")
+    {
+      output << "    <setDescription>" << this->configuration->getSetDescription(collection) << "</setDescription>" << endl;
+    }
     output << "  </set>" << endl;
     this->setsOutput++;
@@ -216 +227 @@
 
       // Otherwise output this set and increment the count
-      text_t set_title = set_response.docInfo[0].metadata["Title"].values[0];
       output << "  <set>" << endl;
       output << "    <setSpec>" << collection << ":" << set << "</setSpec>" << endl;
-      output << "    <setName>" << collection << ":" << set_title << "</setName>" << endl;
+      if (this->configuration->getSetName(collection + ":" + set) != "")
+      {
+    output << "    <setName>" << this->configuration->getSetName(collection + ":" + set) << "</setName>" << endl;
+      }
+      else
+      {
+    output << "    <setName>" << set_response.docInfo[0].metadata["Title"].values[0] << "</setName>" << endl;
+      }
+      if (this->configuration->getSetDescription(collection + ":" + set) != "")
+      {
+    output << "    <setDescription>" << this->configuration->getSetDescription(collection + ":" + set) << "</setDescription>" << endl;
+      }
       output << "  </set>" << endl;
       this->setsOutput++;

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

@@ -217 +217 @@
     }
   }
+  else if (key == "oaisetname" && cfgline.size() == 2) {
+    this->setNameMap[cfgline[0]] = cfgline[1];
+  }
+  else if (key == "oaisetdescription" && cfgline.size() == 2) {
+    this->setDescriptionMap[cfgline[0]] = cfgline[1];
+  }
   else if (key == "oaiversion" && cfgline.size() >= 1) {
     this->oaiVersion = cfgline[0];
@@ -390 +396 @@
   }
 }
+
+
+text_t oaiconfig::getSetName(const text_t &setSpec)
+{
+  if (setNameMap.find(setSpec) != setNameMap.end())
+  {
+    return setNameMap[setSpec];
+  }
+
+  return "";
+}
+
+
+text_t oaiconfig::getSetDescription(const text_t &setSpec)
+{
+  if (setDescriptionMap.find(setSpec) != setDescriptionMap.end())
+  {
+    return setDescriptionMap[setSpec];
+  }
+
+  return "";
+}

gsdl/trunk/runtime-src/src/oaiservr/oaiconfig.h

@@ -34 +34 @@
   text_t        getMapping(const text_t &collection, const text_t &collectfield, const text_t &format);
   text_tmap   * getInformation() { return &this->infoMap; }
+  text_t        getSetName(const text_t &setSpec);
+  text_t        getSetDescription(const text_t &setSpec);
   int           getOAIVersion();
   int           resumeAfter();
@@ -43 +45 @@
   text_tmap infoMap;        // Holds the information to be given in the case
                             // of an OAI identify request
+  text_tmap setNameMap;     // Holds user-defined names for the sets
+  text_tmap setDescriptionMap;  // Holds user-defined descriptions for the sets
   oaicollectmap collectMap; // The configuration of collections
   text_t collection;        // Used to track which collection is being configured