Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/librarymain.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/librarymain.cpp (modified) (7 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.24.4.1  2000/07/12 22:21:41  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.28  2000/07/05 21:49:32  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
+   Revision 1.27  2000/06/23 03:21:39  sjboddie
+   Created converter classes for simple 8 bit encodings that use a
+   simple textual map file. Instances of these classes are used to handle
+   the Windows 1256 (Arabic) encoding.
+
+   Revision 1.26  2000/05/29 03:30:03  sjboddie
+   fixed a bug preventing GB encoded text from being displayed correctly
+   (bug showed up in Chinese collection)
+
+   Revision 1.25  2000/04/14 02:52:05  sjboddie
+   tidied up error messaging and set up some debugging info to be output
+   when running library from command line
+
    Revision 1.24  2000/02/29 20:59:02  sjboddie
    added error message when unable to read from collect directory - should
@@ -132 +152 @@
 #include "authenaction.h"
 #include "usersaction.h"
-#include "authenaction.h"
 #include "extlinkaction.h"
 #include "buildaction.h"
@@ -152 +171 @@
   text_tarray collections;
 
-  // get gsdlhome (if we fail the error will be picked up later -- in
-  // cgiwrapper)
+  // get gsdlhome
   text_t gsdlhome;
-  if (site_cfg_read (gsdlhome)) {
-    text_t collectdir = filename_cat (gsdlhome, "collect");
-    if (!read_dir (collectdir, collections)) {
-      cerr << "couldn't read collect directory - make sure gsdlhome field is correct in gsdlsite.cfg\n";
-      exit (1);
-    }
-  }
+  site_cfg_read (gsdlhome);
+  text_t collectdir = filename_cat (gsdlhome, "collect");
+  read_dir (collectdir, collections);
 
   text_tarray::const_iterator thiscol = collections.begin();
@@ -202 +216 @@
     // collection name
     cserver->configure ("collection", *thiscol);
-    
+  
+    // configure receptionist's collectinfo structure 
+    text_tarray colinfo;
+    colinfo.push_back (*thiscol);
+    colinfo.push_back (gsdlhome);
+    colinfo.push_back (gsdlhome);
+    recpt.configure ("collectinfo", colinfo);
+  
     nproto.add_collectserver (cserver);
     thiscol ++;
@@ -215 +236 @@
   recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
 
-  if (!gsdlhome.empty()) {
-    mapinconvertclass gbinconvert;
-    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
-    mapoutconvertclass gboutconvert;
-    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
-    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
-  }
+  mapinconvertclass gbinconvert;
+  gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
+  mapoutconvertclass gboutconvert;
+  gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
+  recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+
+  text_t armapfile = filename_cat (gsdlhome, "unicode", "MAPPINGS");
+  armapfile = filename_cat (armapfile, "WINDOWS", "1256.TXT");
+  simplemapinconvertclass arinconvert;
+  arinconvert.setmapfile (armapfile);
+  simplemapoutconvertclass aroutconvert;
+  aroutconvert.setmapfile (armapfile);
+  recpt.add_converter ("a", &arinconvert, &aroutconvert);  
+
 
   // the list of actions. Note: these actions will become invalid
@@ -230 +258 @@
 
   pageaction apageaction;
+  apageaction.set_receptionist (&recpt);
   recpt.add_action (&apageaction);
 
@@ -236 +265 @@
 
   queryaction aqueryaction;
+  aqueryaction.set_receptionist (&recpt);
   recpt.add_action (&aqueryaction);
 
   documentaction adocumentaction;
+  adocumentaction.set_receptionist (&recpt);
   recpt.add_action (&adocumentaction);