Changeset 8303

Timestamp:

2004-10-13T04:48:30+13:00 (20 years ago)

Author:

cs025

Message:

Minor changes to configuration handling; modified log file to be oai.log.

Location:

trunk/gsdl/src/oaiservr

Files:

• abstractlistaction.cpp (modified) (3 diffs)
• listsetsaction.cpp (modified) (2 diffs)
• metaformat.cpp (modified) (1 diff)
• oaiconfig.cpp (modified) (5 diffs)
• oaiconfig.h (modified) (1 diff)
• recordaction.cpp (modified) (1 diff)

trunk/gsdl/src/oaiservr/abstractlistaction.cpp

@@ -261 +261 @@
   FilterResponse_t response;
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
 
   // exclude false children of a top-level classifier immediately...
@@ -300 +300 @@
   FilterResponse_t response;
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
   text_t           from = params["from"];
   text_t           until = params["until"];
@@ -391 +391 @@
   FilterResponse_t response;
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
   bool             prevDocSeen = false;
 

trunk/gsdl/src/oaiservr/listsetsaction.cpp

@@ -39 +39 @@
   FilterResponse_t response;
   comerror_t       err;
-  text_tarray      collections;
+  text_tarray &    collections = this->configuration->getCollectionsList();
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
   text_tarray *result = new text_tarray;
   
   // get a list of the collections available
-  protocol->get_collection_list(collections, err, output); 
-  //  cerr << "Found " << collections.size() << " collections.\n";
+  //  protocol->get_collection_list(collections, err, output); 
+  if (collections.size() == 0) {
+    logout << "Found *no* OAI collections - check main.cfg for oaicollection items and read the OAI documentation.\n";
+  }
 
-  for(int current_col = 0; current_col < collections.size(); current_col++){
+  for(int current_col = 0; current_col < collections.size(); current_col++) {
     // output the collection as a set, first, then its children
     text_t gsdlCollect = collections[current_col];
@@ -75 +77 @@
   FilterResponse_t response;
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
 
   metadata.insert("contains");

trunk/gsdl/src/oaiservr/metaformat.cpp

@@ -121 +121 @@
   FilterResponse_t response;
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
 
   // get the document information

trunk/gsdl/src/oaiservr/oaiconfig.cpp

@@ -46 +46 @@
   // parameter, read in all the collection's individual configurations
   if (gsdlcollect == "") {
-    text_tset::iterator here = this->collectList.begin();
-    text_tset::iterator end  = this->collectList.end();
+    text_tarray::iterator here = this->collectList.begin();
+    text_tarray::iterator end  = this->collectList.end();
     while (here != end) {       
       this->configureCollection(gsdlhome, *here);
@@ -88 +88 @@
   if (key == "oaimapping" && cfgline.size() > 1) {
     text_t::const_iterator colonAt;
-    text_t index, name;
+    text_t index, name, configCollection;
+
+    // Take a default collection as being whatever the collection being configured is...
+    configCollection = this->collection;
     
     // get the name of the (collection) field to map; this may actually
@@ -94 +97 @@
     // <collection name>:<field name>
     index = cfgline[0];
+    if ((colonAt = find(index.begin(), index.end(), ':')) != index.end()) {
+      configCollection = substr(index.begin(), colonAt);
+
+      if (this->collection != "" && configCollection != this->collection) {
+    cerr << "Attempt to configure OAI mappings for " << configCollection << " in " << this->collection << endl;
+      }
+
+      colonAt += 1;
+      index = substr(colonAt, index.end());
+    }
     
     // the second parameter is the metadata field to map the collection
@@ -110 +123 @@
     }
     
-    // now 'index' is in the form:
-    //   (collection):<collectionfield>:(formatname) and name is
-    // simply formatfieldname
+    // now 'index' is in the form <collectionfield>:(formatname) 
+    //     'name' is simply the fieldname within the format
+    //     'configCollection' is the collection to be configured
     
     // now simply map the field name (index) onto the collection name (name)
-    if (this->collectMap[this->collection] == NULL) {
-      this->collectMap[this->collection] = new oaicollectconfig(this->collection);
-    }
-    this->collectMap[this->collection]->fieldMap[index] = name;
-    
-    // cerr << "Mapping " << index << " to " << name << " in " << this->collection << endl;
+    if (this->collectMap[configCollection] == NULL) {
+      this->collectMap[configCollection] = new oaicollectconfig(configCollection);
+    }
+    this->collectMap[configCollection]->fieldMap[index] = name;
+    
+    //    cerr << "Mapping " << index << " to " << name << " in " << configCollection << endl;
     
     // TODO: check that the mapped field is actually in use
   }
-  else if (key == "oaicollection" && cfgline.size() > 1) {
+  else if (key == "oaicollection" && cfgline.size() >= 1) {
     // Configure a collection to be used as part of the OAI archive.
     // This line should read:
@@ -145 +158 @@
     }
     for (int c = 0; c < cfgline.size(); c ++) {
-      this->collectList.insert(cfgline[c]);
+      this->collectList.push_back(cfgline[c]);
     }
   }

trunk/gsdl/src/oaiservr/oaiconfig.h

@@ -25 +25 @@
   oaiconfig(text_t &gsdlhome, text_t &gsdlcollect);
   ~oaiconfig();
-  virtual void configure(const text_t &key, const text_tarray &cfgline);
-  text_t       getCollectionConfig(const text_t &collection, const text_t &field);
-  text_t       getMapping(const text_t &collection, const text_t &collectfield);
-  text_t       getMapping(const text_t &collection, const text_t &collectfield, const text_t &format);
-  text_tmap   *getInformation() { return &this->infoMap; }
-  int          getOAIVersion();
+  virtual void  configure(const text_t &key, const text_tarray &cfgline);
+  text_t        getCollectionConfig(const text_t &collection, const text_t &field);
+  text_tarray & getCollectionsList() { return this->collectList; }
+  text_t        getMapping(const text_t &collection, const text_t &collectfield);
+  text_t        getMapping(const text_t &collection, const text_t &collectfield, const text_t &format);
+  text_tmap   * getInformation() { return &this->infoMap; }
+  int           getOAIVersion();
  private:
   void configureCollection(const text_t &gsdlhome, const text_t &collection);
   
-  text_tset collectList;    // The list of collections to be taken in hand
+  text_tarray collectList;  // The list of collections to be taken in hand
   text_tmap infoMap;        // Holds the information to be given in the case
                             // of an OAI identify request

trunk/gsdl/src/oaiservr/recordaction.cpp

@@ -88 +88 @@
 {
   text_tset        metadata;
-  ofstream         logout("grb.log", ios::app);
+  ofstream         logout("oai.log", ios::app);
 
   // get the document information