Changeset 957

Timestamp:

2000-02-22T10:45:08+13:00 (24 years ago)

Author:

sjboddie

Message:

gsdlhome now set from gsdlsite.cfg

File:

• trunk/cstr/src/recpt/cstrlibrarymain.cpp (modified) (4 diffs)

trunk/cstr/src/recpt/cstrlibrarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.3  2000/02/21 21:45:08  sjboddie
+   gsdlhome now set from gsdlsite.cfg
+
    Revision 1.2  2000/02/06 21:25:22  sjboddie
    updated cstr
@@ -67 +70 @@
 #include "htmlbrowserclass.h"
 
-#include "gsdlhome.h"
-
+#include "recptconfig.h"
 
 int main () {
@@ -77 +79 @@
   text_tarray collections;
   collections.push_back ("cstr");
+
+  // get gsdlhome (if we fail the error will be picked up later -- in
+  // cgiwrapper)
+  text_t gsdlhome;
+  site_cfg_read (gsdlhome);
 
   text_tarray::const_iterator thiscol = collections.begin();
@@ -127 +134 @@
   recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
 
-  mapinconvertclass gbinconvert;
-  gbinconvert.setmapfile (GSDL_GSDLHOME, "gbku", 0x25a1);
-  mapoutconvertclass gboutconvert;
-  gboutconvert.setmapfile (GSDL_GSDLHOME, "ugbk", 0xa1f5);
-  recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  if (!gsdlhome.empty()) {
+    mapinconvertclass gbinconvert;
+    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
+    mapoutconvertclass gboutconvert;
+    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
+    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  }
 
   // the list of actions. Note: these actions will become invalid