Changeset 249

Timestamp:

1999-04-30T14:00:48+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of stuff to do with getting documentaction working

Location:

trunk/gsdl/src/colservr

Files:

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

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/04/30 02:00:45  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.2  1999/04/19 23:56:05  rjmcnab
    Finished the gdbm metadata stuff
@@ -151 +154 @@
       // replace " with the parent node name and split the contains string
       // into the result set
-      text_tset resultset;
+      text_tarray resultset;
       text_t tmptext;
       text_t &contains = info["contains"];
@@ -159 +162 @@
     if (*contains_here == '"') tmptext += parentnode;
     else if (*contains_here == ';') {
-      if (!tmptext.empty()) resultset.insert (tmptext);
+      if (!tmptext.empty()) resultset.push_back (tmptext);
       tmptext.clear();
     } else tmptext.push_back(*contains_here);
@@ -166 +169 @@
       }
       // insert the last result in the set
-      if (!tmptext.empty()) resultset.insert (tmptext);
+      if (!tmptext.empty()) resultset.push_back (tmptext);
       
       // do an intersection with the input set
@@ -177 +180 @@
       int resultnum = 1;
       ResultDocInfo_t resultdoc;
-      text_tset::iterator result_here = resultset.begin();
-      text_tset::iterator result_end = resultset.end();
+      text_tarray::iterator result_here = resultset.begin();
+      text_tarray::iterator result_end = resultset.end();
 
       while (result_here != result_end) {

trunk/gsdl/src/colservr/collectserver.cpp

@@ -13 +13 @@
 /*
    $Log$
+   Revision 1.7  1999/04/30 02:00:45  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.6  1999/04/06 22:20:29  rjmcnab
    Got browsefilter working.
@@ -38 +41 @@
 
 #include "collectserver.h"
+#include "infodbclass.h"
+#include "OIDtools.h"
 #include <assert.h>
 
@@ -168 +173 @@
 }
 
-void collectserver::filter (const FilterRequest_t &request,
+void collectserver::filter (FilterRequest_t &request,
                 FilterResponse_t &response,
                 comerror_t &err, ostream &logout) {
   outconvertclass text_t2ascii;
+
+  // translate any ".fc", ".pr" etc. stuff in the docSet
+  text_t translatedOID;
+  text_tset translatedOIDs;
+  text_tset::iterator doc_here = request.docSet.begin();
+  text_tset::iterator doc_end = request.docSet.end();
+  while (doc_here != doc_end) {
+    if (needs_translating (*doc_here)) {
+      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->translate_OID (*doc_here, translatedOID, err, logout))) {
+      if (err != noError) return;
+      break;
+    }
+    source_here++;
+      }
+      translatedOIDs.insert (translatedOID);
+    } else {
+      translatedOIDs.insert (*doc_here);
+    }
+    doc_here ++;
+  }
+  request.docSet = translatedOIDs;
 
   response.clear();

trunk/gsdl/src/colservr/collectserver.h

@@ -94 +94 @@
                   comerror_t &err, ostream &logout);
 
-  virtual void filter (const FilterRequest_t &request,
+  virtual void filter (FilterRequest_t &request,
                FilterResponse_t &response,
                comerror_t &err, ostream &logout);

trunk/gsdl/src/colservr/filter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/04/30 02:00:46  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.4  1999/04/12 03:45:02  rjmcnab
    Finished the query filter.
@@ -224 +227 @@
 }
 
+void intersect (text_tarray &set1, const text_tset &set2) {
+  text_tarray resultset;
+
+  text_tarray::const_iterator set1_here = set1.begin();
+  text_tarray::const_iterator set1_end = set1.end();
+
+  while (set1_here != set1_end) {
+    if (in_set (set2, *set1_here))
+      resultset.push_back (*set1_here);
+    set1_here ++;
+  }
+  set1 = resultset;
+}
+
 
 // tests to see if el is in set

trunk/gsdl/src/colservr/filter.h

@@ -112 +112 @@
 // intersect places the result in set1
 void intersect (text_tset &set1, const text_tset &set2);
+void intersect (text_tarray &set1, const text_tset &set2);
 
 // tests to see if el is in set

trunk/gsdl/src/colservr/infodbclass.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/04/30 02:00:46  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.2  1999/04/06 22:20:31  rjmcnab
    Got browsefilter working.
@@ -25 +28 @@
 #include "gsdlunicode.h"
 #include "fileutil.h"
-
+#include "OIDtools.h"
   
 // constructors
@@ -91 +94 @@
   gdbmfile = NULL;
   openfile.clear();
+}
+
+// replaces the .fc, .lc, .pr, .ns and .ps syntax (first child, 
+// last child, parent, next sibling, previous sibling) 
+// it expects child, parent, etc. to exist if syntax has been used
+// so you should test before using
+text_t gdbmclass::translate_OID (const text_t &inOID, infodbclass &info) {
+
+  if (inOID.empty() || inOID.size() < 4) return inOID;
+  if (findchar (inOID.begin(), inOID.end(), '.') == inOID.end()) return inOID;
+
+  text_t OID = inOID;
+  text_tarray tailarray;
+  text_t tail = substr (OID.end()-3, OID.end());
+  while (tail == ".fc" || tail == ".lc" || tail == ".pr" || 
+     tail == ".ns" || tail == ".ps") {
+    tailarray.push_back(tail);
+    OID.erase (OID.end()-3, OID.end());
+    tail = substr (OID.end()-3, OID.end());
+  }
+
+  if (!tailarray.size()) return inOID;
+  text_tarray::const_iterator begin = tailarray.begin();
+  text_tarray::const_iterator here = tailarray.end() - 1;
+
+  while (here >= begin) {
+
+    if (*here == ".fc")
+      get_first_child (OID, info);
+    else if (*here == ".lc")
+      get_last_child (OID, info);
+    else if (*here == ".pr")
+      OID = get_parent (OID);
+    else if (*here == ".ns")
+      get_next_sibling (OID, info);
+    else if (*here == ".ps")
+      get_previous_sibling (OID, info);
+    
+    here --;
+  }
+  return OID;
+}
+
+void gdbmclass::get_first_child (text_t &OID, infodbclass &info) {
+
+  text_t firstchild;
+  if (getinfo (OID, info)) {
+    text_t &contains = info["contains"];
+    if (!contains.empty()) {
+      text_t parent = OID;
+      getdelimitstr (contains.begin(), contains.end(), ';', firstchild);
+      if (firstchild.empty()) OID = contains;
+      else OID = firstchild;
+      if (*(OID.begin()) == '"') translate_parent (OID, parent);
+    }
+  }
+}
+
+void gdbmclass::get_last_child (text_t &OID, infodbclass &info) {
+
+  text_tarray children;
+  if (getinfo (OID, info)) {
+    text_t &contains = info["contains"];
+    if (!contains.empty()) {
+      text_t parent = OID;
+      splitchar (contains.begin(), contains.end(), ';', children);
+      OID = children.back();
+      if (*(OID.begin()) == '"') translate_parent (OID, parent);
+    }
+  }
+}
+  
+void gdbmclass::get_next_sibling (text_t &OID, infodbclass &info) {
+
+  text_tarray siblings;
+  text_t parent = get_parent (OID);
+         
+  if (getinfo (parent, info)) {
+    text_t &contains = info["contains"];
+    if (!contains.empty()) {
+      splitchar (contains.begin(), contains.end(), ';', siblings);
+      text_tarray::const_iterator here = siblings.begin();
+      text_tarray::const_iterator end = siblings.end();
+      text_t shrunk_OID = OID;
+      shrink_parent (shrunk_OID);
+      while (here != end) {
+    if (*here == shrunk_OID && (here+1 != end)) {
+      OID = *(here+1);
+      if (*(OID.begin()) == '"') translate_parent (OID, parent);
+      break;
+    }
+    here ++;
+      }
+    }
+  }
+}
+
+void gdbmclass::get_previous_sibling (text_t &OID, infodbclass &info) {
+
+  text_tarray siblings;
+  text_t parent = get_parent (OID);
+
+  if (getinfo (parent, info)) {
+    text_t &contains = info["contains"];
+    if (!contains.empty()) {
+      splitchar (contains.begin(), contains.end(), ';', siblings);
+      text_tarray::const_iterator here = siblings.begin();
+      text_tarray::const_iterator end = siblings.end();
+      text_t shrunk_OID = OID;
+      shrink_parent (shrunk_OID);
+      while (here != end) {
+    if (*here == shrunk_OID && (here != siblings.begin())) {
+      OID = *(here-1);
+      if (*(OID.begin()) == '"') translate_parent (OID, parent);
+      break;
+    }
+    here ++;
+      }
+    }
+  }
 }
 

trunk/gsdl/src/colservr/infodbclass.h

@@ -87 +87 @@
   void closedatabase ();
 
+  // replaces the .c, .p, .n, .l syntax (child, parent, next, previous) 
+  // it expects child, parent, etc. to exist if syntax has been used
+  // so you should test before using
+  text_t translate_OID (const text_t &OID, infodbclass &info);
+
   // returns true on success
   bool getinfo (text_t key, infodbclass &info);
@@ -98 +103 @@
   GDBM_FILE gdbmfile;
   ostream *logout;
-  
+
+  void get_first_child (text_t &OID, infodbclass &info);
+  void get_last_child (text_t &OID, infodbclass &info);
+  void get_next_sibling (text_t &OID, infodbclass &info);
+  void get_previous_sibling (text_t &OID, infodbclass &info);
+
   // returns true on success
   bool getkeydata (text_t key, text_t &data);

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/04/30 02:00:47  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.6  1999/04/21 22:40:44  sjboddie
    made another change to the one I just committed. if requested metadata doesn't
@@ -38 +41 @@
 #include "mggdbmsource.h"
 #include "fileutil.h"
-
+#include "OIDtools.h"
 
 
@@ -86 +89 @@
 }
 
-bool mggdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
-                      const text_tarray &fields, const text_t &OID,
-                      MetadataInfo_tarray &metadata, 
-                      comerror_t &err, ostream &logout) {
+bool mggdbmsourceclass::translate_OID (const text_t &OIDin, text_t &OIDout, 
+                       comerror_t &err, ostream &logout) {
+
   outconvertclass text_t2ascii;
-
-  metadata.erase(metadata.begin(), metadata.end());
 
   err = noError;
@@ -115 +115 @@
   }
 
+  infodbclass info;
+  OIDout = gdbmptr->translate_OID (OIDin, info);
+  return true;
+}
+
+bool mggdbmsourceclass::get_metadata (const text_t &/*requestParams*/, const text_t &/*refParams*/, 
+                      const text_tarray &fields, const text_t &OID,
+                      MetadataInfo_tarray &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)) {
+    // 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
   infodbclass info;
@@ -126 +160 @@
 
   // collect together the metadata
+  bool donenextprevtest = false;
+  bool hasnext, hasprevious;
   MetadataInfo_t this_metadata;
   text_t *pos_metadata;
@@ -134 +170 @@
     this_metadata.isRef = false;
     pos_metadata = info.getinfo(*fields_here);
-    if (pos_metadata != NULL && *fields_here != "contains")
+    
+    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 != 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))
+    this_metadata.values.push_back("1");
+      else
+    this_metadata.values.push_back("0");
+
+    }
+    else if (pos_metadata != NULL && *fields_here != "contains")
       this_metadata.values.push_back(*pos_metadata);
     else 

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -29 +29 @@
   text_t collectdir;
 
+  text_t parentOID;
+  infodbclass parentinfo;
+  text_tarray parentcontents;
+
   text_t gdbm_filename;
   gdbmclass *gdbmptr;
@@ -46 +50 @@
   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, 
              const text_tarray &fields, const text_t &OID,

trunk/gsdl/src/colservr/source.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/04/30 02:00:48  sjboddie
+   lots of stuff to do with getting documentaction working
+
    Revision 1.2  1999/04/06 22:20:32  rjmcnab
    Got browsefilter working.
@@ -45 +48 @@
 }
 
+
+// translate_OID translates OIDs using ".pr", ."fc" etc.
+bool sourceclass::translate_OID (const text_t &/*OIDin*/, text_t &/*OIDout*/, 
+                 comerror_t &err, ostream &/*logout*/) {
+  err = noError;
+
+  return false;
+}
+
+
 // get_metadata fills out the metadata if possible, if it is not responsable
 // for the given OID then it will return false.

trunk/gsdl/src/colservr/source.h

@@ -30 +30 @@
   // before any other methods are called
   virtual bool init (ostream &logout);
+
+  // translate_OID translates OIDs using ".pr", ."fc" etc.
+  virtual bool translate_OID (const text_t &OIDin, text_t &OIDout, 
+                  comerror_t &err, ostream &logout);
 
   // get_metadata fills out the metadata if possible, if it is not responsable