Changeset 4340

Timestamp:

2003-05-27T11:39:16+12:00 (21 years ago)

Author:

sjboddie

Message:

Tidied up configaction slightly. Running 'a=config&cmd=add-collection'
will now correctly reconfigure the collection if it already exists.

Location:

trunk/gsdl/src

Files:

• colservr/collectset.cpp (modified) (2 diffs)
• recpt/configaction.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/collectset.cpp

@@ -220 +220 @@
 void collectset::add_collection (const text_t &collection, void *recpt, 
                  const text_t &gsdlhome, const text_t &gdbmhome) {
+
+  // if an old collection server exists for this collection we should
+  // delete it first
+  collectservermapclass::iterator here = cservers.begin();
+  collectservermapclass::iterator end = cservers.end();
+  while (here != end) {
+    if ((*here).second.c != NULL && (*here).first == collection) {
+      delete (*here).second.c;
+      cservers.erase (here);
+      break;
+    }
+    here ++;
+  }
       
   // read config file to see if built with mg or mgpp
@@ -314 +327 @@
 void collectset::remove_collection (const text_t &collection, ostream &logout) {
 
+  // do nothing if no collection server exists for this collection 
+  if (cservers.getcollectserver(collection) == NULL) return;
+
   // first unload any cached mg databases - we may need to do something
   // similar to this for mgpp too

trunk/gsdl/src/recpt/configaction.cpp

@@ -52 +52 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "configure-all";
+  arg_ainfo.argdefault = "";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -91 +91 @@
 // add it to the null protocol.
 void configaction::create_colservr (const text_t &collection, ostream &logout) {
+
+  // just in case we're adding a collection that already exists
+  recpt->uncache_collection(collection);
 
   recptprotolistclass *protos = recpt->get_recptprotolist_ptr();