Changeset 13780

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.

Location:

trunk/gsdl/src/colservr

Files:

• browsefilter.cpp (modified) (1 diff)
• gdbmsource.cpp (modified) (4 diffs)
• lucenegdbmsource.cpp (modified) (2 diffs)
• lucenequeryfilter.cpp (modified) (1 diff)
• mgppqueryfilter.cpp (modified) (1 diff)
• mgppsearch.cpp (modified) (2 diffs)
• mgqueryfilter.cpp (modified) (1 diff)
• mgsearch.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -304 +304 @@
   }
 
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   response.numDocs = numDocs;
   response.isApprox = Exact;

trunk/gsdl/src/colservr/gdbmsource.cpp

@@ -159 +159 @@
   infodbclass info;
   OIDout = gdbmptr->translate_OID (OIDin, info);
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }
@@ -314 +315 @@
     ++fields_here;
   }
+
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }
@@ -348 +351 @@
     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() == 1) {
@@ -360 +366 @@
                    defaultlanguage, collection, docnum, doc);
   }
+
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }

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;

trunk/gsdl/src/colservr/lucenequeryfilter.cpp

@@ -261 +261 @@
   }
 
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   response.numDocs = queryresults.docs_matched;
   response.isApprox = queryresults.is_approx;

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -250 +250 @@
   }
 
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   response.numDocs = queryresults.docs_matched;
   response.isApprox = queryresults.is_approx;

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -212 +212 @@
   }
   // clean up
+  unload_database();  // Important that local library doesn't leave any files open
   delete []indexname;
   return true;
@@ -270 +271 @@
     queryresult.terms.push_back(term);
     queryresult.orgterms.push_back(term);
-
-  }
+  }
+
   // clean up
+  unload_database();  // Important that local library doesn't leave any files open
   delete []indexname;
 

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -445 +445 @@
   }
 
+  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
   response.numDocs = queryresults.docs_matched;
   response.isApprox = queryresults.is_approx;

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -336 +336 @@
     // retrieve the results
     getresults (queryparams, queryresults);
+    unload_database();  // Important that local library doesn't leave any files open
     return true;
   }
@@ -561 +562 @@
   }
 
+  unload_database();  // Important that local library doesn't leave any files open
   return (bool)databaseloaded;
 }