Changeset 31390 for main/trunk

Timestamp:

2017-02-08T20:07:14+13:00 (7 years ago)

Author:

ak19

Message:

Improved newly added oaiaction::getMeta(). Now return type is a bool and it now uses map.find() to locate requested meta.

Location:

main/trunk/greenstone2/runtime-src/src/oaiservr

Files:

• oaiaction.cpp (modified) (1 diff)
• oaiaction.h (modified) (1 diff)

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

@@ -449 +449 @@
 // Method that looks for the requested metaname in the doc_info, and if found, sets the value
 // in the argument 'metavalue'.
-void oaiaction::getMeta(ResultDocInfo_t &doc_info, const text_t &metaname, text_t &metavalue)
-{
-  text_t current_metaname;
-
+bool oaiaction::getMeta(ResultDocInfo_t &doc_info, const text_t &metaname, text_t &metavalue)
+{
   //ofstream         logout("oai.log", ios::app);
-
-  MetadataInfo_tmap::iterator current = doc_info.metadata.begin();
-  MetadataInfo_tmap::iterator end = doc_info.metadata.end();
-
-  while(current != end){
-    current_metaname = current->first;
-    lc(current_metaname); // lowercased for string comparison below
-
-    if (current_metaname == metaname && current->second.values.size() >= 1) { // found match with a value
-      metavalue = current->second.values[0];
-
-      //logout << "Looking for metaname = " << current_metaname << endl;
-      //logout << "\t\t\t Found value = " << metavalue << endl;
-      return; // done
-    }
-
-    ++current;
-  }
-
-  //logout.close();
+  //logout << "oaiaction::getMeta(): Looking for metaname = " << metaname << endl;
+
+  // use map::find, rather than testing map["array-index"], as the latter will create that index and
+  // insert an empty value into it, when we just want to test for it.
+  // See http://www.cplusplus.com/reference/map/map/operator[]/
+  // See also http://stackoverflow.com/questions/1939953/how-to-find-if-a-given-key-exists-in-a-c-stdmap
+
+  if(doc_info.metadata.find(metaname) == doc_info.metadata.end()) {
+    //logout << "\t\t\t Could not find meta " << metaname << endl;
+    //logout.close();
+    return false;
+  } else { // found meta
+    metavalue = doc_info.metadata[metaname].values[0];
+    //logout << "\t\t\t Found value = " << metavalue << endl;
+    //logout.close();
+    return true;
+  }
+  
 }
 

main/trunk/greenstone2/runtime-src/src/oaiservr/oaiaction.h

@@ -66 +66 @@
   text_t getErrorType(){return this->errorType;};
   void   getLastModifiedDate(ResultDocInfo_t &doc_info, text_t &lastModified);
-  void   getMeta(ResultDocInfo_t &doc_info, const text_t &metaname, text_t &metavalue);
+  bool   getMeta(ResultDocInfo_t &doc_info, const text_t &metaname, text_t &metavalue);
   bool   inDateRange(const text_t &from, const text_t &until, const text_t &collection, 
              const text_t &OID, recptproto *protocol, ostream &logout);