Changeset 196

Timestamp:

1999-03-10T09:58:50+13:00 (25 years ago)

Author:

rjmcnab

Message:

Added dummy filter and metadata results.

Location:

trunk/gsdl/src/colservr

Files:

• collectserver.cpp (modified) (7 diffs)
• collectserver.h (modified) (4 diffs)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/03/09 20:58:50  rjmcnab
+   Added dummy filter and metadata results.
+
    Revision 1.3  1999/03/08 05:07:42  rjmcnab
    Made some alterations to fit with the changes to the comtypes. Added the
@@ -105 +108 @@
   qfopt7.defaultValue = "";
 
+  // -- onePerTerm  Language  enumerated
+  FilterOption_t &qfopt8 = queryfilter.filterOptions["Language"];
+  qfopt8.name = "Language";
+  qfopt8.type = FilterOption_t::enumeratedt;
+  qfopt8.repeatable = FilterOption_t::onePerTerm;
+  qfopt8.defaultValue = "";
+
 
   // set up the BrowseFilter information
@@ -143 +153 @@
 // it contains. The configuration should take place just before initialisation.
 void collectserver::configure (const text_t &key, const text_tarray &cfgline) {
-  if (key == "indexmap") configinfo.indexmap = cfgline;
-  else if (key == "subcollectionmap") configinfo.subcollectionmap = cfgline;
-  else if (key == "languagemap") configinfo.languagemap = cfgline;
-  
-  else if (cfgline.size() >= 1) {
+  if (key == "indexmap") {
+    configinfo.indexmap.importmap (cfgline);
+
+    // update the list of indexes in the filter information
+    text_tarray options;
+    configinfo.indexmap.gettoarray (options);
+    update_enumfiltopt ("Index", options);
+
+  } else if (key == "subcollectionmap") {
+    configinfo.subcollectionmap.importmap (cfgline);
+
+    // update the list of subcollections in the filter information
+    text_tarray options;
+    configinfo.subcollectionmap.gettoarray (options);
+    update_enumfiltopt ("Subcollection", options);
+
+  } else if (key == "languagemap") {
+    configinfo.languagemap.importmap (cfgline);
+
+    // update the list of languages in the filter information
+    text_tarray options;
+    configinfo.languagemap.gettoarray (options);
+    update_enumfiltopt ("Language", options);
+  
+  } else if (cfgline.size() >= 1) {
     const text_t &value = cfgline[0];
     if (key == "gsdlhome") configinfo.gsdlhome = value;
@@ -206 +236 @@
 void collectserver::get_filteroptions (InfoFilterOptionsResponse_t &response, 
                        comerror_t &err, ostream &/*logout*/) {
-
+  response = filterinfo;
   err = noError;
 }
@@ -213 +243 @@
                 FilterResponse_t &response,
                 comerror_t &err, ostream &/*logout*/) {
+  response.clear();
+
   if (request.filterName == "QueryFilter") {
     // return documents
-
-
+    response.docsFound = 2;
+    response.isApprox = false;
+    
+    // fill in the term info
+    TermInfo_t terminfo;
+    terminfo.term = "the";
+    terminfo.freq = 2;
+    terminfo.matchTerms.push_back ("the");
+    terminfo.matchTerms.push_back ("The");
+    response.termInfo.push_back (terminfo);
+
+    // fill in the document info
+    ResultDocInfo_t resultdoc;
+    resultdoc.OID = "HASH1234";
+    resultdoc.ranking = 0.8;
+    resultdoc.docFreq.push_back (10);
+    response.docInfo.push_back (resultdoc);
+
+    resultdoc.clear();
+    resultdoc.OID = "HASH2345";
+    resultdoc.ranking = 0.5;
+    resultdoc.docFreq.push_back (5);
+    response.docInfo.push_back (resultdoc);
+
+  } else if (request.filterName == "BrowseFilter") {
+    // return documents
+    response.docsFound = 2;
+    response.isApprox = false;
+    
+    // fill in the document info
+    ResultDocInfo_t resultdoc;
+    resultdoc.OID = "HASH2345";
+    response.docInfo.push_back (resultdoc);
+
+    resultdoc.clear();
+    resultdoc.OID = "HASH3456";
+    response.docInfo.push_back (resultdoc);
+    
   } else {
+    err = protocolError;
+    return;
   }
-
-
 
   err = noError;
@@ -227 +295 @@
 void collectserver::get_metadataoptions (MetadataInfoResponse_t &response,
                      comerror_t &err, ostream &/*logout*/) {
+  response.clear();
+
+  response.supportedFields.insert ("Title");
+  response.supportedFields.insert ("Creator");
+
+  response.supportedLanguages.insert ("en");
+
   err = noError;
 }
@@ -233 +308 @@
                   MetadataResponse_t &response,
                   comerror_t &err, ostream &/*logout*/) {
+  response.clear();
+
+  text_tarray::const_iterator OIDs_here, OIDs_end, fields_here, fields_end,
+    languages_here, languages_end;
+  
+  // for each object ID
+  OIDs_here = request.OIDs.begin();
+  OIDs_end = request.OIDs.end();
+  while (OIDs_here != OIDs_end) {
+    
+    // and each field
+    fields_here = request.fields.begin();
+    fields_end = request.fields.end();
+    while (fields_here != fields_end) {
+      
+      // and each language
+      languages_here = request.languages.begin();
+      languages_end = request.languages.end();
+      while (languages_here != languages_end) {
+    
+    // return the metadata
+    text_t metadata = "Place holder";
+    if (*OIDs_here == "HASH1234") {
+      if (*fields_here == "Title") metadata="The 1234 book";
+      else if (*fields_here == "Creator") metadata="ME";
+      
+    } else if (*OIDs_here == "HASH2345") {
+      if (*fields_here == "Title") metadata="2345, come alive";
+      else if (*fields_here == "Creator") metadata="Another person";
+
+    } else if (*OIDs_here == "HASH3456") {
+      if (*fields_here == "Title") metadata="As easy as 3456";
+      else if (*fields_here == "Creator") metadata="Bricks";
+    }
+
+    response.metadata.push_back (metadata);
+    languages_here++;
+      }
+      
+      fields_here++;
+    }
+
+    OIDs_here++;
+  }
+
   err = noError;
 }
 
+void collectserver::update_enumfiltopt (text_t optionname, 
+                    const text_tarray &options) {
+  // update this option for each of the filters
+  FilterDescript_tmap::iterator filteropthere = filterinfo.filterOptions.begin();
+  FilterDescript_tmap::iterator filteroptend = filterinfo.filterOptions.end();
+  
+  while (filteropthere != filteroptend) {
+    // see if this filter has an option with this name
+    FilterOption_tmap &fotm = (*filteropthere).second.filterOptions;
+    FilterOption_tmap::iterator fotm_iterator = fotm.find(optionname);
+    if (fotm_iterator != fotm.end()) {
+      // set the valid values to be the options
+      (*fotm_iterator).second.validValues = options;
+
+      // make sure the default is a valid value
+      (*fotm_iterator).second.check_defaultValue();
+    }
+    
+    filteropthere++;
+  }
+}
 
 

trunk/gsdl/src/colservr/collectserver.h

@@ -17 +17 @@
 #include "text_t.h"
 #include "comtypes.h"
+#include "maptools.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -39 +40 @@
   text_t collection;
   text_t collectdir;
-  text_tarray indexmap;
-  text_tarray subcollectionmap;
-  text_tarray languagemap;
+  stringmap indexmap;
+  stringmap subcollectionmap;
+  stringmap languagemap;
 };
 
@@ -50 +51 @@
   ColInfoResponse_t collectinfo;
   InfoFilterOptionsResponse_t filterinfo;
+
 public:
   collectserver ();
@@ -84 +86 @@
                  MetadataResponse_t &response,
                  comerror_t &err, ostream &logout);
+protected:
+  void update_enumfiltopt (text_t optionname, const text_tarray &options);
 };