Changeset 2218

Timestamp:

2001-03-21T11:13:12+12:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a couple of little bugs in the collector - bugs only showed up
when using a persistent version of the library (i.e. the local library
or fastcgi)

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (1 diff)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1490 +1490 @@
   ofile_out.close();
 
+  // if we're altering an existing collection we need to kill off
+  // the existing collection server - we do this for the local library
+  // (and any other persistent version of the library) as the existing
+  // gdbm file can't be deleted while the collection server holds it open
+  if ((args["bc1econf"] == 1) || (args["bc1esrce"] == 1)) {
+    remove_colservr (collection, logout);
+  }    
+
   // set up the build command - build.bat has some issues with quoting
   // on win2k when gsdlhome contains spaces so we'll avoid using 
@@ -1601 +1609 @@
 void collectoraction::remove_colservr (const text_t &collection, ostream &logout) {
 
+  recpt->uncache_collection (collection);
+
   recptprotolistclass *protos = recpt->get_recptprotolist_ptr();
   recptprotolistclass::iterator rprotolist_here = protos->begin();

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1296 +1296 @@
 }
 
+// removes a collection from the cache so that the next
+// call to get_collectinfo_ptr() for that collection will
+// retrieve the collection info from the collection server
+void receptionist::uncache_collection (const text_t &collection) {
+
+  colinfo_tmap::iterator it = configinfo.collectinfo.find (collection);
+  if ((it != configinfo.collectinfo.end()) && ((*it).second.info_loaded)) {
+
+    (*it).second.info_loaded = false;
+
+  }
+}
+
 // Handles an "Encoding" line from a configuration file - note that the
 // configinfo.encodings map is a bit of a hack (to be fixed when the

trunk/gsdl/src/recpt/receptionist.h

@@ -249 +249 @@
                       ostream &logout);
 
+  void uncache_collection (const text_t &collection);
   
 protected: