Changeset 1347 for trunk/gsdl/src/recpt/librarymain.cpp

Timestamp:

2000-08-03T17:21:26+12:00 (24 years ago)

Author:

jrm21

Message:

merged z39.50 receptionist stuff into main trunk (along with the mgpp stuff)

File:

• trunk/gsdl/src/recpt/librarymain.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -27 +27 @@
 #include "cgiwrapper.h"
 #include "nullproto.h"
+// z39.50 stuff - johnmcp
+#include "z3950proto.h"
 #include "collectserver.h"
 #include "filter.h"
@@ -64 +66 @@
   receptionist recpt;
   nullproto nproto;
+  z3950proto zproto;
 
   text_tarray collections;
@@ -120 +123 @@
     browsefilterclass *browsefilter = new browsefilterclass();
     browsefilter->set_gdbmptr (gdbmhandler);
+
     cserver->add_filter (browsefilter);  
  
@@ -136 +140 @@
        mggdbmsource->set_mgsearchptr (mgsearch);
        cserver->add_source (mggdbmsource);
-   
     }
     else if (buildtype == "mgpp") {
@@ -166 +169 @@
     colinfo.push_back (gsdlhome);
     recpt.configure ("collectinfo", colinfo);
-  
+    
     nproto.add_collectserver (cserver);
     thiscol ++;
@@ -174 +177 @@
   recpt.add_protocol (&nproto);
   
+
+
+  // z39.50 stuff - johnmcp
+
+  // add the z39.50 server information. Read in the file
+  // etc/recpt/z3950.cfg for list of servers and their databases.
+  text_t z3950cfg = filename_cat (gsdlhome, "etc");
+  z3950cfg = filename_cat (z3950cfg, "recpt");
+  z3950cfg = filename_cat (z3950cfg, "z3950.cfg");
+  if (file_exists(z3950cfg)) {
+    zproto.read_config_file(z3950cfg);
+    // only add this protocol if we have any servers configured.
+    if (zproto.getServerCount()>0)
+      recpt.add_protocol (&zproto);
+  }
+
+
   // add other converters
   utf8inconvertclass utf8inconvert;