Changeset 91 for trunk/gsdl/src/library

Timestamp:

1998-12-30T16:50:37+13:00 (26 years ago)

Author:

rjmcnab

Message:

Changed the directory structure (collect.cfg and site.cfg now reside
in the collection/etc directory). Changed all input to the library
software to be converted from utf-8 to unicode (info database, mg,
and display). Got lib.init to read in collect.cfg and build.cfg and
used the information to read in the macrofiles. Made it check for each
macro file in both the collection directory and then the main directory.

Location:

trunk/gsdl/src/library

Files:

• Makefile (modified) (1 diff)
• browse.cpp (modified) (23 diffs)
• cgiwrap.cpp (modified) (2 diffs)
• gdbmclass.cpp (modified) (7 diffs)
• gdbmclass.h (modified) (2 diffs)
• libinterface.cpp (modified) (10 diffs)
• libinterface.h (modified) (6 diffs)
• locateinfo.cpp (modified) (1 diff)
• locateinfo.h (modified) (1 diff)
• mgsearch.cpp (modified) (10 diffs)
• mgsearch.h (modified) (2 diffs)

trunk/gsdl/src/library/Makefile

@@ -25 +25 @@
 AR = ar
 CC = gcc
-CCFLAGS = -O2
+CCFLAGS = -O2 -g
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI
 RANLIB = ranlib

trunk/gsdl/src/library/browse.cpp

@@ -44 +44 @@
     else section = *thissection;
 
-    gdbm.getinfo(section, collection, info);
-    get_first_section(info.c, child);
-    
-    //    return_text += "<br>" + doclink + *thissection + "." + child + "\">" + info.t + "</a>\n";
-    return_text += "<br>" + doclink + *thissection + "." + child + ".1\">" + info.t + "</a>\n";
+    gdbm.getinfo(section, info);
+    get_first_section(info.contents, child);
+    
+    //    return_text += "<br>" + doclink + *thissection + "." + child + "\">" + info.title + "</a>\n";
+    return_text += "<br>" + doclink + *thissection + "." + child + 
+      ".1\">" + info.title + "</a>\n";
     thissection ++;
   }
@@ -76 +77 @@
     
     // get previous arrow
-    if (gdbm.exists(previous, args["c"])) {
+    if (gdbm.exists(previous)) {
       return_text += "<td><a href=\"_httptext_&d=" + classification + "." + previous;
       return_text += "\">_iconless_</a></td>\n";
@@ -83 +84 @@
     // get page ? of ? text
     return_text += "<td align=\"center\">\n";
-    gdbm.getinfo(booksection, args["c"], info);
-    if (is_number(info.t)) {
+    gdbm.getinfo(booksection, info);
+    if (is_number(info.title)) {
       splitstring(class_string, contents);
-      gdbm.getinfo(contents.back(), args["c"], topinfo);
-      if (is_number(topinfo.t))
-    return_text += "&nbsp;page " + info.t + " of " + topinfo.t + "&nbsp;";
+      gdbm.getinfo(contents.back(), topinfo);
+      if (is_number(topinfo.title))
+    return_text += "&nbsp;page " + info.title + " of " + topinfo.title + "&nbsp;";
       else 
-    return_text += "&nbsp;" + info.t + "&nbsp;";
+    return_text += "&nbsp;" + info.title + "&nbsp;";
     } else {
-      return_text += " " + info.t + " ";
+      return_text += " " + info.title + " ";
     }
     return_text += "</td>\n";
 
     // get next arrow
-    if (gdbm.exists(next, args["c"])) {
+    if (gdbm.exists(next)) {
       return_text += "<td><a href=\"_httptext_&d=" + classification + "." + next;
       return_text += "\">_iconmore_</a></td>\n";
@@ -182 +183 @@
   while (section != end) {
     tab.clear();
-    gdbm.getinfo(*section, args["c"], info);
+    gdbm.getinfo(*section, info);
     text_t icontabs;
 
@@ -188 +189 @@
     icon = "_iconsmalltext_";
     if (is_top_level(*section)) icon = "_iconopenbook_";
-    else if (!info.c.empty()) icon = "_iconopenfolder_";
+    else if (!info.contents.empty()) icon = "_iconopenfolder_";
 
     // set up pointer
@@ -217 +218 @@
       if (args["g"][1] == '0' || is_top_level(*section) ||
       !are_same_chapter(booksection, *section) ||
-      !info.c.empty()) {
+      !info.contents.empty()) {
     return_text += doclink + "d=" + classification;
     return_text += "." + *section + "&a=" + pagetype;
@@ -228 +229 @@
     return_text += "\">" + icon + "</a></td>";
     return_text += "<td colspan=" + text_t(tabsleft);
-    return_text += "><_font_>" + info.t + "</font>";
+    return_text += "><_font_>" + info.title + "</font>";
     return_text += "</td></tr>\n";
     
@@ -256 +257 @@
     if (is_book(*thisparent)) get_book(*thisparent, section);
     else section = *thisparent;
-    gdbm.getinfo(section, args["c"], info);
+    gdbm.getinfo(section, info);
     
     // set up icon for this parent
@@ -289 +290 @@
     return_text += "<td"; 
     if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-    return_text += "><_font_>" + info.t;
-    if (!info.a.empty()) return_text += " by " + info.a;
+    return_text += "><_font_>" + info.title;
+    if (!info.author.empty()) return_text += " by " + info.author;
     return_text += "</font>";
     return_text += "</td></tr>\n";
@@ -320 +321 @@
     if (is_book(*thissibling)) get_book(*thissibling, section);
     else section = *thissibling;
-    gdbm.getinfo(section, args["c"], info);
+    gdbm.getinfo(section, info);
 
     // set up icon for this sibling
@@ -342 +343 @@
     tab += ">" + thesetabs + pointer + "</td>";
     
-    if (info.c.empty()) {
+    if (info.contents.empty()) {
       // sibling is text document
       icon = "_iconsmalltext_";
@@ -362 +363 @@
       return_text += "\">" + icon + "</a></td><td";
       if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-      return_text += "><_font_>" + info.t;
-      if (!info.a.empty()) return_text += " by " + info.a;
+      return_text += "><_font_>" + info.title;
+      if (!info.author.empty()) return_text += " by " + info.author;
       return_text += "</font></td></tr>\n";
     } else {
       // sibling is closed book or folder so clicking 
       // it should open contents
-      get_first_section(info.c, child);
+      get_first_section(info.contents, child);
       
       // get classification of child if it's a book
@@ -393 +394 @@
       return_text += "\">" + icon + "</a></td><td";
       if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-      return_text += "><_font_>" + info.t;
-      if (!info.a.empty()) return_text += " by " + info.a;
+      return_text += "><_font_>" + info.title;
+      if (!info.author.empty()) return_text += " by " + info.author;
       return_text += "</font></td></tr>\n";
     }
@@ -421 +422 @@
   
   // get list of contents for this classification
-  gdbm.getinfo(classt, collection, info);
-  if (!info.c.empty()) {
-    splitstring(info.c, classcontents);
+  gdbm.getinfo(classt, info);
+  if (!info.contents.empty()) {
+    splitstring(info.contents, classcontents);
     vector<text_t>::const_iterator here = classcontents.begin();
     vector<text_t>::const_iterator end = classcontents.end();
 
     while (here != end) {
-      gdbm.getinfo(*here, collection, info);
+      gdbm.getinfo(*here, info);
       
       if (*here == classification) {
-    return_text += "<b>" + info.t + "</b>&nbsp;&nbsp;&nbsp;";
+    return_text += "<b>" + info.title + "</b>&nbsp;&nbsp;&nbsp;";
       } else {
-    if (!info.c.empty()) {
-      get_first_section(info.c, firstcontent);
+    if (!info.contents.empty()) {
+      get_first_section(info.contents, firstcontent);
       return_text += link + *here + "." + firstcontent + "\">";
-      return_text += info.t + "</a>&nbsp;&nbsp;&nbsp;";
+      return_text += info.title + "</a>&nbsp;&nbsp;&nbsp;";
     }
       }
@@ -462 +463 @@
 
   // get html for previous link if it exists
-  gdbm.getinfo(previous, collection, info);
-  if (!info.c.empty()) {
-    get_first_section(info.c, firstcontent);
+  gdbm.getinfo(previous, info);
+  if (!info.contents.empty()) {
+    get_first_section(info.contents, firstcontent);
     arrows += "<a href=\"_httpbrowse_&d=";
     arrows += previous + "." + firstcontent + "\">";
@@ -475 +476 @@
 
   // get html for next link if it exists
-  gdbm.getinfo(next, collection, info);
-  if (!info.c.empty()) {
-    get_first_section(info.c, firstcontent);
+  gdbm.getinfo(next, info);
+  if (!info.contents.empty()) {
+    get_first_section(info.contents, firstcontent);
     arrows += "<a href=\"_httpbrowse_&d=";
     arrows += next + "." + firstcontent + "\">";
@@ -539 +540 @@
     if (cols > totalcols) totalcols = cols;
 
-    gdbm.getinfo(section, collection, info);
-    if (!info.c.empty()) {
+    gdbm.getinfo(section, info);
+    if (!info.contents.empty()) {
       vector<text_t> temp;
-      splitstring(info.c, temp);
+      splitstring(info.contents, temp);
       while (!temp.empty()) {
     sections.push_back(temp.back());
@@ -601 +602 @@
   // don't want 'next' arrow pointing to next sibling if current section
   // has children
-  gdbm.getinfo(booksection, args["c"], info);
-  if (!info.c.empty()) nextsibling = current_classification;
+  gdbm.getinfo(booksection, info);
+  if (!info.contents.empty()) nextsibling = current_classification;
   
   // set up the 'previous' arrow
@@ -615 +616 @@
     while (previoussibling.empty()) {
       vector<text_t> parentsiblings;
-      gdbm.getinfo(sec, args["c"], info); // info on this section
-      text_t last, parent = info.p;
-      gdbm.getinfo(parent, args["c"], info); // info on parent
-      gdbm.getinfo(info.p, args["c"], info); // info on grandparent
-      splitstring(info.c, parentsiblings); // now have parents siblings
+      gdbm.getinfo(sec, info); // info on this section
+      text_t last, parent = info.parent;
+      gdbm.getinfo(parent, info); // info on parent
+      gdbm.getinfo(info.parent, info); // info on grandparent
+      splitstring(info.contents, parentsiblings); // now have parents siblings
       
       vector<text_t>::const_iterator thisuncle = parentsiblings.begin();
@@ -639 +640 @@
     text_t prev; // use this in case previoussibling contains classification
     get_book(previoussibling, prev);
-    gdbm.getinfo(prev, args["c"], info);
-    while (!info.c.empty()) {
+    gdbm.getinfo(prev, info);
+    while (!info.contents.empty()) {
       vector<text_t> contents;
-      splitstring(info.c, contents);
+      splitstring(info.contents, contents);
       previoussibling = contents.back();
-      gdbm.getinfo(previoussibling, args["c"], info);
+      gdbm.getinfo(previoussibling, info);
     }
     
@@ -655 +656 @@
   // if no younger siblings get parents younger siblings
   while (nextsibling.empty()) {
-    gdbm.getinfo(sec, args["c"], info);
-    text_t parent = info.p;
-    gdbm.getinfo(parent, args["c"], info); // parent info
-    if (!info.p.empty()) {
+    gdbm.getinfo(sec, info);
+    text_t parent = info.parent;
+    gdbm.getinfo(parent, info); // parent info
+    if (!info.parent.empty()) {
       vector<text_t> parentsiblings;
-      gdbm.getinfo(info.p, args["c"], info); // grandparent info
-      splitstring(info.c, parentsiblings); // got parents siblings
+      gdbm.getinfo(info.parent, info); // grandparent info
+      splitstring(info.contents, parentsiblings); // got parents siblings
       
       vector<text_t>::iterator thissibling = parentsiblings.begin();
@@ -689 +690 @@
     text_t next;
     get_book(nextsibling, next);
-    gdbm.getinfo(next, args["c"], info);
-    while (!info.c.empty()) {
-      get_first_section(info.c, nextsibling);
-      gdbm.getinfo(nextsibling, args["c"], info);
+    gdbm.getinfo(next, info);
+    while (!info.contents.empty()) {
+      get_first_section(info.contents, nextsibling);
+      gdbm.getinfo(nextsibling, info);
     }
     if (nextsibling[0] == 'B') nextsibling = classification + "." + nextsibling;
@@ -755 +756 @@
     else key = *here;
 
-    gdbm.getinfo(key, collection, info);
+    gdbm.getinfo(key, info);
     if (classification[0] == 'T') {
       
-      alphabetize_string_english(info.t);
-      info.t += ":#:" + *here;
-      tmparray = string_add(tmparray, &len, info.t.getcstr());
+      alphabetize_string_english(info.title);
+      info.title += ":#:" + *here;
+      tmparray = string_add(tmparray, &len, info.title.getcstr());
 
     } else if (classification[0] == 'A') {
-      alphabetize_string_name(info.a);
-      info.a += ":#:" + *here;
-      tmparray = string_add(tmparray, &len, info.a.getcstr());
+      alphabetize_string_name(info.author);
+      info.author += ":#:" + *here;
+      tmparray = string_add(tmparray, &len, info.author.getcstr());
    
     } else {
-      info.i += ":#:" + *here;
-      tmparray = string_add(tmparray, &len, info.i.getcstr());
+      info.date += ":#:" + *here;
+      tmparray = string_add(tmparray, &len, info.date.getcstr());
     }
     here ++;

trunk/gsdl/src/library/cgiwrap.cpp

@@ -90 +90 @@
       if (cfgline.size () >= 2) {
     if (cfgline[0] == "gsdlhome") lib->setgsdlhome(cfgline[1]);
-    else if (cfgline[0] == "macroshome") lib->setmacroshome(cfgline[1]);
-    else if (cfgline[0] == "gdbmhome") lib->setgdbmhome(cfgline[1]);
-    else if (cfgline[0] == "indexhome") lib->setindexhome(cfgline[1]);
+    else if (cfgline[0] == "gdbmdir") lib->setgdbmdir(cfgline[1]);
+    else if (cfgline[0] == "collectdir") lib->setcollectdir(cfgline[1]);
     else if (cfgline[0] == "httpprefix") lib->sethttpprefix(cfgline[1]);
     else if (cfgline[0] == "gwcgi") lib->setgwcgi(cfgline[1]);
@@ -123 +122 @@
 
   // read in the site configuration file
-  // try in the collection directory, then GSDLHOME/etc,
-  // then in GSDLHOME.
+  // try in the collection/etc directory, and then GSDLHOME/etc.
   text_t filename = filename_cat (GSDLHOME, "collect");
   filename = filename_cat (filename, lib->get_collection_name());
+  filename = filename_cat (filename, "etc");
   filename = filename_cat (filename, "site.cfg");
   if (!site_cfg_read (lib, filename, maxrequests)) {
-    filename = filename_cat (GSDLHOME, "etc/site.cfg");
-    if (!site_cfg_read (lib, filename, maxrequests)) {
-      filename = filename_cat (GSDLHOME, "site.cfg");
-      site_cfg_read (lib, filename, maxrequests);
-    }
+    filename = filename_cat (GSDLHOME, "etc");
+    filename = filename_cat (GSDLHOME, "site.cfg");
+    site_cfg_read (lib, filename, maxrequests);
   }
 
   // initialise the library software
-  lib->init();
+  ofstream initout (GSDLHOME "/etc/initout.txt");
+  lib->init(initout);
+  initout.close();
   
   // find out whether this is being run as a cgi-script

trunk/gsdl/src/library/gdbmclass.cpp

@@ -1 +1 @@
 #include "text_t.h"
 #include "gdbmclass.h"
+#include "unitool.h"
+#include "gsdlunicode.h"
+#include "fileutil.h"
 #include <ctype.h>
 #include <string.h>
@@ -36 +39 @@
 
 void gdbm_info::clear () {
-  d = 0;     // docnum
-  t.clear(); // title
-  p.clear(); // parent
-  x.clear(); // classification
-  c.clear(); // contents
-  j.clear(); // jobnumber
-  o.clear(); // OID
-  a.clear(); // author
-  s.clear(); // source
-  i.clear(); // date
-}
-
-// checks if key is present in infodb.
-// returns 1 on success 0 on failure
-int gdbmclass::exists (text_t key, text_t collection) {
-
-  datum key_data;
-  datum return_data;
-
-  // try to open the database if it's not already open
-  if (!open_database(collection)) {
-    if (logout != NULL) (*logout) << "gdbmclass: can't open database\n"; 
-    return 0;
-  }
-  
-  // sanity check
-  if (gdbm_file == NULL) {
-    if (logout != NULL) (*logout) << "gdbmclass: failed sanity check\n";    
-    return 0;
-  }
-
-  char *db_key = key.getcstr();
-
-  if (db_key == NULL) {
-    if (logout != NULL) (*logout) << "gdbmclass: failed sanity check\n";
-    return 0;
-  }
-
-  key_data.dptr = db_key;
-  key_data.dsize = strlen (db_key);
-  return_data = gdbm_fetch (gdbm_file, key_data);
-  delete db_key;
-  db_key = NULL;
-
-  if (return_data.dptr == NULL) {
-    if (logout != NULL) {
-      (*logout) << "gdbmclass: null data pointer\n";
-      outconvertclass text_t2ascii;
-      (*logout) << text_t2ascii << "gdbmclass: key was \"" << key << "\"\n";
-    }
-    return 0;
-  }
-  free (return_data.dptr);
-  return 1;
+  docnum = 0;             // 'd'
+  title.clear();          // 't'
+  parent.clear();         // 'p'
+  classification.clear(); // 'x'
+  contents.clear();       // 'c'
+  jobnum.clear();         // 'j'
+  OID.clear();            // 'o'
+  author.clear();         // 'a'
+  source.clear();         // 's'
+  date.clear();           // 'i'
+}
+
+
+
+
+
+// returns 0 if failed, 1 if opened
+int gdbmclass::opendatabase (const text_t &filename) {
+  text_t data_location;
+  int block_size = 0;
+  
+  if (gdbmfile != NULL) {
+    if (openfile == filename) return 1;
+    else closedatabase ();
+  }
+
+  openfile = filename;
+
+  char *namebuffer = filename.getcstr();
+  gdbmfile = gdbm_open (namebuffer, block_size, GDBM_READER, 00664, NULL);
+  delete namebuffer;
+
+  if (gdbmfile == NULL && logout != NULL) {
+    outconvertclass text_t2ascii;
+    (*logout) << text_t2ascii << "database open failed on: " << filename << "\n";
+  }
+
+  return (gdbmfile != NULL);
+}
+
+
+void gdbmclass::closedatabase () {
+  if (gdbmfile == NULL) return;
+  
+  gdbm_close (gdbmfile);
+  gdbmfile = NULL;
+  openfile.clear();
 }
 
@@ -96 +92 @@
 // key and collection aren't references as they might be aliases to
 // something in info
-int gdbmclass::getinfo (text_t key, text_t collection, gdbm_info &info) {
-
+int gdbmclass::getinfo (text_t key, gdbm_info &info) {
+  text_t data;
+
+  if (!getkeydata (key, data)) return -1;
+  text_t::iterator here = data.begin ();
+  text_t::iterator end = data.end ();
+
+  text_t ikey, ivalue;
   info.clear (); // reset info
-  
+
+  while (getinfoline(here, end, ikey, ivalue)) {
+    if (ikey == "d") { info.docnum = ivalue.getint(); }
+    else if (ikey == "t") { info.title = ivalue; }
+    else if (ikey == "p") { info.parent = ivalue; }
+    else if (ikey == "x") { info.classification = ivalue; }
+    else if (ikey == "c") { info.contents = ivalue; } 
+    else if (ikey == "j") { info.jobnum = ivalue; }
+    else if (ikey == "o") { info.OID = ivalue; } 
+    else if (ikey == "a") { info.author = ivalue; } 
+    else if (ikey == "s") { info.source = ivalue; } 
+    else if (ikey == "i") { info.date = ivalue; }
+  }
+  
+  return 0;
+}
+
+
+// returns 1 if the key exists
+int gdbmclass::exists (text_t key) {
+  text_t data;
+  return getkeydata (key, data);
+}
+
+
+// returns 1 if successful
+int gdbmclass::getkeydata (text_t key, text_t &data) {
   datum key_data;
   datum return_data;
-  char ikey[256];
-  char ivalue[16384];
-  int pos = 0;
-
-  // try to open the database if it's not already open
-  if (!open_database(collection)) {
-    if (logout != NULL) (*logout) << "gdbmclass: can't open database\n"; 
-    return -1;
-  }
-  
-  // sanity check
-  if (gdbm_file == NULL) {
-    if (logout != NULL) (*logout) << "gdbmclass: failed sanity check\n";    
-    return -1;
-  }
-
-  char *db_key = key.getcstr();
-
-  if (db_key == NULL) {
-    if (logout != NULL) (*logout) << "gdbmclass: failed sanity check\n";
-    return -1;
-  }
-
-  key_data.dptr = db_key;
-  key_data.dsize = strlen (db_key);
-  return_data = gdbm_fetch (gdbm_file, key_data);
-  delete db_key;
-  db_key = NULL;
-
-  if (return_data.dptr == NULL) {
-    if (logout != NULL) {
-      (*logout) << "gdbmclass: null data pointer\n";
-      outconvertclass text_t2ascii;
-      (*logout) << text_t2ascii << "gdbmclass: key was \"" << key << "\"\n";
-    }
-    return -1;
-  }
-  
-  while ((pos = get_infoline(return_data.dptr, return_data.dsize, 
-                 pos, ikey, ivalue)) >= 0) {
-
-    if (strcmp (ikey, "d") == 0) {
-      info.d = atoi(ivalue);
-      
-    } else if (strcmp (ikey, "p") == 0) {
-      info.p = ivalue;
-
-    } else if (strcmp (ikey, "t") == 0) {
-      info.t = ivalue;
-      
-    } else if (strcmp (ikey, "x") == 0) {
-      info.x = ivalue;
-      
-    } else if (strcmp (ikey, "c") == 0) {
-      info.c = ivalue;
-      
-    } else if (strcmp (ikey, "j") == 0) {
-      info.j = ivalue;
-
-    } else if (strcmp (ikey, "o") == 0) {
-      info.o = ivalue;
-      
-    } else if (strcmp (ikey, "a") == 0) {
-      info.a = ivalue;
-
-    } else if (strcmp (ikey, "s") == 0) {
-      info.s = ivalue;
-
-    } else if (strcmp (ikey, "i") == 0) {
-      info.i = ivalue;
-    }
-  }
-  
+
+  if (gdbmfile == NULL) return 0;
+
+  // get a utf-8 encoded c string of the unicode key
+  key_data.dptr = (to_utf8(key)).getcstr();
+  if (key_data.dptr == NULL) {
+    if (logout != NULL) (*logout) << "gdbmclass: out of memory\n";
+    return 0;
+  }
+  key_data.dsize = strlen (key_data.dptr);
+
+  // fetch the result
+  return_data = gdbm_fetch (gdbmfile, key_data);
+  delete key_data.dptr;
+
+  if (return_data.dptr == NULL) return 0;
+
+  data.setcarr (return_data.dptr, return_data.dsize);
   free (return_data.dptr);
-  
-  return 0;
-}
-
-void gdbmclass::setgdbmhome (const text_t &thegdbmhome)
-{
-  gdbmhome = thegdbmhome;
-}
+  data = to_uni(data);  // convert to unicode
+
+  return 1;
+}
+
 
 // parses a line of the form <key>value\n
-// returns next position, -1 if there was nothing left to process
-// in the string, -2 if there was an error
-int gdbmclass::get_infoline (char *str, int len, int pos, char *key, char *value) {
-  int keylen = 0;
-  int valuelen = 0;
-  
-  key[0] = '\0';
-  value[0] = '\0';
-  
+// returns 1 if successful
+int gdbmclass::getinfoline (text_t::iterator &here, text_t::iterator end, 
+                text_t &key, text_t &value) {
+  key.clear();
+  value.clear();
+
   // ignore white space
-  while (pos < len && isspace(str[pos])) pos++;
-  
+  while (here != end && is_unicode_space (*here)) here++;
+
   // get the '<'
-  if (pos >= len) return -1;
-  if (str[pos] != '<') return -2;
-  pos++;
+  if (here == end || *here != '<') return 0;
+  here++;
   
   // get the key
-  while (pos < len && str[pos] != '>')
-    key[keylen++] = str[pos++];
-  
-  key[keylen] = '\0';
+  while (here != end && *here != '>') {
+    key.push_back(*here);
+    here++;
+  }
   
   // get the '>'
-  if (pos >= len || str[pos] != '>') return -2;
-  pos++;
+  if (here == end || *here != '>') return 0;
+  here++;
   
   // get the value
-  while (pos < len && str[pos] != '\n') 
-    value[valuelen++] = str[pos++];
-  
-  value[valuelen] = '\0';
-  
-  return pos; 
-}
-
-
-// returns 0 if failed, 1 if opened
-int gdbmclass::open_database (const text_t &collection) {
-  text_t data_location, text_dir;
-  int block_size = 0;
-  
-  if (gdbm_file != NULL) {
-    if (collection != gdbm_open_name) {
-      close_database();
-    }
-  }
-  if (gdbm_file == NULL) {
-    gdbm_open_name = collection;
-    gettextsuffix (collection, text_dir);
-
-#ifdef __WIN32__
-    data_location = gdbmhome + text_dir;
-#else
-    data_location = gdbmhome + text_dir;
-#endif
-        
-#ifdef _LITTLE_ENDIAN
-    data_location += ".ldb"; // little endian version of the gdbm database
-#else
-    data_location += ".bdb"; // big endian version on the gdbm database
-#endif
-    char *namebuffer = data_location.getcstr(); 
-    //    cerr << "database name: " << namebuffer << "\n";
-
-    gdbm_file = gdbm_open (namebuffer, block_size, GDBM_READER, 00664, NULL);
-    delete namebuffer;
-  }
-  return (gdbm_file != NULL);
-}
-
-
-void gdbmclass::close_database () {
-  
-  if (gdbm_file == NULL) return;
-  
-  gdbm_close (gdbm_file);
-  gdbm_file = NULL;
-}
+  while (here != end && *here != '\n') {
+    value.push_back(*here);
+    here++;
+  }
+
+  return 1;
+}
+
+
 
 
@@ -420 +344 @@
     vector<text_t> classarray;
     get_book_top (targetdoc, book_top);
-    gdbm.getinfo(book_top, collection, info);
-    splitstring (info.x, classarray);
+    gdbm.getinfo(book_top, info);
+    splitstring (info.classification, classarray);
     if (!classarray.empty()) classification = classarray[0];
     else classification = "C.1";
@@ -513 +437 @@
   } else if (booksection.empty()) {
     // get classification siblings
-    gdbm.getinfo(classification, collection, info);
-    gdbm.getinfo(info.p, collection, info); // info is now parent info
-    splitstring(info.c, siblings);
+    gdbm.getinfo(classification, info);
+    gdbm.getinfo(info.parent, info); // info is now parent info
+    splitstring(info.contents, siblings);
     return;
 
@@ -522 +446 @@
     if (is_top_level(booksection)) {
       // top level of book so siblings are children of classification
-      gdbm.getinfo(classification, collection, info);
-      splitstring(info.c, siblings);
+      gdbm.getinfo(classification, info);
+      splitstring(info.contents, siblings);
 
       // add classifications to book sections
@@ -532 +456 @@
     } else {
       // siblings come from immediate parent
-      gdbm.getinfo(booksection, collection, info);
-      gdbm.getinfo(info.p, collection, info); // info is now parent info
-      splitstring(info.c, siblings);
+      gdbm.getinfo(booksection, info);
+      gdbm.getinfo(info.parent, info); // info is now parent info
+      splitstring(info.contents, siblings);
 
       // add classifications to book sections

trunk/gsdl/src/library/gdbmclass.h

@@ -12 +12 @@
 #endif
 
-#include "locateinfo.h"
 
-
-class gdbm_info 
-{
+class gdbm_info {
 public:
-  int docnum;
-  int d;
-  text_t t;
-  text_t p;
-  text_t x;
-  text_t c;
-  text_t j;
-  text_t o;
-  text_t a;
-  text_t s;
-  text_t i;
+  int docnum;            // 'd'
+  text_t title;          // 't'
+  text_t parent;         // 'p'
+  text_t classification; // 'x'
+  text_t contents;       // 'c'
+  text_t jobnum;         // 'j'
+  text_t OID;            // 'o'
+  text_t author;         // 'a'
+  text_t source;         // 's'
+  text_t date;           // 'i'
 
   void clear ();
@@ -34 +30 @@
 
 
-class gdbmclass 
-{
+class gdbmclass {
 public:
-  gdbmclass() {gdbm_file = NULL; logout = &cerr;};
+  gdbmclass() {gdbmfile = NULL; logout = &cerr;};
   ~gdbmclass() {};
   
+  // returns 0 if failed, 1 if opened
+  int opendatabase (const text_t &filename);
+  void closedatabase ();
+
   // returns 0 on success, -1 on failure
-  int getinfo (text_t key, text_t collection, gdbm_info &info);
-  void setgdbmhome (const text_t &thegdbmhome);
+  int getinfo (text_t key, gdbm_info &info);
   void setlogout (ostream *thelogout) {logout = thelogout;}
-  int exists (text_t key, text_t collection);
+  int exists (text_t key);
 
 protected:
-  text_t gdbmhome; // top level directory for gdbm files
-  GDBM_FILE gdbm_file;
-  text_t gdbm_open_name;
+  text_t openfile;
+  GDBM_FILE gdbmfile;
   ostream *logout;
   
-  int open_database (const text_t &collection);
-  void close_database ();
-  
-  int get_infoline (char *str, int len, int pos, char *key, char *value);
+  int getkeydata (text_t key, text_t &data);
+  int getinfoline (text_t::iterator &here, text_t::iterator end, 
+           text_t &key, text_t &value);
 };
 

trunk/gsdl/src/library/libinterface.cpp

@@ -6 +6 @@
 #include "libinterface.h"
 #include "cgiargs.h"
+#include "fileutil.h"
+#include "cfgread.h"
 
 #include <assert.h>
@@ -142 +144 @@
 // constructor
 
-libinterface::libinterface() 
-{
+libinterface::libinterface() {
   browse = NULL;
 }
 
-void libinterface::setgsdlhome (const text_t &thegsdlhome)
-{
+void libinterface::setgsdlhome (const text_t &thegsdlhome) {
+  text_t thecollectdir, thegdbmdir, filename;
+
   gsdlhome = thegsdlhome;
-  setmacroshome (thegsdlhome);
-  setgdbmhome (thegsdlhome);
-  setindexhome (thegsdlhome);
-}
-
-void libinterface::setmacroshome (const text_t &themacroshome)
-{
-  macroshome = themacroshome;
-}
-
-void libinterface::setgdbmhome (const text_t &thegdbmhome)
-{
-  gdbmhome = thegdbmhome;
-  gdbm.setgdbmhome(gdbmhome);
-}
-
-void libinterface::setindexhome (const text_t &theindexhome)
-{
-  indexhome = theindexhome;
-  search.setindexhome(theindexhome);
-}
-
-void libinterface::sethttpprefix (const text_t &thehttpprefix)
-{
+
+  // search for etc/collect.cfg
+  thecollectdir = filename_cat (gsdlhome, "collect");
+  thecollectdir = filename_cat (thecollectdir, get_collection_name());
+  filename = filename_cat (thecollectdir, "etc");
+  filename = filename_cat (filename, "config.cfg");
+  if (!file_exists(filename)) thecollectdir = gsdlhome;
+
+  thegdbmdir = filename_cat (thecollectdir, "index");
+  thegdbmdir = filename_cat (thegdbmdir, "text");
+
+  setcollectdir (thecollectdir);
+  setgdbmdir (thegdbmdir);
+}
+
+void libinterface::setcollectdir (const text_t &thecollectdir) {
+  collectdir = thecollectdir;
+
+  search.setcollectdir (collectdir);
+}
+
+void libinterface::setgdbmdir (const text_t &thegdbmdir) {
+  gdbmdir = thegdbmdir;
+}
+
+void libinterface::sethttpprefix (const text_t &thehttpprefix) {
   httpprefix = thehttpprefix;
 }
 
-void libinterface::setgwcgi (const text_t &thegwcgi)
-{
+void libinterface::setgwcgi (const text_t &thegwcgi) {
   gwcgi = thegwcgi;
 }
+
+
+int libinterface::cfg_read (const text_t &filename) {
+  text_t key;
+  text_tarray cfgline;
+  char *cstr = filename.getcstr();
+  ifstream confin (cstr);
+  delete cstr;
+
+  if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+    key = cfgline[0];
+    cfgline.erase(cfgline.begin());
+    if (key == "maintainer")        cfg_info.maintainer = cfgline[0];
+    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 == "numbytes")     cfg_info.numbytes = (double)cfgline[0].getint();
+    else if (key == "numdocs")      cfg_info.numdocs = (double)cfgline[0].getint();
+      }
+    }
+    confin.close ();
+    return 1;
+  }
+  return 0;
+}
+
 
 // init should be called after the various homes are set,
 // it returns 'false' on failure and 'true' on success
-bool libinterface::init ()
-{
+bool libinterface::init (ostream &logout) {
+  text_t collection = get_collection_name();
+
+  // redirect the error output to logout
+  disp.setlogout (&logout);
+  gdbm.setlogout (&logout);
+
+  // open the gdbm file
+  text_t filename = filename_cat (gdbmdir, get_collection_name ());
+#ifdef _LITTLE_ENDIAN
+  filename += ".ldb"; // little endian version of the gdbm database
+#else
+  filename += ".bdb"; // big endian version on the gdbm database
+#endif
+  gdbm.opendatabase (filename);
+
+  // read in the configuration files etc/collect.cfg and index/build.cfg
+  // entries in build.cfg should override those in collect.cfg
+  filename = filename_cat (collectdir, "etc");
+  filename = filename_cat (filename, "collect.cfg");
+  cfg_read(filename);
+  filename = filename_cat (collectdir, "index");
+  filename = filename_cat (filename, "build.cfg");
+  cfg_read(filename);
+
+  //  logout << text_t2ascii << "defaultindex: " << cfg_info.defaultindex << "\n";
+
   set_default_index();
-  text_t collection = get_collection_name();
-
-  // load up default macro files -- these shouldn't have absolute file names
-#ifdef __WIN32__
-  disp.loaddefaultmacros(macroshome + "\\macros\\base.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\browse.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\text.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\query.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\help.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\gsdl.dm");
-  disp.loaddefaultmacros(macroshome + "\\macros\\pref.dm");
-#else
-  disp.loaddefaultmacros(macroshome + "/macros/base.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/browse.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/text.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/query.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/help.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/gsdl.dm");
-  disp.loaddefaultmacros(macroshome + "/macros/pref.dm");
-#endif
+
+
+  // load up the default macro files, the collection directory
+  // is searched first for the file and then the main directory
+  text_t colmacrodir = filename_cat (collectdir, "macros");
+  text_t gsdlmacrodir = filename_cat (gsdlhome, "macros");
+  text_tarray::iterator arrhere = cfg_info.macrofiles.begin();
+  text_tarray::iterator arrend = cfg_info.macrofiles.end();
+  while (arrhere != arrend) {
+    filename = filename_cat (colmacrodir, *arrhere);
+    if (!file_exists (filename)) {
+      filename = filename_cat (gsdlmacrodir, *arrhere);
+    }
+    disp.loaddefaultmacros(filename);
+    arrhere++;
+  }
 
   srand(time(NULL));
@@ -222 +276 @@
   int err = LI_NOERROR;
 
-  gdbm.setlogout (&logout); // make the output go where they want!
+  // make the output go where they want!
+  gdbm.setlogout (&logout);
+  disp.setlogout (&logout);
 
   cgiargsclass args;
@@ -725 +781 @@
     if (args["d"][0] != 'B') get_book(args["d"], docref);
     else docref = args["d"];
-    if (gdbm.getinfo(docref, queryparams.collection, info) != 0) {
+    if (gdbm.getinfo(docref, info) != 0) {
       logout << text_t2ascii << "info_db wasn't opened - " << docref << "\n";
       return;
@@ -731 +787 @@
     
     // get document text if there is any
-    if (info.c.empty()) {
+    if (info.contents.empty()) {
         search.docTargetDocument(default_index, queryparams.collection,
-                 info.d, content);
-    if (info.t != "<i>(introductory text)</i>")
-      content = "<h3>" + info.t + "</h3>\n" + content;
+                 info.docnum, content);
+    if (info.title != "<i>(introductory text)</i>")
+      content = "<h3>" + info.title + "</h3>\n" + content;
     }
   } 
@@ -761 +817 @@
 
       // get docnum from gdbm
-      if (gdbm.getinfo(*thiscontent, queryparams.collection, info) != 0) { 
+      if (gdbm.getinfo(*thiscontent, info) != 0) { 
     logout << text_t2ascii << "info_db wasn't opened - " << args["d"] << "\n";
     return;
@@ -767 +823 @@
 
       // if section has text get it, otherwise output section title
-      if (info.c.empty()) {
+      if (info.contents.empty()) {
 
     // output <a name= > tags for all text sections currently displayed in toc (all text sections
@@ -779 +835 @@
 
     search.docTargetDocument(default_index, queryparams.collection,
-                 info.d, text);                 
-    if (info.t != "<i>(introductory text)</i>") 
-      content += "<h3>" + info.t + "</h3>\n";
+                 info.docnum, text);                    
+    if (info.title != "<i>(introductory text)</i>") 
+      content += "<h3>" + info.title + "</h3>\n";
     //  content += text + "<hr><br>\n";
     content += text + "<p>\n"; // no longer want <hr> between sections
       } else {
-    content += "<h3>" + info.t + "</h3>\n";
+    content += "<h3>" + info.title + "</h3>\n";
       }
 
@@ -820 +876 @@
       if (args["d"][0] != 'B') get_book(args["d"], docref);
       else docref = args["d"];
-      if (gdbm.getinfo(docref, queryparams.collection, info) != 0) {
+      if (gdbm.getinfo(docref, info) != 0) {
         logout << text_t2ascii << "info_db wasn't opened - " << docref << "\n";
         return;
@@ -826 +882 @@
     
       // get document text if there is any
-      if (info.c.empty()) {
+      if (info.contents.empty()) {
         search.docTargetDocument(default_index, queryparams.collection,
-                                 info.d, content);
-    if (info.t != "<i>(introductory text)</i>")
-      content = "<h3>" + info.t + "</h3>\n" + content;
+                                 info.docnum, content);
+    if (info.title != "<i>(introductory text)</i>")
+      content = "<h3>" + info.title + "</h3>\n" + content;
       }
     }

trunk/gsdl/src/library/libinterface.h

@@ -30 +30 @@
 
 
+class cfg_info_t {
+public:
+  cfg_info_t () {numbytes=0.0; numdocs=0.0;};
 
-class libinterface
-{
+  text_t      maintainer;
+  text_tarray indexes;
+  text_t      defaultindex;
+  text_tarray macrofiles;
+  text_t      builddate;
+  text_tarray indexmap;
+  double      numbytes;
+  double      numdocs;
+};
+
+
+class libinterface {
 public:
   libinterface ();
   virtual ~libinterface() {}
 
-  // setgsdlhome will set the macros, gdbm, index, and text homes
+  // setgsdlhome will search for etc/collect.cfg and 
+  // set collectdir and gdbmdir
   void setgsdlhome (const text_t &thegsdlhome);
 
-  void setmacroshome (const text_t &themacroshome);
-  void setgdbmhome (const text_t &thegdbmhome);
-  void setindexhome (const text_t &theindexhome);
+  // collectdir contains etc/collect.cfg, archives,
+  // index, and maybe a macros directory
+  void setcollectdir (const text_t &thecollectdir);
+  void setgdbmdir (const text_t &thegdbmdir);
 
   void sethttpprefix (const text_t &thehttpprefix);
@@ -49 +64 @@
   // init should be called after the various homes are set,
   // it returns 'false' on failure and 'true' on success
-  bool init ();
+  bool init (ostream &logout);
   
   // examine the cgi arguments and create the appropriate page, 
@@ -65 +80 @@
 
 protected:
+  cfg_info_t cfg_info;
+
   text_t gsdlhome;
-  text_t macroshome;
-  text_t gdbmhome;
-  text_t indexhome;
+  text_t gdbmdir;
+  text_t collectdir;
 
   text_t books;
@@ -94 +110 @@
   mgsearchclass search;
   
+  int cfg_read (const text_t &filename);
+
   virtual void get_arg_config (text_t &argconfigstr);
   text_t::iterator get_next_config_arg (text_t::iterator first, text_t::iterator last,
@@ -129 +147 @@
   virtual void highlighttext(vector<text_t> &termvars, ostream &textout, 
                  ostream &logout, text_t &text);
-  void libinterface::format_querystring (text_t &querystring);
+  void format_querystring (text_t &querystring);
 
 
@@ -139 +157 @@
   virtual void displaydocsummary (cgiargsclass &args, ostream &textout,
                                   ostream &logout, queryresultsclass &queryresults,
-                                  int resultnum) {}
+                  int resultnum) {}
 
 

trunk/gsdl/src/library/locateinfo.cpp

@@ -1 +1 @@
 #include "locateinfo.h"
+#include "fileutil.h"
 
-void getindexsuffix (const text_t &index,
-             const text_t &collection,
-             text_t &ttidxsuffix)
-{
-
-  // new directory structure
-  //  ttidxsuffix = "collect";
-
-  //#ifdef __WIN32__
-  //ttidxsuffix += "\\";
-  //#else
-  //ttidxsuffix += "/";
-  //#endif
-
-  //ttidxsuffix += collection;
-
-
-#ifdef __WIN32__
-  ttidxsuffix += "\\index\\";
-#else
-  ttidxsuffix += "/index/";
-#endif
-
-//           ttidxsuffix += collection; //this changed with new build software
-  ttidxsuffix += index;
-#ifdef __WIN32__
-  ttidxsuffix += "\\";
-#else
-  ttidxsuffix += "/";
-#endif
-  ttidxsuffix += collection;
+text_t getindexsuffix (const text_t &collection, 
+               const text_t &index) {
+  text_t indexsuffix = "index";
+  indexsuffix = filename_cat (indexsuffix, index);
+  indexsuffix = filename_cat (indexsuffix, collection);
+  return indexsuffix;
 }
 
-void gettextsuffix (const text_t &collection, 
-            text_t &tttxtsuffix)
-{
-  // new directory structure
-  //  tttxtsuffix = "collect";
-
-  //#ifdef __WIN32__
-  //tttxtsuffix += "\\";
-  //#else
-  //tttxtsuffix += "/";
-  //#endif
-
-  //tttxtsuffix += collection;
-
-#ifdef __WIN32__
-  tttxtsuffix += "\\index\\";
-#else
-  tttxtsuffix += "/index/";
-#endif
-
-//                tttxtsuffix += collection; // path changed with new building software - Stefan.
-  tttxtsuffix += "text";
-#ifdef __WIN32__
-  tttxtsuffix += "\\";
-#else
-  tttxtsuffix += "/";
-#endif
-  tttxtsuffix += collection;
+text_t gettextsuffix (const text_t &collection) {
+  text_t textsuffix = "index";
+  textsuffix = filename_cat (textsuffix, "text");
+  textsuffix = filename_cat (textsuffix, collection);
+  return textsuffix;
 }

trunk/gsdl/src/library/locateinfo.h

@@ -4 +4 @@
 #include "text_t.h"
 
-void getindexsuffix (const text_t &index,
-             const text_t &collection,
-             text_t &ttidxsuffix);
+text_t getindexsuffix (const text_t &collection, 
+               const text_t &index);
 
-void gettextsuffix (const text_t &collection, 
-            text_t &tttxtsuffix);
+text_t gettextsuffix (const text_t &collection);
 
 #endif

trunk/gsdl/src/library/mgsearch.cpp

@@ -27 +27 @@
 #include "mgsearch.h"
 #include "locateinfo.h"
+#include "gsdlunicode.h"
+#include "unitool.h"
+
 
 /////////////
@@ -82 +85 @@
           float Weight, void *info) {
 
+  // convert term from utf8 to unicode
+  text_t term;
+  utf8inconvertclass inconvert;
+  convertclass::status_t status;
+  inconvert.reset ();
+  inconvert.setinput (Word, ULen);
+  inconvert.convert (term, status);
+
   queryresultsclass *queryresults = (queryresultsclass *)info;
-  queryresults->termvariants.push_back(Word);
+  queryresults->termvariants.push_back(term);
 
   return 0;
@@ -93 +104 @@
   text_t *output = (text_t *)info;
   if (output == NULL) return 0;
-
-  output->setcarr(Word, ULen);
+  output->clear();
+
+  utf8inconvertclass inconvert;
+  convertclass::status_t status;
+  inconvert.reset ();
+  inconvert.setinput (Word, ULen);
+  inconvert.convert (*output, status);
   
   // replace all control-Cs with spaces
   text_t::iterator here = output->begin();
   text_t::iterator end = output->end();
-  while (here != end)
-    {
-      if (*here == '\x3') *here = ' ';
-      here++;
-    }
+  while (here != end) {
+    if (*here == '\x3') *here = ' ';
+    here++;
+  }
   
   return 0;
@@ -129 +144 @@
 
 
-void mgsearchclass::setindexhome (const text_t &theindexhome)
-{
-  indexhome = theindexhome;
+void mgsearchclass::setcollectdir (const text_t &thecollectdir)
+{
+  collectdir = thecollectdir;
 }
 
 
 bool mgsearchclass::search(const queryparamclass &queryparams, 
-              queryresultsclass &queryresults)
+               queryresultsclass &queryresults)
 {
   bool databaseloaded = true;
@@ -146 +161 @@
   // first check the cache
   if (cache->find(queryparams, queryresults))
-    {
-      return true;
-    }
+    return true;
 
   // make sure there is a query to be processed
@@ -154 +167 @@
   text_t::const_iterator queryend = queryparams.querystring.end();
   while (queryhere != queryend) {
-    if (((*queryhere >= 65) && (*queryhere <= 90)) ||
-      ((*queryhere >= 97) && (*queryhere <= 122)) ||
-      ((*queryhere >= 192) && (*queryhere <= 214)) ||
-      ((*queryhere >= 216) && (*queryhere <= 246)) ||
-      ((*queryhere >= 248) && (*queryhere <= 255)) ||
-      ((*queryhere >= '0') && (*queryhere <= '9'))) break;
+    if (is_unicode_letdig (*queryhere)) break;
     queryhere++;
   }
@@ -169 +177 @@
 
 
-
   // get the names of the index and text suffixes
-  text_t ttidxsuffix, tttxtsuffix;
-  getindexsuffix (queryparams.search_index, 
-          queryparams.collection, ttidxsuffix);
-  gettextsuffix (queryparams.collection, tttxtsuffix);
-  char *idxsuffix = ttidxsuffix.getcstr(); assert (idxsuffix != NULL);
-  char *txtsuffix = tttxtsuffix.getcstr(); assert (txtsuffix != NULL);
+  char *idxsuffix = (getindexsuffix (queryparams.collection, 
+                     queryparams.search_index)).getcstr();
+  assert (idxsuffix != NULL);
+  char *txtsuffix = (gettextsuffix (queryparams.collection)).getcstr();
+  assert (txtsuffix != NULL);
 
 #ifdef __WIN32__
-  char *cindexhome = (indexhome+"\\").getcstr(); assert (cindexhome != NULL);
+  char *ccollectdir = (collectdir+"\\").getcstr(); assert (ccollectdir != NULL);
 #else
-  char *cindexhome = indexhome.getcstr(); assert (cindexhome != NULL);
+  char *ccollectdir = collectdir.getcstr(); assert (ccollectdir != NULL);
 #endif
 
-  if (load_database(cindexhome, idxsuffix, txtsuffix))
+  if (load_database(ccollectdir, idxsuffix, txtsuffix))
     {
       setsearchmode (queryparams);
@@ -195 +201 @@
   delete idxsuffix;
   delete txtsuffix;
-  delete cindexhome;
+  delete ccollectdir;
 
   return databaseloaded;
@@ -348 +354 @@
 // defaultindex is needed to load one
 bool mgsearchclass::docTargetDocument(const text_t &defaultindex, 
-                 const text_t &collection,
-                 int docnum,
-                 text_t &output)
+                      const text_t &collection,
+                      int docnum,
+                      text_t &output)
 {
   bool databaseloaded = true;
@@ -423 +429 @@
     {
       // get the names of the index and text suffixes
-      text_t ttidxsuffix, tttxtsuffix;
-      getindexsuffix (defaultindex, collection, ttidxsuffix);
-      gettextsuffix (collection, tttxtsuffix);
-      char *idxsuffix = ttidxsuffix.getcstr(); assert (idxsuffix != NULL);
-      char *txtsuffix = tttxtsuffix.getcstr(); assert (txtsuffix != NULL);
+      char *idxsuffix = (getindexsuffix (collection, 
+                     defaultindex)).getcstr();
+      assert (idxsuffix != NULL);
+      char *txtsuffix = (gettextsuffix (collection)).getcstr();
+      assert (txtsuffix != NULL);
 
 #ifdef __WIN32__
-      char *cindexhome = (indexhome+"\\").getcstr(); assert (cindexhome != NULL);
+      char *ccollectdir = (collectdir+"\\").getcstr(); assert (ccollectdir != NULL);
 #else
-      char *cindexhome = indexhome.getcstr(); assert (cindexhome != NULL);
+      char *ccollectdir = collectdir.getcstr(); assert (ccollectdir != NULL);
 #endif
       
-
-      if (load_database(cindexhome, idxsuffix, txtsuffix))
-    {
-      databaseloaded = true;
-    }
+      if (load_database(ccollectdir, idxsuffix, txtsuffix))
+    databaseloaded = true;
       else 
-    {
-      databaseloaded = false;
-    }
-      
+    databaseloaded = false;
+      
       // free up the c strings
       delete idxsuffix;
       delete txtsuffix;
-      delete cindexhome;
+      delete ccollectdir;
     }
   

trunk/gsdl/src/library/mgsearch.h

@@ -18 +18 @@
   // the index directory must be set before any searching
   // is done
-  void setindexhome (const text_t &theindexhome);
+  void setcollectdir (const text_t &thecollectdir);
   
   // the search results are returned in queryresults
@@ -38 +38 @@
 protected:
   querycache *cache;
-  text_t indexhome; // top level directory for indexes
+  text_t collectdir; // the collection directory
 
   void setsearchmode (const queryparamclass &queryparams);