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

Timestamp:

2001-04-30T10:44:08+12:00 (23 years ago)

Author:

sjboddie

Message:

Made the web library print some more reasonable debug info if gsdlhome
isn't set to a valid value

File:

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

trunk/gsdl/src/recpt/librarymain.cpp

@@ -70 +70 @@
   collectset  *cservers;
 #if defined(USE_Z3950)
-  /*#ifndef __WIN32__*/
   z3950proto   zproto;
 #endif
@@ -77 +76 @@
   cservers = new collectset(gsdlhome);
 
-  // GRB: removed 7/9/2000; perhaps needs to be here!site_cfg_read (gsdlhome);
-
   // set up the null protocol
   nproto.set_collectset(cservers);
@@ -84 +81 @@
   // configure the receptionist server list
   cservers->setReceptionistServers(recpt, gsdlhome);  
-  
-  
-  /*
-  text_t collectdir = filename_cat (gsdlhome, "collect");
-  text_tarray collections;
-  read_dir (collectdir, collections);
-
-  text_tarray::const_iterator thiscol = collections.begin();
-  text_tarray::const_iterator endcol = collections.end();
-
-  while (thiscol != endcol) {
-
-    // ignore the modelcol
-    if (*thiscol == "modelcol") {
-      thiscol ++;
-      continue;
-    }
-    
-    // create collection server and add to null protocol
-    nproto.add_collection (*thiscol, &recpt, gsdlhome, gsdlhome);
-    
-    confin.close();
-// #endif ? does this tie in with a WIN32 ifdef?
-
-    collectserver *cserver = new collectserver();
-    gdbmclass *gdbmhandler = new gdbmclass();
-
-    // add a null filter
-    filterclass *filter = new filterclass ();
-    cserver->add_filter (filter);
-    
-    // add a browse filter
-    browsefilterclass *browsefilter = new browsefilterclass();
-    browsefilter->set_gdbmptr (gdbmhandler);
-
-    cserver->add_filter (browsefilter);  
-
-    if (buildtype == "mg") {
-       mgsearchclass *mgsearch = new mgsearchclass();
- 
-       // add a query filter
-       mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
-       queryfilter->set_gdbmptr (gdbmhandler);
-       queryfilter->set_mgsearchptr (mgsearch);
-       cserver->add_filter (queryfilter);
-       
-       // add a mg and gdbm source
-       mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-       mggdbmsource->set_gdbmptr (gdbmhandler);
-       mggdbmsource->set_mgsearchptr (mgsearch);
-       cserver->add_source (mggdbmsource);
-    }
-#ifndef __WIN32__
-
-    else if (buildtype == "mgpp") {
-      
-      mgppsearchclass *mgsearch = new mgppsearchclass();
-
-      // add a query filter
-      mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
-      queryfilter->set_gdbmptr (gdbmhandler);
-      queryfilter->set_mgsearchptr (mgsearch);
-      cserver->add_filter (queryfilter);
-      
-      // add a mg and gdbm source
-      mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-      mggdbmsource->set_gdbmptr (gdbmhandler);
-      mggdbmsource->set_mgsearchptr (mgsearch);
-      cserver->add_source (mggdbmsource);
-   
-    }
-#endif    
-
-    // inform collection server and everything it contains about its
-    // 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 ++;
-  }
-  */
 
   // add the protocol to the receptionist
@@ -178 +87 @@
   // z39.50 stuff - johnmcp
 #if defined(USE_Z3950)
-  /*#ifndef __WIN32__*/
   // add the z39.50 server information. Read in the file
   // etc/recpt/z3950.cfg for list of servers and their databases.