Changeset 93 for trunk/gsdl/src/library

Timestamp:

1998-12-31T22:18:58+13:00 (26 years ago)

Author:

rjmcnab

Message:

Wrote an output and input converter for GBK. Added an option to collect.cfg
to specify which converter should be the default for a given collection.

Location:

trunk/gsdl/src/library

Files:

• libinterface.cpp (modified) (9 diffs)
• libinterface.h (modified) (3 diffs)

trunk/gsdl/src/library/libinterface.cpp

@@ -11 +11 @@
 
 #include <assert.h>
+
+
+
 
 ///////////////////////
@@ -147 +150 @@
 libinterface::libinterface() {
   browse = NULL;
+  gbinconvert = NULL;
+  gboutconvert = NULL;
 }
 
@@ -158 +163 @@
   thecollectdir = filename_cat (thecollectdir, get_collection_name());
   filename = filename_cat (thecollectdir, "etc");
-  filename = filename_cat (filename, "config.cfg");
+  filename = filename_cat (filename, "collect.cfg");
+
   if (!file_exists(filename)) thecollectdir = gsdlhome;
 
@@ -207 +213 @@
     else if (key == "numbytes")     cfg_info.numbytes = (double)cfgline[0].getint();
     else if (key == "numdocs")      cfg_info.numdocs = (double)cfgline[0].getint();
+    else if (key == "defaultencoding") 
+      cfg_info.defaultencoding = cfgline[0];
       }
     }
@@ -233 +241 @@
 #endif
   gdbm.opendatabase (filename);
+
+
+  // set default values for the configuration file
+  cfg_info.defaultencoding = "w";
 
   // read in the configuration files etc/collect.cfg and index/build.cfg
@@ -265 +277 @@
   srand(time(NULL));
 
+  gbinconvert = new gbinconvertclass (gsdlhome);
+
+  utf8outconvert.set_rzws(1);
+  gboutconvert = new gboutconvertclass (gsdlhome);
+  if (gboutconvert != NULL) gboutconvert->set_rzws(1);
+
   return collection_init(collection);
 }
@@ -295 +313 @@
   outconvertclass *outconvert = NULL;
   if (arg_n == "8") {
-    outconvert = new utf8outconvertclass();
-    ((utf8outconvertclass *)outconvert)->set_rzws(1); // remove zer-width spaces
-  }
-  else outconvert = new outconvertclass; // default
+    outconvert = &utf8outconvert;
+  } else if (arg_n == "g" && gboutconvert != NULL) {
+    outconvert = gboutconvert;
+  }
+  else outconvert = &asciioutconvert; // default
 
   if (outconvert == NULL) return err;
@@ -327 +346 @@
   argconfigstr = 
     "+a[p]"    // action: q=query, b=browse, t=targetdoc, p=page, a1=auxiliary
-    "n[w]"     // encoding: w=western, 8=utf8, 7=utf7, g=GB2312, k=GBK
+    "n[]"     // encoding: w=western, 8=utf8, 7=utf7, g=GB2312, k=GBK
     "t[1]"     // query type: 0=boolean, 1=ranked
     "i[c]"     // index: c=chapter, p=paragraph, t=title, b=book
@@ -459 +478 @@
 void libinterface::check_args (cgiargsclass &args)
 {
-  text_t collection = get_collection_name();
-  args.setarg("c", collection);
+  args.setarg("c", get_collection_name());
+  if (args["n"].empty()) args.setarg("n", cfg_info.defaultencoding);
 }
 

trunk/gsdl/src/library/libinterface.h

@@ -7 +7 @@
 #include "display.h"
 #include "gdbmclass.h"
+#include "gsdlunicode.h"
 
 #ifdef __GNUG__
@@ -42 +43 @@
   double      numbytes;
   double      numdocs;
+  text_t      defaultencoding;
 };
 
@@ -105 +107 @@
   outconvertclass logconvert;
   displayclass disp;
+
+  inconvertclass asciiinconvert;
+  utf8inconvertclass utf8inconvert;
+  gbinconvertclass *gbinconvert;
+  outconvertclass asciioutconvert;
+  utf8outconvertclass utf8outconvert;
+  gboutconvertclass *gboutconvert;