Changeset 238

Timestamp:

1999-04-20T11:56:10+12:00 (25 years ago)

Author:

rjmcnab

Message:

Finished the gdbm metadata stuff

Location:

trunk/gsdl/src

Files:

• colservr/browsefilter.cpp (modified) (6 diffs)
• colservr/mggdbmsource.cpp (modified) (2 diffs)
• colservr/queryfilter.cpp (modified) (2 diffs)
• recpt/librarymain.cpp (modified) (3 diffs)
• txt2db/Makefile (modified) (1 diff)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/04/19 23:56:05  rjmcnab
+   Finished the gdbm metadata stuff
+
    Revision 1.1  1999/04/06 22:22:08  rjmcnab
    Initial revision.
@@ -32 +35 @@
   filtopt.defaultValue = "1";
   filtopt.validValues.push_back("1");
-  filtopt.validValues.push_back("1000");
+  filtopt.validValues.push_back("10000");
   filterOptions["StartResults"] = filtopt;
 
@@ -40 +43 @@
   filtopt.type = FilterOption_t::integert;
   filtopt.repeatable = FilterOption_t::onePerQuery;
-  filtopt.defaultValue = "10";
+  filtopt.defaultValue = "10000";
   filtopt.validValues.push_back("1");
-  filtopt.validValues.push_back("1000");
+  filtopt.validValues.push_back("10000");
   filterOptions["EndResults"] = filtopt;
 
@@ -82 +85 @@
                 FilterResponse_t &response,
                 comerror_t &err, ostream &logout) {
+  int numDocs = 0;
   outconvertclass text_t2ascii;
 
@@ -170 +174 @@
 
       // create the response
+      numDocs = resultset.size();
       int resultnum = 1;
       ResultDocInfo_t resultdoc;
@@ -188 +193 @@
   }
 
-  response.numDocs = response.docInfo.size();
+  response.numDocs = numDocs;
   response.isApprox = false;
 }

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/04/19 23:56:07  rjmcnab
+   Finished the gdbm metadata stuff
+
    Revision 1.3  1999/04/12 10:30:33  rjmcnab
    Made a little more progress.
@@ -74 +77 @@
 }
 
-bool mggdbmsourceclass::get_metadata (const text_t &requestParams, const text_t &refParams, 
+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;
-  return false;
+  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;
+  if (!gdbmptr->getinfo(OID, info)) return false;
+
+  // adjust the metadata
+  text_t &contains = info["contains"];
+  if (contains.empty()) info["haschildren"] = 0;
+  else info["haschildren"] = 1;
+  contains.clear();
+
+  // collect together the metadata
+  MetadataInfo_t this_metadata;
+  text_t *pos_metadata;
+  text_tarray::const_iterator fields_here = fields.begin();
+  text_tarray::const_iterator fields_end = fields.end();
+  while (fields_here != fields_end) {
+    if (*fields_here != "contains" && 
+    (pos_metadata = info.getinfo(*fields_here)) != NULL) {
+      this_metadata.isRef = false;
+      this_metadata.field = *fields_here;
+      this_metadata.value = *pos_metadata;
+      metadata.push_back(this_metadata);
+    }
+
+    fields_here++;
+  }
+
+  return true;
 }
+

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/04/19 23:56:09  rjmcnab
+   Finished the gdbm metadata stuff
+
    Revision 1.2  1999/04/12 03:45:03  rjmcnab
    Finished the query filter.
@@ -339 +342 @@
   }
 
-  response.numDocs = response.docInfo.size();
+  response.numDocs = queryresults.getnumdocs();
   response.isApprox = (queryresults.getnumdocs() != queryparams.maxdocs);
 }

trunk/gsdl/src/recpt/librarymain.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/04/19 23:56:10  rjmcnab
+   Finished the gdbm metadata stuff
+
    Revision 1.4  1999/04/12 03:45:05  rjmcnab
    Finished the query filter.
@@ -38 +41 @@
 #include "infodbclass.h"
 #include "mgsearch.h"
+#include "mggdbmsource.h"
 #include <assert.h>
 
@@ -64 +68 @@
   cserver.add_filter (&queryfilter);
 
+  // add a mg and gdbm source
+  mggdbmsourceclass mggdbmsource;
+  mggdbmsource.set_gdbmptr (&gdbmhandler);
+  mggdbmsource.set_mgsearchptr (&mgsearch);
+  cserver.add_source (&mggdbmsource);
+
   // inform collection server and everything it contains about its
   // collection name

trunk/gsdl/src/txt2db/Makefile

@@ -29 +29 @@
 RANLIB = ranlib
 INCLUDES = -I../../lib
-LDFLAGS = -lg++ -lgdbm
-LIBS = ../../lib/gsdllib.a ../../packages/mg-1.3d/lib/unitool.o
+LDFLAGS = 
+LIBS = ../../lib/gsdllib.a ../../packages/mg-1.3d/lib/unitool.o -lstdc++ -lgdbm
 GSDLOS = linux