Changeset 15401

Timestamp:

2008-05-13T10:58:58+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Deleted setReceptionistServers() from colservr/collectset.cpp, since this required passing in the receptionist, and the colservr should be independent of the receptionist. Changed the one place this function was called (recpt/librarymain.cpp) to do the same functionality.

Location:

gsdl/trunk/src

Files:

• colservr/collectset.cpp (modified) (1 diff)
• colservr/collectset.h (modified) (2 diffs)
• recpt/librarymain.cpp (modified) (1 diff)

gsdl/trunk/src/colservr/collectset.cpp

@@ -455 +455 @@
   }
 }
-
-void collectset::setReceptionistServers(receptionist &recpt, text_t &gsdlhome)
-{ 
-  collectservermapclass::iterator here = cservers.begin();
-  collectservermapclass::iterator end = cservers.end();
-  while (here != end) {
-    assert ((*here).second.c != NULL);
-
-    text_tarray colinfo;
-    colinfo.push_back((*here).second.c->get_collection_name());
-    colinfo.push_back(gsdlhome);
-    colinfo.push_back(gsdlhome);
-    recpt.configure("collectinfo", colinfo);
-
-    ++here;
-  }
-}

gsdl/trunk/src/colservr/collectset.h

@@ -10 +10 @@
 #include "collectserver.h"
 #include "cnfgable.h"
-#include "receptionist.h"
 #include "mgsearch.h"
 #include "mgppsearch.h"
@@ -61 +60 @@
   collectservermapclass servers();
 
-  // configure a receptionist with the list of servers
-  void setReceptionistServers(receptionist &recpt, text_t &gsdlhome);
-
   // return an individual collection server
   collectserver *getCollectServer(const text_t &collection)

gsdl/trunk/src/recpt/librarymain.cpp

@@ -119 +119 @@
   cservers = new collectset(gsdlhome);
 
+  // configure the receptionist server list
+  text_tarray collection_list;
+  cservers->getCollectionList(collection_list);
+  text_tarray::iterator collection_iterator = collection_list.begin();
+  while (collection_iterator != collection_list.end())
+  {
+    text_tarray colinfo;
+    colinfo.push_back(*collection_iterator);
+    colinfo.push_back(gsdlhome);
+    colinfo.push_back(gsdlhome);
+    recpt.configure("collectinfo", colinfo);
+    collection_iterator++;
+  }
+
   // set up the null protocol
   nproto.set_collectset(cservers);
-
-  // configure the receptionist server list
-  cservers->setReceptionistServers(recpt, gsdlhome);  
 
   // add the protocol to the receptionist