Changeset 13780 for trunk/gsdl/src/colservr/lucenegdbmsource.cpp

Timestamp:

2007-01-24T16:48:54+13:00 (17 years ago)

Author:

mdewsnip

Message:

GLI/LOCAL LIBRARY: To prevent the problems with the GLI being unable to install newly built collections because the local library is holding files open, much more care needs to be taken to close files (typically the GDBM database and the MG/MGPP index files) after use. Fixed a lot of places where files were being left open.

File:

• trunk/gsdl/src/colservr/lucenegdbmsource.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/lucenegdbmsource.cpp

@@ -68 +68 @@
     translate_OID (OID, tOID, err, logout);
   infodbclass info;
-  if (!gdbmptr->getinfo(tOID, info)) return false;
-  
+  if (!gdbmptr->getinfo(tOID, info)) {
+    gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+    return false;
+  }
+
   if (info["hastxt"].getint() == 0) { // there is no text for this section
     return false; // true??
@@ -80 +83 @@
   
   // locate the parent info ingdbm db
-  if (!gdbmptr->getinfo(parent_OID, info)) return false;
-  
+  if (!gdbmptr->getinfo(parent_OID, info)) {
+    gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+    return false;
+  }
+
   text_t archive_dir = info["assocfilepath"];
   text_t full_path_to_doc = filename_cat(collectdir, "index", "text", archive_dir, "doc.xml");
   
   doc.clear();
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->gdbm_level, text_t(docnum), doc);
   return true;