Changeset 138 for trunk/gsdl/src/library

Timestamp:

1999-02-03T14:13:30+13:00 (25 years ago)

Author:

sjboddie

Message:

Got interface to handle subcollections and language subcollections -
committed changes made to some of the collections

Location:

trunk/gsdl/src/library

Files:

• libinterface.cpp (modified) (10 diffs)
• libinterface.h (modified) (2 diffs)

trunk/gsdl/src/library/libinterface.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.18  1999/02/03 01:13:29  sjboddie
+
+   Got interface to handle subcollections and language subcollections -
+   committed changes made to some of the collections
+
    Revision 1.17  1999/02/02 10:01:11  rjmcnab
 
@@ -255 +260 @@
     cfgline.erase(cfgline.begin());
     if (key == "maintainer")        cfg_info.maintainer = cfgline[0];
-    else if (key == "indexes")      cfg_info.indexes = cfgline;
+    //  else if (key == "indexes")      cfg_info.indexes = cfgline;
     else if (key == "defaultindex") cfg_info.defaultindex = cfgline[0];
     else if (key == "macrofiles")   cfg_info.macrofiles = cfgline;
     else if (key == "builddate")    cfg_info.builddate = cfgline[0];
     else if (key == "indexmap")     cfg_info.indexmap = cfgline;
+    else if (key == "subcollectionmap")
+                                    cfg_info.subcollectionmap = cfgline;
+    else if (key == "languagemap")  cfg_info.languagemap = cfgline;
     else if (key == "numbytes")     cfg_info.numbytes = (double)cfgline[0].getint();
     else if (key == "numdocs")      cfg_info.numdocs = (double)cfgline[0].getint();
@@ -318 +326 @@
     default_index.clear();
   } else if (cfg_info.defaultindex.empty() || 
-         !isrealindex (cfg_info.indexmap, cfg_info.defaultindex)) {
+         !isrealindex (cfg_info.indexmap, cfg_info.subcollectionmap,
+               cfg_info.languagemap, cfg_info.defaultindex)) {
     logout << "warning: the default index has been reset to the first index\n";
-    getrealdirindex (cfg_info.indexmap[0], cfg_info.defaultindex, default_index);
+    text_t subcollection, language;
+    if (!cfg_info.subcollectionmap.empty()) 
+      subcollection = cfg_info.subcollectionmap[0];
+    if (!cfg_info.languagemap.empty()) 
+      language = cfg_info.languagemap[0];
+    getrealdirindex (cfg_info.indexmap[0], subcollection,
+             language, cfg_info.defaultindex, default_index);
   } else {
-    default_index = real2dirindex (cfg_info.indexmap, cfg_info.defaultindex);
+    default_index = real2dirindex (cfg_info.indexmap, cfg_info.subcollectionmap, 
+                   cfg_info.languagemap, cfg_info.defaultindex);
   }
 
@@ -328 +344 @@
   // retrieving documents).
   text_default_index = default_index;
-  if (!isdoclevelindex (cfg_info.defaultindex)) {
-    text_default_index = real2dirindex (cfg_info.indexmap, 
-                    getdoclevelindex (cfg_info.indexmap));
-  }
+  //if (!isdoclevelindex (cfg_info.defaultindex)) {
+  //  text_default_index = real2dirindex (cfg_info.indexmap, cfg_info.subcollectionmap,
+  //                    cfg_info.languagemap, getdoclevelindex (cfg_info.indexmap));
+  //}
 
   // load up the default macro files, the collection directory
@@ -371 +387 @@
 
   parse_cgi_args (argstr, args);
+
   expand_compressed_args (args);
   add_default_args (args);
@@ -574 +591 @@
   if (args["p"].empty()) args.setarg("p", cfg_info.defaultpage);
   if (args["w"].empty()) args.setarg("w", cfg_info.defaultencoding);
-  if (args["i"].empty()) args.setarg("i", default_index);
+
+  // override those parts of the index that need it
+  int indexsize = args["i"].size();
+  if ((indexsize < 3) || (indexsize > 7)) {
+    args["i"] = args["h"] + args["i"] + args["n"];
+  } else {
+    if (args["h"].size() == 3) {
+      args["i"][0] = args["h"][0];
+      args["i"][1] = args["h"][1];
+      args["i"][2] = args["h"][2];
+    }
+
+    if (args["j"].size() == 2) {
+      if (indexsize >= 5) {
+    args["i"][3] = args["j"][0];
+    args["i"][4] = args["j"][1];
+      } else {
+    args["i"] += args["j"];
+      }
+    }
+    if (args["n"].size() == 2) {
+      if (cfg_info.subcollectionmap.empty()) {
+    if (args["i"].size() >= 5) {
+      args["i"][3] = args["n"][0];
+      args["i"][4] = args["n"][1];
+    } else {
+      args["i"] += args["n"];
+    }
+      } else {
+    if (args["i"].size() == 7) {
+      args["i"][5] = args["n"][0];
+      args["i"][6] = args["n"][1];
+    } else {
+      args["i"] += args["n"];
+    }
+      }
+    }
+  }      
+  if ((args["i"].size() < 3) || (args["i"].size() > 7)) 
+    args.setarg("i", default_index);
+
 }
 
@@ -627 +684 @@
   disp.setmacro("g", "Global", args["g"]);
 
- // set the selection macros
-
-  text_t indexselect;
-  text_t maprealindex, mapdirindex;
-  if (cfg_info.indexmap.size() == 1) {
-    getrealdirindex (cfg_info.indexmap[0], maprealindex, mapdirindex);
-    indexselect += "<input type=hidden name=\"i\" value=\"";
-    indexselect += mapdirindex;
-    indexselect += "\">_query:";
-    indexselect += real2macroindex (maprealindex);
-    indexselect += "_\n";
-
-  } else {
-    text_t &arg_i = args["i"];
-    text_tarray::const_iterator maphere = cfg_info.indexmap.begin();
-    text_tarray::const_iterator mapend = cfg_info.indexmap.end();
-    
-    indexselect += "<select name=\"i\">\n";
-    while (maphere != mapend) {
-      getrealdirindex (*maphere, maprealindex, mapdirindex);
-      indexselect += "<option value=\"";
-      indexselect += mapdirindex;
-      indexselect += "\"";
-      if (arg_i == mapdirindex) indexselect += " selected";
-      indexselect += ">_query:";
-      indexselect += real2macroindex (maprealindex);
-      indexselect += "_\n";
-      
-      maphere++;
-    }
-    indexselect += "</select>\n";
-  }
-
-  disp.setmacro("indexselection", "query", indexselect);
+  // set the selection macros
+
+  text_t index, subcollection, language;
+  getdirindexparts (cfg_info.indexmap, cfg_info.subcollectionmap,
+            cfg_info.languagemap, args["i"],  index, 
+            subcollection, language);
+
+  // main part of index
+  set_selection_macro (cfg_info.indexmap, index, "h");
+  
+  // subcollection part of index
+  if (!cfg_info.subcollectionmap.empty())
+    set_selection_macro (cfg_info.subcollectionmap, subcollection, "j");
+
+  // language part of index
+  if (!cfg_info.languagemap.empty())
+    set_selection_macro (cfg_info.languagemap, language, "n");
+  
 
   text_t qtselect;
@@ -675 +716 @@
 
   disp.setmacro("querytypeselection", "query", qtselect);
+}
+
+void libinterface::set_selection_macro (const text_tarray &map, const text_t &indexarg,
+                    const text_t &index) {
+
+  text_t maprealindex, mapdirindex, indexselect;
+
+  if (map.size() == 1) {
+    getrealdir (map[0], maprealindex, mapdirindex);
+    indexselect += "<input type=hidden name=\"" + index + "\" value=\"";
+    indexselect += mapdirindex + "\">_query:";
+    indexselect += real2macroindex (maprealindex);
+    indexselect += "_\n";
+
+  } else {
+    text_tarray::const_iterator maphere = map.begin();
+    text_tarray::const_iterator mapend = map.end();
+    
+    indexselect += "<select name=\"" + index +"\">\n";
+    while (maphere != mapend) {
+      getrealdir (*maphere, maprealindex, mapdirindex);
+      indexselect += "<option value=\"";
+      indexselect += mapdirindex;
+      indexselect += "\"";
+      if (indexarg == mapdirindex) indexselect += " selected";
+      indexselect += ">_query:";
+      indexselect += real2macroindex (maprealindex);
+      indexselect += "_\n";
+      
+      maphere++;
+    }
+    indexselect += "</select>\n";
+  }
+  disp.setmacro(index + "selection", "query", indexselect);
 }
 
@@ -1216 +1291 @@
   caseoption += "\n<input type=radio name=k value=1";
   if (arg_k) caseoption += " checked";
-  caseoption += "> ignore case differences<br>\n";
+  caseoption += ">_textignorecase_<br>\n";
   caseoption += "<input type=radio name=k value=0";
   if (!arg_k) caseoption += " checked";
-  caseoption += "> upper/lower case must match\n";
+  caseoption += ">_textmatchcase_\n";
 
   disp.setmacro ("caseoption", "preferences", caseoption);
@@ -1229 +1304 @@
   stemoption += "\n<input type=radio name=s value=1";
   if (arg_s) stemoption += " checked";
-  stemoption += "> ignore word endings<br>\n";
+  stemoption += ">_textstem_<br>\n";
   stemoption += "<input type=radio name=s value=0";
   if (!arg_s) stemoption += " checked";
-  stemoption += "> whole word must match\n";
+  stemoption += ">_textnostem_\n";
 
   disp.setmacro ("stemoption", "preferences", stemoption);

trunk/gsdl/src/library/libinterface.h

@@ -55 +55 @@
 
   text_t      maintainer;
-  text_tarray indexes;
+//  text_tarray indexes;
   text_t      defaultindex;
   text_tarray macrofiles;
   text_t      builddate;
   text_tarray indexmap;
+  text_tarray subcollectionmap;
+  text_tarray languagemap;
   double      numbytes;
   double      numdocs;
@@ -156 +158 @@
   virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert, 
                       ostream &logout);
+
+  virtual void set_selection_macro (const text_tarray &map, const text_t &indexarg,
+                    const text_t &index);
+
   virtual void prepare_page (cgiargsclass &args, outconvertclass &outconvert,
                  ostream &logout);