Changeset 27534 for main

Timestamp:

2013-06-04T15:56:26+12:00 (11 years ago)

Author:

kjdon

Message:

more changes for super collection stuff. Now can handle having collections in a super colleciton that are not in the main collection list

Location:

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

Files:

• abstractlistaction.cpp (modified) (3 diffs)
• listidsaction.cpp (modified) (1 diff)
• listrecsaction.cpp (modified) (2 diffs)
• listsetsaction.cpp (modified) (1 diff)
• oaiaction.cpp (modified) (1 diff)
• oaiconfig.cpp (modified) (5 diffs)
• oaiconfig.h (modified) (3 diffs)

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

@@ -84 +84 @@
   }
 
-  // Case for no "set" argument present -- output all records in all collections
-  // or we are a super collection
+  // Case for no "set" argument present - output all records in all collections & super colls
+  // Case for super collection set - output all records in all collections in this super coll
   else
   {
@@ -94 +94 @@
       collections = this->configuration->getSuperCollectionCollections(set_name);
     } else {
-      collections = this->configuration->getCollectionsList();
+      
+      collections = this->configuration->getAllCollectionsList();//this->configuration->getCollectionsList();
+    
     }
     if (collections.size() == 0)
@@ -121 +123 @@
     {
       // If output_content_for_set() returns false a resumption token has been output, so it's time to stop
-      if (output_content_for_set(output, protocol, params, *collection_iterator, "", "") == false)
+      if (output_content_for_set(output, protocol, params, *collection_iterator, "", set_name) == false)
       {
     return true;

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

@@ -210 +210 @@
 
     // Check the collection is one that is in the list in the oai.cfg file
-    text_tarray &collections = this->configuration->getCollectionsList();
-    bool collection_found = false;
-    for (int c = 0; c < collections.size(); c++)
-    {
-      if (collections[c] == collection)
-      {
-    collection_found = true;
-    break;
-      }
-    }
-
-    // The collection was not found
-    if (!collection_found)
-    {
-      this->errorType = "badArgument";
-      return false;
-    }
+    if (!this->configuration->isValidCollection(collection)) {
+      this->errorType = "badArgument";
+      return false;
+    }      
 
     // Check the child set if it was given

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

@@ -165 +165 @@
     text_t set = params["set"];
 
+    // Is the set a super collection??
+    text_tarray &super_collections = this->configuration->getSuperCollectionsList();
+    bool super_collection_found = false;
+    for (int c = 0; c < super_collections.size(); c++)
+    {
+      if (super_collections[c] == set)
+      {
+    super_collection_found = true;
+    break;
+      }
+    }
+    if (super_collection_found) {
+      this->errorType = "";
+      return true;
+    }
+
     // Extract the collection name from the set specification
     text_t collection = "";
@@ -180 +196 @@
     
     // Check the collection is one that is in the list in the oai.cfg file
-    text_tarray &collections = this->configuration->getCollectionsList();
-    bool collection_found = false;
-    for (int c = 0; c < collections.size(); c++)
-    {
-      if (collections[c] == collection)
-      {
-    collection_found = true;
-    break;
-      }
-    }
-
-    // The collection was not found
-    if (!collection_found)
-    {
-      this->errorType = "badArgument";
-      return false;
-    }
+    if (!this->configuration->isValidCollection(collection)) {
+      this->errorType = "badArgument";
+      return false;
+    }      
 
     // Check the child set if it was given

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

@@ -124 +124 @@
   }
 
+  // if no resumption token, output the super colls. Otherwise, start from 
+  // the collection list correct position.
+  // Assume for now that super coll list is always first in the list of sets,
+  // and we never issue a resumption token part way through the list of super colls
+  // TODO handle resumption tokens properly.
+  text_t set_name ="";
+  if (position == "") {
+    text_tarray& supercolls = this->configuration->getSuperCollectionsList();
+    text_tarray::iterator supercoll_iterator = supercolls.begin();
+    while (supercoll_iterator != supercolls.end()) {
+      set_name = (*supercoll_iterator);
+      output_content_for_supercol(output, set_name);
+      supercoll_iterator++;
+    }
+  }
+
+
   // Get a list of the collections available
   text_tarray& collections = this->configuration->getCollectionsList();
   if (collections.size() == 0)
   {
-    return false;
-  }
-
-  // if no resumption token, output the super colls. Otherwise, start from 
-  // the collection list correct position.
-  // Assume for now that super coll list is always in the first list
-  text_t set_name ="";
-  if (position == "") {
-    text_tarray& supercolls = this->configuration->getSuperCollectionsList();
-    if (collections.size() != 0) {
-      text_tarray::iterator supercoll_iterator = supercolls.begin();
-      while (supercoll_iterator != supercolls.end()) {
-    set_name = (*supercoll_iterator);
-    output_content_for_supercol(output, set_name);
-    supercoll_iterator++;
-      }
-    }
-  }
+    if (this->setsOutput ==0) {
+      // we had no super colls either
+      return false;
+    }
+    return true;
+  }
+
   // Get the current collection from the position value
   text_t collection_name = "";

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

@@ -414 +414 @@
     if(oaiVersion >= 200){
 
-      // A doc is always a member of its collection set
-      output << "      <setSpec>" << collection_id << "</setSpec>" << endl;
+      // A doc is only a member of its collection set if hte collection is valid
+      // Can have super collecitons containging collecitons that are not individually valid
+      if (this->configuration->isValidCollection(collection_id)) {
+    output << "      <setSpec>" << collection_id << "</setSpec>" << endl;
+      }
       // are we part of a super collection?
       text_tarray super_colls = this->configuration->getSuperCollectionsForThisCollection(collection_id);

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

@@ -110 +110 @@
   }
   return 200; 
+}
+
+bool oaiconfig::isValidCollection(const text_t &collection)
+{
+  for (int c = 0; c < this->collectList.size(); c++)
+    if (this->collectList[c] == collection) {
+      return true;
+    }
+  return false;
 }
 
@@ -208 +217 @@
     for (int c = 0; c < cfgline.size(); ++c) {
       this->collectList.push_back(cfgline[c]);
+      addToAllCollectionsList(cfgline[c]);
     }
   }
   else if (key == "oaisupercollection" && cfgline.size() > 1) {
 
-    // Configure a hierarchical super set
+    // Configure a super collection set
     // The line should read 
     //
@@ -240 +250 @@
       }
       this->collectMap[sub_coll]->superCollectList.push_back(super_set);
+      addToAllCollectionsList(sub_coll);
     }
   }
@@ -358 +369 @@
   }
 }
-
+  
+void oaiconfig::addToAllCollectionsList(const text_t coll_name) {
+
+  for (int c=0; c<this->allCollectList.size(); c++) {
+    if (allCollectList[c] == coll_name) return;
+  }
+  this->allCollectList.push_back(coll_name);
+  
+}
 
 text_t oaiconfig::generateBaseServerURL() {
@@ -481 +500 @@
 }
 
-text_tarray oaiconfig::getSuperCollectionsForThisCollection(const text_t &collection) {
+
+text_tarray oaiconfig::getSuperCollectionsForThisCollection(const text_t &collection)
+{
 
   text_tarray super_colls;

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

@@ -63 +63 @@
   virtual void  configure(const text_t &key, const text_tarray &cfgline);
   text_tarray & getCollectionsList() { return this->collectList; }
+  // get a list of all collections - those part of a super coll and those individual ones
+  text_tarray & getAllCollectionsList() {return this->allCollectList; }
   text_tarray & getSuperCollectionsList() { return this->superCollectList; }
+  // get the list of collections for this super coll
   text_tarray & getSuperCollectionCollections(const text_t super_coll) {
     return this->superCollectMap[super_coll]->collectionList;
   }
+  // is this collection valid
+  bool isValidCollection(const text_t &collection);
+  // what super collections is this collection part of?
   text_tarray getSuperCollectionsForThisCollection(const text_t &collection);
   text_tset & getMetadataSet() { return this->metadataSet; }
@@ -86 +92 @@
  private:
   bool configureCollection(const text_t &gsdlhome, const text_t &collection);
+  void addToAllCollectionsList(const text_t coll_name);
   text_t generateBaseServerURL();
   text_t    repositoryName; // human readable name
@@ -106 +113 @@
   text_tarray superCollectList; //a list of super collections. may be empty
   oaisupercollectmap superCollectMap; // The configuration of the super collections
+  text_tarray allCollectList; //a list of all collections, includes those in collectList and those that are part of a super collection and not in collectList
 };
 #endif