Changeset 9916

Timestamp:

2005-05-20T11:23:29+12:00 (19 years ago)

Author:

kjdon

Message:

tidying up after someone, who will remain nameless (DAVIDB), refactored the code and moved all the common (NOT) code to a base class, and commited it without testing! and broke the lucene document retrieval. I have added the old get_document method back in here.

Location:

trunk/gsdl/src/colservr

Files:

• lucenegdbmsource.cpp (modified) (2 diffs)
• lucenegdbmsource.h (modified) (1 diff)

trunk/gsdl/src/colservr/lucenegdbmsource.cpp

@@ -25 +25 @@
 
 #include "lucenegdbmsource.h"
+#include "fileutil.h"
+#include "OIDtools.h"
+#include "expat_document.h"
+#include "lucenesearch.h"
 
 lucenegdbmsourceclass::lucenegdbmsourceclass () 
@@ -35 +39 @@
 }
 
+bool lucenegdbmsourceclass::get_document (const text_t &OID, text_t &doc, 
+                      comerror_t &err, ostream &logout) {
+
+  outconvertclass text_t2ascii;
+  err = noError;
+  if (gdbmptr == NULL) {
+    // most likely a configuration problem
+    logout << text_t2ascii 
+       << "configuration error: lucenegdbmsource contains a null gdbmclass\n\n";
+    err = configurationError;
+    return true;
+  }
+
+  // open the database
+  gdbmptr->setlogout(&logout);
+  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
+    // most likely a system problem (we have already checked that the
+    // gdbm database exists)
+    logout << text_t2ascii
+       << "system problem: open on gdbm database \""
+       << gdbm_filename << "\" failed\n\n";
+    err = systemProblem;
+    return true;
+  }
+
+  text_t tOID = OID;
+  if (needs_translating (OID)) 
+    translate_OID (OID, tOID, err, logout);
+  infodbclass info;
+  if (!gdbmptr->getinfo(tOID, info)) return false;
+  
+  if (info["hastxt"].getint() == 0) { // there is no text for this section
+    return false; // true??
+  }
+  int docnum = info["docnum"].getint();
+
+  // get the parent id
+  text_t parent_OID;
+  get_top(tOID, parent_OID);
+  
+  // locate the parent info ingdbm db
+  if (!gdbmptr->getinfo(parent_OID, info)) 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();
+  expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->gdbm_level, text_t(docnum), doc);
+  return true;
+}

trunk/gsdl/src/colservr/lucenegdbmsource.h

@@ -42 +42 @@
   virtual ~lucenegdbmsourceclass ();
 
+  bool get_document (const text_t &OID, text_t &doc, 
+             comerror_t &err, ostream &logout);
+
 };