Changeset 9346

Timestamp:

2005-03-10T10:00:00+13:00 (19 years ago)

Author:

davidb

Message:

Restructuring of lucenegdbmsource and mggdbmsource to put common code in
new inherited class gdbmsource

Location:

trunk/gsdl/src/colservr

Files:

• lucenegdbmsource.cpp (modified) (1 diff)
• lucenegdbmsource.h (modified) (1 diff)
• mggdbmsource.cpp (modified) (1 diff)
• mggdbmsource.h (modified) (1 diff)

trunk/gsdl/src/colservr/lucenegdbmsource.cpp

@@ -25 +25 @@
 
 #include "lucenegdbmsource.h"
-#include "fileutil.h"
-#include "OIDtools.h"
-#include "gsdltools.h"
-#include "expat_document.h"
-#include "lucenesearch.h"
 
-
-lucenegdbmsourceclass::lucenegdbmsourceclass () {
-  gdbmptr = NULL;
-  textsearchptr = NULL;
+lucenegdbmsourceclass::lucenegdbmsourceclass () 
+  : gdbmsourceclass()
+{
+  classname = "lucenegdbmsource";
 }
 
 lucenegdbmsourceclass::~lucenegdbmsourceclass () {
-  if (gdbmptr != NULL) delete gdbmptr;
-  if (textsearchptr != NULL) delete textsearchptr;
 }
 
-void lucenegdbmsourceclass::configure (const text_t &key, const text_tarray &cfgline) {
-  if (cfgline.size() >= 1) {
-    const text_t &value = cfgline[0];
-
-    if (key == "collection") collection = value;
-    else if (key == "collectdir") collectdir = value;
-    else if (key == "gsdlhome") gsdlhome = value;
-    else if (key == "gdbmhome") gdbmhome = value;
-  }
-
-  if (key == "indexmap") {
-    indexmap.importmap (cfgline);
-
-  } else if (key == "defaultindex") {
-    indexmap.from2to (cfgline[0], defaultindex);
-
-  } else if (key == "subcollectionmap") {
-    subcollectionmap.importmap (cfgline);
-
-  } else if (key == "defaultsubcollection") {
-    subcollectionmap.from2to (cfgline[0], defaultsubcollection);
-
-  } else if (key == "languagemap") {
-    languagemap.importmap (cfgline);
-
-  } else if (key == "defaultlanguage") 
-    languagemap.from2to (cfgline[0], defaultlanguage);
-}
-
-bool lucenegdbmsourceclass::init (ostream &logout) {
-  outconvertclass text_t2ascii;
-  
-  if (gdbmhome.empty()) gdbmhome = gsdlhome;
-
-  if (!sourceclass::init (logout)) return false;
-
-  if (defaultindex.empty()) {
-    // use first index in map as default if no default is set explicitly
-    text_tarray toarray;
-    indexmap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultindex = toarray[0];
-    }
-  }
-
-  if (defaultsubcollection.empty()) {
-    // use first subcollection in map as default if no default is set explicitly
-    text_tarray toarray;
-    subcollectionmap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultsubcollection = toarray[0];
-    }
-  }
-
-  if (defaultlanguage.empty()) {
-    // use first language in map as default if no default is set explicitly
-    text_tarray toarray;
-    languagemap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultlanguage = toarray[0];
-    }
-  }
-  
-  // get the collection directory name
-  if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
-  }
-  
-  // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
-  if (littleEndian()) gdbm_filename += ".ldb";
-  else gdbm_filename += ".bdb";
-
-  if (!file_exists(gdbm_filename)) {
-    logout << text_t2ascii
-       << "warning: **** gdbm database \"" //****
-       << gdbm_filename << "\" does not exist\n\n";
-    // return false; //****
-  }
-  
-  return true;
-}
-
-bool lucenegdbmsourceclass::translate_OID (const text_t &OIDin, text_t &OIDout, 
-                       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;
-  }
-
-  infodbclass info;
-  OIDout = gdbmptr->translate_OID (OIDin, info);
-  return true;
-}
-
-bool lucenegdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
-                      bool getParents, const text_tset &fields, 
-                      const text_t &OID, MetadataInfo_tmap &metadata, 
-                      comerror_t &err, ostream &logout) {
-  outconvertclass text_t2ascii;
-
-  metadata.erase(metadata.begin(), metadata.end());
-
-  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;
-  }
-
-  // get the metadata - if getParents is set we need to get 
-  // info for all parents of OID as well as OID
-  vector<infodbclass> info_array;
-  text_tarray OIDs;
-  if (getParents) get_parents_array (OID, OIDs);
-  OIDs.push_back (OID);
-
-  text_tarray::const_iterator this_OID = OIDs.begin();
-  text_tarray::const_iterator end_OID = OIDs.end();
-
-  while (this_OID != end_OID) {
-    infodbclass info;
-    if (!gdbmptr->getinfo(*this_OID, info)) return false;
-
-    // adjust the metadata
-    text_t &contains = info["contains"];
-    if (contains.empty()) info["haschildren"] = 0;
-    else info["haschildren"] = 1;
-    contains.clear();
-
-    info_array.push_back(info);
-    this_OID ++;
-  }
-
-  // if fields set is empty we want to get all available metadata
-  text_tset tfields = fields;
-  if (tfields.empty() && !info_array.empty()) {
-    infodbclass::iterator t_info = info_array[0].begin(); 
-    infodbclass::iterator e_info = info_array[0].end(); 
-    while (t_info != e_info) {
-      if ((*t_info).first != "contains")
-    tfields.insert ((*t_info).first);
-      t_info ++;
-    }
-    tfields.insert ("hasnext");
-    tfields.insert ("hasprevious");
-  }
-    
-  // collect together the metadata
-  bool donenextprevtest = false;
-  bool hasnext=false, hasprevious=false;
-  MetadataInfo_t this_metadata;
-  text_tarray *pos_metadata;
-  text_tset::const_iterator fields_here = tfields.begin();
-  text_tset::const_iterator fields_end = tfields.end();
-
-  while (fields_here != fields_end) {
-    this_metadata.clear();
-    this_metadata.isRef = false;
-
-    vector<infodbclass>::reverse_iterator this_info = info_array.rbegin(); 
-    vector<infodbclass>::reverse_iterator end_info = info_array.rend(); 
-    MetadataInfo_t *tmetaptr = &this_metadata;
-    while (this_info != end_info) {
-
-      pos_metadata = (*this_info).getmultinfo(*fields_here);
-      if ((*fields_here == "hasnext" || *fields_here == "hasprevious")) {
-    
-    // collect metadata
-    if (!donenextprevtest) {
-      donenextprevtest = true;
-      
-      // cache parent contents array
-      text_t thisparent = get_parent (OID);
-      if (!thisparent.empty()) {
-        if (thisparent != parentOID) {
-          parentOID = thisparent;
-          parentcontents.erase(parentcontents.begin(), parentcontents.end());
-          if (gdbmptr->getinfo(parentOID, parentinfo)) {
-        text_t &parentinfocontains = parentinfo["contains"];
-        if (!parentinfocontains.empty())
-          splitchar (parentinfocontains.begin(), parentinfocontains.end(), 
-                 ';', parentcontents);
-          }
-        }
-        
-        // do tests
-        text_tarray::const_iterator parentcontents_here = parentcontents.begin();
-        text_tarray::const_iterator parentcontents_end = parentcontents.end();
-        text_t shrunk_OID = OID;
-        shrink_parent (shrunk_OID);
-        while (parentcontents_here != parentcontents_end) {
-          if (*parentcontents_here == shrunk_OID) {
-        if (parentcontents_here == parentcontents.begin()) hasprevious = false;
-        else hasprevious = true;
-        
-        parentcontents_here++;
-        
-        if (parentcontents_here == parentcontents.end()) hasnext = false;
-        else hasnext = true;
-        
-        break;
-          }  
-          
-          parentcontents_here ++;
-        }
-     
-        // fill in metadata
-        if ((*fields_here == "hasnext" && hasnext) ||
-        (*fields_here == "hasprevious" && hasprevious))
-          tmetaptr->values.push_back("1");
-        else
-          tmetaptr->values.push_back("0");
-      } else
-        tmetaptr->values.push_back("0");
-    }
-      }
-      else if (pos_metadata != NULL && *fields_here != "contains") {
-    tmetaptr->values = *pos_metadata;
-      }
-      else
-    tmetaptr->values.push_back("");
-
-      this_info ++;
-      if (this_info != end_info) {
-    tmetaptr->parent = new MetadataInfo_t();
-    tmetaptr = tmetaptr->parent;
-      }
-    }
-    metadata[*fields_here] = this_metadata;
-    fields_here++;
-  }
-  return true;
-}
-
-
-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;
-}
-
-bool lucenegdbmsourceclass::is_searchable(bool &issearchable, comerror_t &err, ostream &logout) {
-  err = noError;
-  issearchable = false;
-
-  text_tarray fromarray;
-  indexmap.getfromarray(fromarray);
-  if (fromarray.size() == 0) {
-    return true;
-  } else if (fromarray.size() == 1) {
-    if (fromarray[0] == "dummy:text") {
-      // always return true - issearchable is false here though
-      return true;
-    }
-  }
-  issearchable = true;
-  return true;
-}

trunk/gsdl/src/colservr/lucenegdbmsource.h

@@ -34 +34 @@
 #include "maptools.h"
 #include "search.h"
-#include "source.h"
+#include "gdbmsource.h"
 
 
-class lucenegdbmsourceclass : public sourceclass {
-protected:
-  text_t gsdlhome;
-  text_t gdbmhome;
-  text_t collection;
-  text_t collectdir;
-
-  // these maps are only needed to convert the default indexes
-  stringmap indexmap;
-  stringmap subcollectionmap;
-  stringmap languagemap;
-
-  text_t defaultindex;
-  text_t defaultsubcollection;
-  text_t defaultlanguage;
-
-  text_t parentOID;
-  infodbclass parentinfo;
-  text_tarray parentcontents;
-
-  text_t gdbm_filename;
-  gdbmclass *gdbmptr;
-  
-  searchclass *textsearchptr;
-
+class lucenegdbmsourceclass : public gdbmsourceclass {
 public:
   lucenegdbmsourceclass ();
   virtual ~lucenegdbmsourceclass ();
 
-  // the gdbmptr remains the responsability of the calling code
-  void set_gdbmptr (gdbmclass *thegdbmptr) {gdbmptr=thegdbmptr;}
-
-  // the textsearchptr remains the responsability of the calling code
-  void set_textsearchptr (searchclass *thetextsearchptr) {textsearchptr=thetextsearchptr;}
-
-  void configure (const text_t &key, const text_tarray &cfgline);
-  bool init (ostream &logout);
-  bool translate_OID (const text_t &OIDin, text_t &OIDout, 
-              comerror_t &err, ostream &logout);
-  bool get_metadata (const text_t &requestParams, const text_t &refParams, 
-             bool getParents, const text_tset &fields, 
-             const text_t &OID, MetadataInfo_tmap &metadata, 
-             comerror_t &err, ostream &logout);
-  bool get_document (const text_t &OID, text_t &doc, 
-             comerror_t &err, ostream &logout);
-  bool is_searchable(bool &issearchable, comerror_t &err, ostream &logout);
 };
 

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -25 +25 @@
 
 #include "mggdbmsource.h"
-#include "fileutil.h"
-#include "OIDtools.h"
-#include "gsdltools.h"
 
-
-mggdbmsourceclass::mggdbmsourceclass () {
-  gdbmptr = NULL;
-  textsearchptr = NULL;
+mggdbmsourceclass::mggdbmsourceclass () 
+  : gdbmsourceclass()
+{
+  classname = "mggdbsource";
 }
 
-mggdbmsourceclass::~mggdbmsourceclass () {
-  if (gdbmptr != NULL) delete gdbmptr;
-  if (textsearchptr != NULL) delete textsearchptr;
+mggdbmsourceclass::~mggdbmsourceclass () 
+{
 }
 
-void mggdbmsourceclass::configure (const text_t &key, const text_tarray &cfgline) {
-  if (cfgline.size() >= 1) {
-    const text_t &value = cfgline[0];
-
-    if (key == "collection") collection = value;
-    else if (key == "collectdir") collectdir = value;
-    else if (key == "gsdlhome") gsdlhome = value;
-    else if (key == "gdbmhome") gdbmhome = value;
-  }
-
-  if (key == "indexmap") {
-    indexmap.importmap (cfgline);
-
-  } else if (key == "defaultindex") {
-    indexmap.from2to (cfgline[0], defaultindex);
-
-  } else if (key == "subcollectionmap") {
-    subcollectionmap.importmap (cfgline);
-
-  } else if (key == "defaultsubcollection") {
-    subcollectionmap.from2to (cfgline[0], defaultsubcollection);
-
-  } else if (key == "languagemap") {
-    languagemap.importmap (cfgline);
-
-  } else if (key == "defaultlanguage") 
-    languagemap.from2to (cfgline[0], defaultlanguage);
-}
-
-bool mggdbmsourceclass::init (ostream &logout) {
-  outconvertclass text_t2ascii;
-  
-  if (gdbmhome.empty()) gdbmhome = gsdlhome;
-
-  if (!sourceclass::init (logout)) return false;
-
-  if (defaultindex.empty()) {
-    // use first index in map as default if no default is set explicitly
-    text_tarray toarray;
-    indexmap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultindex = toarray[0];
-    }
-  }
-
-  if (defaultsubcollection.empty()) {
-    // use first subcollection in map as default if no default is set explicitly
-    text_tarray toarray;
-    subcollectionmap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultsubcollection = toarray[0];
-    }
-  }
-
-  if (defaultlanguage.empty()) {
-    // use first language in map as default if no default is set explicitly
-    text_tarray toarray;
-    languagemap.gettoarray(toarray);
-    if (toarray.size()) {
-      defaultlanguage = toarray[0];
-    }
-  }
-  
-  // get the collection directory name
-  if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
-  }
-  
-  // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
-  if (littleEndian()) gdbm_filename += ".ldb";
-  else gdbm_filename += ".bdb";
-
-  if (!file_exists(gdbm_filename)) {
-    logout << text_t2ascii
-       << "warning: gdbm database \"" //****
-       << gdbm_filename << "\" does not exist\n\n";
-    // return false; //****
-  }
-  
-  return true;
-}
-
-bool mggdbmsourceclass::translate_OID (const text_t &OIDin, text_t &OIDout, 
-                       comerror_t &err, ostream &logout) {
-
-  outconvertclass text_t2ascii;
-
-  err = noError;
-  if (gdbmptr == NULL) {
-    // most likely a configuration problem
-    logout << text_t2ascii 
-       << "configuration error: mggdbmsource 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;
-  }
-
-  infodbclass info;
-  OIDout = gdbmptr->translate_OID (OIDin, info);
-  return true;
-}
-
-bool mggdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
-                      bool getParents, const text_tset &fields, 
-                      const text_t &OID, MetadataInfo_tmap &metadata, 
-                      comerror_t &err, ostream &logout) {
-  outconvertclass text_t2ascii;
-
-  metadata.erase(metadata.begin(), metadata.end());
-
-  err = noError;
-  if (gdbmptr == NULL) {
-    // most likely a configuration problem
-    logout << text_t2ascii 
-       << "configuration error: mggdbmsource 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;
-  }
-
-  // get the metadata - if getParents is set we need to get 
-  // info for all parents of OID as well as OID
-  vector<infodbclass> info_array;
-  text_tarray OIDs;
-  if (getParents) get_parents_array (OID, OIDs);
-  OIDs.push_back (OID);
-
-  text_tarray::const_iterator this_OID = OIDs.begin();
-  text_tarray::const_iterator end_OID = OIDs.end();
-
-  while (this_OID != end_OID) {
-    infodbclass info;
-    if (!gdbmptr->getinfo(*this_OID, info)) return false;
-
-    // adjust the metadata
-    text_t &contains = info["contains"];
-    if (contains.empty()) info["haschildren"] = 0;
-    else info["haschildren"] = 1;
-    contains.clear();
-
-    info_array.push_back(info);
-    this_OID ++;
-  }
-
-  // if fields set is empty we want to get all available metadata
-  text_tset tfields = fields;
-  if (tfields.empty() && !info_array.empty()) {
-    infodbclass::iterator t_info = info_array[0].begin(); 
-    infodbclass::iterator e_info = info_array[0].end(); 
-    while (t_info != e_info) {
-      if ((*t_info).first != "contains")
-    tfields.insert ((*t_info).first);
-      t_info ++;
-    }
-    tfields.insert ("hasnext");
-    tfields.insert ("hasprevious");
-  }
-    
-  // collect together the metadata
-  bool donenextprevtest = false;
-  bool hasnext=false, hasprevious=false;
-  MetadataInfo_t this_metadata;
-  text_tarray *pos_metadata;
-  text_tset::const_iterator fields_here = tfields.begin();
-  text_tset::const_iterator fields_end = tfields.end();
-
-  while (fields_here != fields_end) {
-    this_metadata.clear();
-    this_metadata.isRef = false;
-
-    vector<infodbclass>::reverse_iterator this_info = info_array.rbegin(); 
-    vector<infodbclass>::reverse_iterator end_info = info_array.rend(); 
-    MetadataInfo_t *tmetaptr = &this_metadata;
-    while (this_info != end_info) {
-
-      pos_metadata = (*this_info).getmultinfo(*fields_here);
-      if ((*fields_here == "hasnext" || *fields_here == "hasprevious")) {
-    
-    // collect metadata
-    if (!donenextprevtest) {
-      donenextprevtest = true;
-      
-      // cache parent contents array
-      text_t thisparent = get_parent (OID);
-      if (!thisparent.empty()) {
-        if (thisparent != parentOID) {
-          parentOID = thisparent;
-          parentcontents.erase(parentcontents.begin(), parentcontents.end());
-          if (gdbmptr->getinfo(parentOID, parentinfo)) {
-        text_t &parentinfocontains = parentinfo["contains"];
-        if (!parentinfocontains.empty())
-          splitchar (parentinfocontains.begin(), parentinfocontains.end(), 
-                 ';', parentcontents);
-          }
-        }
-        
-        // do tests
-        text_tarray::const_iterator parentcontents_here = parentcontents.begin();
-        text_tarray::const_iterator parentcontents_end = parentcontents.end();
-        text_t shrunk_OID = OID;
-        shrink_parent (shrunk_OID);
-        while (parentcontents_here != parentcontents_end) {
-          if (*parentcontents_here == shrunk_OID) {
-        if (parentcontents_here == parentcontents.begin()) hasprevious = false;
-        else hasprevious = true;
-        
-        parentcontents_here++;
-        
-        if (parentcontents_here == parentcontents.end()) hasnext = false;
-        else hasnext = true;
-        
-        break;
-          }  
-          
-          parentcontents_here ++;
-        }
-     
-        // fill in metadata
-        if ((*fields_here == "hasnext" && hasnext) ||
-        (*fields_here == "hasprevious" && hasprevious))
-          tmetaptr->values.push_back("1");
-        else
-          tmetaptr->values.push_back("0");
-      } else
-        tmetaptr->values.push_back("0");
-    }
-      }
-      else if (pos_metadata != NULL && *fields_here != "contains") {
-    tmetaptr->values = *pos_metadata;
-      }
-      else
-    tmetaptr->values.push_back("");
-
-      this_info ++;
-      if (this_info != end_info) {
-    tmetaptr->parent = new MetadataInfo_t();
-    tmetaptr = tmetaptr->parent;
-      }
-    }
-    metadata[*fields_here] = this_metadata;
-    fields_here++;
-  }
-  return true;
-}
-
-
-bool mggdbmsourceclass::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: mggdbmsource 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() == 1) {
-    int docnum = info["docnum"].getint();
-    
-    // set the collection directory
-    textsearchptr->setcollectdir (collectdir);
-    
-    // get the text
-    textsearchptr->docTargetDocument(defaultindex, defaultsubcollection,
-                   defaultlanguage, collection, docnum, doc);
-  }
-  return true;
-}
-
-bool mggdbmsourceclass::is_searchable(bool &issearchable, comerror_t &err, ostream &logout) {
-  err = noError;
-  issearchable = false;
-
-  text_tarray fromarray;
-  indexmap.getfromarray(fromarray);
-  if (fromarray.size() == 0) {
-    return true;
-  } else if (fromarray.size() == 1) {
-    if (fromarray[0] == "dummy:text") {
-      // always return true - issearchable is false here though
-      return true;
-    }
-  }
-  issearchable = true;
-  return true;
-}

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -34 +34 @@
 #include "maptools.h"
 #include "search.h"
-#include "source.h"
+#include "gdbmsource.h"
 
 
-class mggdbmsourceclass : public sourceclass {
-protected:
-  text_t gsdlhome;
-  text_t gdbmhome;
-  text_t collection;
-  text_t collectdir;
-
-  // these maps are only needed to convert the default indexes
-  stringmap indexmap;
-  stringmap subcollectionmap;
-  stringmap languagemap;
-
-  text_t defaultindex;
-  text_t defaultsubcollection;
-  text_t defaultlanguage;
-
-  text_t parentOID;
-  infodbclass parentinfo;
-  text_tarray parentcontents;
-
-  text_t gdbm_filename;
-  gdbmclass *gdbmptr;
-  
-  searchclass *textsearchptr;
-
+class mggdbmsourceclass : public gdbmsourceclass {
 public:
   mggdbmsourceclass ();
   virtual ~mggdbmsourceclass ();
 
-  // the gdbmptr remains the responsability of the calling code
-  void set_gdbmptr (gdbmclass *thegdbmptr) {gdbmptr=thegdbmptr;}
-
-  // the textsearchptr remains the responsability of the calling code
-  void set_textsearchptr (searchclass *thetextsearchptr) {textsearchptr=thetextsearchptr;}
-
-  void configure (const text_t &key, const text_tarray &cfgline);
-  bool init (ostream &logout);
-  bool translate_OID (const text_t &OIDin, text_t &OIDout, 
-              comerror_t &err, ostream &logout);
-  bool get_metadata (const text_t &requestParams, const text_t &refParams, 
-             bool getParents, const text_tset &fields, 
-             const text_t &OID, MetadataInfo_tmap &metadata, 
-             comerror_t &err, ostream &logout);
-  bool get_document (const text_t &OID, text_t &doc, 
-             comerror_t &err, ostream &logout);
-  bool is_searchable(bool &issearchable, comerror_t &err, ostream &logout);
 };