Changeset 259

Timestamp:

1999-05-10T15:43:49+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of changes to lots of files - getting document action going

Location:

trunk/gsdl/src/colservr

Files:

• browsefilter.cpp (modified) (2 diffs)
• collectserver.cpp (modified) (2 diffs)
• collectserver.h (modified) (1 diff)
• infodbclass.cpp (modified) (2 diffs)
• mggdbmsource.cpp (modified) (2 diffs)
• mggdbmsource.h (modified) (1 diff)
• source.cpp (modified) (2 diffs)
• source.h (modified) (1 diff)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/05/10 03:43:47  sjboddie
+   lots of changes to lots of files - getting document action going
+
    Revision 1.3  1999/04/30 02:00:45  sjboddie
    lots of stuff to do with getting documentaction working
@@ -136 +139 @@
   }
 
+  infodbclass info;
+
+  // translate any ".fc", ".pr" etc. stuff in the parentnode
+  parentnode = gdbmptr->translate_OID (parentnode, info);
+
   // adjust topmost browsing node
   if (parentnode.empty()) parentnode = "browse";
 
   // get the node
-  infodbclass info;
-  
   if ((request.filterResultOptions & FROID) ||
       (request.filterResultOptions & FRmetadata)) {

trunk/gsdl/src/colservr/collectserver.cpp

@@ -13 +13 @@
 /*
    $Log$
+   Revision 1.8  1999/05/10 03:43:47  sjboddie
+   lots of changes to lots of files - getting document action going
+
    Revision 1.7  1999/04/30 02:00:45  sjboddie
    lots of stuff to do with getting documentaction working
@@ -246 +249 @@
 }
 
-
-
-
+void collectserver::get_document (const DocumentRequest_t &request,
+                  DocumentResponse_t &response,
+                  comerror_t &err, ostream &logout) {
+
+  sourcelistclass::iterator source_here = sources.begin();
+  sourcelistclass::iterator source_end = sources.end();
+  while (source_here != source_end) {
+    assert ((*source_here).s != NULL);
+    if (((*source_here).s != NULL) &&
+    ((*source_here).s->get_document (request.OID, response.doc, err, logout))) {
+      if (err != noError) return;
+      break;
+    }
+    source_here++;
+  }
+}
 
 // thecollectserver remains the property of the calling code but

trunk/gsdl/src/colservr/collectserver.h

@@ -97 +97 @@
                FilterResponse_t &response,
                comerror_t &err, ostream &logout);
+
+
+  virtual void get_document (const DocumentRequest_t &request,
+                 DocumentResponse_t &response,
+                 comerror_t &err, ostream &logout);
+
 };
 

trunk/gsdl/src/colservr/infodbclass.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/05/10 03:43:48  sjboddie
+   lots of changes to lots of files - getting document action going
+
    Revision 1.3  1999/04/30 02:00:46  sjboddie
    lots of stuff to do with getting documentaction working
@@ -102 +105 @@
 text_t gdbmclass::translate_OID (const text_t &inOID, infodbclass &info) {
 
-  if (inOID.empty() || inOID.size() < 4) return inOID;
+  if (inOID.size() < 4) return inOID;
   if (findchar (inOID.begin(), inOID.end(), '.') == inOID.end()) return inOID;
 

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/05/10 03:43:48  sjboddie
+   lots of changes to lots of files - getting document action going
+
    Revision 1.7  1999/04/30 02:00:47  sjboddie
    lots of stuff to do with getting documentaction working
@@ -231 +234 @@
 }
 
+
+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)) {
+    // 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
+    mgsearchptr->setcollectdir (collectdir);
+    
+    // get the text
+    mgsearchptr->docTargetDocument("stx", collection, docnum, doc);
+  }
+  return true;
+}

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -56 +56 @@
              MetadataInfo_tarray &metadata, 
              comerror_t &err, ostream &logout);
+  bool get_document (const text_t &OID, text_t &doc, 
+             comerror_t &err, ostream &logout);
 };
 

trunk/gsdl/src/colservr/source.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/05/10 03:43:49  sjboddie
+   lots of changes to lots of files - getting document action going
+
    Revision 1.3  1999/04/30 02:00:48  sjboddie
    lots of stuff to do with getting documentaction working
@@ -70 +73 @@
 }
 
+bool sourceclass::get_document (const text_t &/*OID*/, text_t &/*doc*/, 
+                comerror_t &err, ostream &/*logout*/) {
+  err = noError;
+
+  return false;
+}
 
 

trunk/gsdl/src/colservr/source.h

@@ -40 +40 @@
                  const text_tarray &fields, const text_t &OID,
                  MetadataInfo_tarray &metadata, 
+                 comerror_t &err, ostream &logout);
+
+  virtual bool get_document (const text_t &OID, text_t &doc, 
                  comerror_t &err, ostream &logout);
 };