Changeset 1649 for trunk/gsdl

Timestamp:

2000-11-03T10:21:01+13:00 (24 years ago)

Author:

sjboddie

Message:

Tidied up collectoraction some more and created an add_collection
function in nullproto that does all the work of setting up a
local collection server

Location:

trunk/gsdl/src

Files:

• recpt/collectoraction.cpp (modified) (5 diffs)
• recpt/collectoraction.h (modified) (1 diff)
• recpt/librarymain.cpp (modified) (5 diffs)
• recpt/nullproto.cpp (modified) (2 diffs)
• recpt/nullproto.h (modified) (2 diffs)
• recpt/recptproto.cpp (modified) (1 diff)
• recpt/recptproto.h (modified) (1 diff)
• w32server/cgiwrapper.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -35 +35 @@
 #include "cfgread.h"
 #include "gsdltools.h"
+#include "nullproto.h"
 
 #if !defined (__WIN32__)
@@ -359 +360 @@
     char c = fbld_in.get();
     fbld_in.close();
-    if (c == '0') current_page = "bilddone";
+    if (c == '0') {
+      // success - we need to create and configure a collection server for the
+      // newly built collection (for fastcgi and local library where
+      // initialization isn't going to be redone when the user clicks the
+      // "view your new collection" button
+      create_colserver (args["bc1dirname"], logout);
+      current_page = "bilddone";
+    }
     else if (c == '4' || c == '5') message = "installfail";
     else current_page = "bildfail";
@@ -772 +780 @@
   }
 
-  disp.setmacro ("statusline", "collector", statusline);
+  disp.setmacro ("statusline", "collector", dm_safe(statusline));
 
 }
@@ -1163 +1171 @@
   options += " -collectdir \"" + tmpdir + "\" ";
   text_t optionfile = filename_cat (tmpdir, "mkcol.opt");
-  char *optionfilet = optionfile.getcstr();
-  ofstream ofile_out (optionfilet);
-  delete optionfilet;
+  char *optionfilec = optionfile.getcstr();
+  ofstream ofile_out (optionfilec);
+  delete optionfilec;
   if (!ofile_out) {
     message = "tmpfail";
@@ -1336 +1344 @@
   return false;
 }
+
+// create and initialize a new collection server and
+// add it to the null protocol.
+void collectoraction::create_colserver (const text_t &collection, ostream &logout) {
+
+  recptprotolistclass *protos = recpt->get_recptprotolist_ptr();
+  recptprotolistclass::iterator rprotolist_here = protos->begin();
+  recptprotolistclass::iterator rprotolist_end = protos->end();
+  while (rprotolist_here != rprotolist_end) {
+    if ((*rprotolist_here).p != NULL) {
+      if ((*rprotolist_here).p->get_protocol_name () == "nullproto") {
+    // create collection server and add it to nullproto
+    (*rprotolist_here).p->add_collection (collection, recpt, gsdlhome, gsdlhome);
+    // make sure gsdlhome is configured
+    text_tarray tmp;
+    tmp.push_back (gsdlhome);
+    (*rprotolist_here).p->configure ("gsdlhome", tmp);
+    // re-initialize the null protocol
+    if (!(*rprotolist_here).p->init (logout)) {
+      logout << "collectoraction::create_colserver: nullproto init failed\n";
+    }
+    return;
+      }
+    }
+    rprotolist_here ++;
+  }
+
+  logout << "collectoraction::create_colserver: no valid nullproto found\n";
+}

trunk/gsdl/src/recpt/collectoraction.h

@@ -75 +75 @@
   text_t get_collectdir (cgiargsclass &args);
 
-  bool collectoraction::uses_weird_plugin (const text_t &collection);
+  bool uses_weird_plugin (const text_t &collection);
+
+  void create_colserver (const text_t &collection, ostream &logout);
 
 public:

trunk/gsdl/src/recpt/librarymain.cpp

@@ -26 +26 @@
 #include "receptionist.h"
 #include "cgiwrapper.h"
+#include "fileutil.h"
 #include "nullproto.h"
 // z39.50 stuff - johnmcp
 #include "z3950proto.h"
-#include "collectserver.h"
-#include "filter.h"
-#include "browsefilter.h"
-#include "mgqueryfilter.h"
-#include "mgppqueryfilter.h"
-#include "infodbclass.h"
-#include "mggdbmsource.h"
-#include "mgsearch.h"
-#include "mgppsearch.h"
-#include "fileutil.h"
-#include <assert.h>
 
 #include "action.h"
@@ -86 +76 @@
     
     // ignore the modelcol
-
     if (*thiscol == "modelcol") {
       thiscol ++;
@@ -92 +81 @@
     }
     
-    // read config file to see if built with mg or mgpp
-    // (for now we'll just ignore mgpp if on windows)
-    text_t buildtype = "mg"; // mg is default
-#ifndef __WIN32__
-    text_tarray cfgline;
-    text_t key;
-    text_t filename = filename_cat(collectdir, *thiscol, "index/build.cfg");
-    ifstream confin(filename.getcstr());
-
-    if (confin) {
-      while (read_cfg_line(confin, cfgline) >= 0) {
-    if (cfgline.size() ==2 ) {
-      key = cfgline[0];
-      cfgline.erase(cfgline.begin());
-      if (key =="buildtype") {
-        buildtype = cfgline[0];
-        break;
-      }
-    }
-      }
-    }
+    // create collection server and add to null protocol
+    nproto.add_collection (*thiscol, &recpt, gsdlhome, gsdlhome);
     
-    confin.close();
-#endif
-
-    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
   recpt.add_protocol (&nproto);
-  
-
 
   // z39.50 stuff - johnmcp
@@ -226 +130 @@
   aroutconvert.setmapfile (armapfile);
   recpt.add_converter ("a", &arinconvert, &aroutconvert);  
-
+  
   // hindi
 //    armapfile = filename_cat (gsdlhome, "unicode", "MAPPINGS");
@@ -304 +208 @@
   return 0;
 }
+

trunk/gsdl/src/recpt/nullproto.cpp

@@ -28 +28 @@
 #include <assert.h>
 
+#include "filter.h"
+#include "browsefilter.h"
+#include "mgqueryfilter.h"
+#include "mgppqueryfilter.h"
+#include "infodbclass.h"
+#include "mggdbmsource.h"
+#include "mgsearch.h"
+#include "mgppsearch.h"
+#include "fileutil.h"
+
+
 nullproto::~nullproto() {
   collectservermapclass::iterator here = cservers.begin();
@@ -39 +50 @@
   }
   cservers.clear();
+}
+
+// add_collection sets up the collectionserver and calls
+// add_collectserver
+void nullproto::add_collection (const text_t &collection, void *recpt, 
+                const text_t &gsdlhome, const text_t &gdbmhome) {
+      
+  // read config file to see if built with mg or mgpp
+  // -- we can rely on the collection (and therefore the build.cfg)
+  // being here since this is the null protocol - a nicer way to 
+  // do this would be preferable though - Stefan.
+  text_t buildtype = "mg"; // mg is default
+  // (for now we'll just ignore mgpp if on windows)
+#ifndef __WIN32__
+  text_tarray cfgline;
+  text_t key;
+  text_t build_cfg = filename_cat(gsdlhome, "collect", collection, "index", "build.cfg");
+  char *build_cfgc = build_cfg.getcstr();
+  ifstream confin(build_cfgc);
+
+  if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size() == 2) {
+    key = cfgline[0];
+    cfgline.erase(cfgline.begin());
+    if (key == "buildtype") {
+      buildtype = cfgline[0];
+      break;
+    }
+      }
+    }
+    confin.close();
+  }
+  delete build_cfgc;
+#endif
+
+  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", collection);
+  
+  // configure receptionist's collectinfo structure 
+  text_tarray colinfo;
+  colinfo.push_back (collection);
+  colinfo.push_back (gsdlhome);
+  colinfo.push_back (gdbmhome);
+  receptionist *rcp = (receptionist *)recpt;
+  rcp->configure ("collectinfo", colinfo);
+  
+  add_collectserver (cserver);
 }
 

trunk/gsdl/src/recpt/nullproto.h

@@ -31 +31 @@
 #include "collectserver.h"
 #include "recptproto.h"
-
+#include "receptionist.h"
 
 class nullproto : public recptproto {
@@ -38 +38 @@
 public:
   virtual ~nullproto();
+
+  // add_collection sets up the collectionserver and calls
+  // add_collectserver
+  void add_collection (const text_t &collection, void *recpt, 
+               const text_t &gsdlhome, const text_t &gdbmhome);
 
   // add_collectserver should be called for each collection server

trunk/gsdl/src/recpt/recptproto.cpp

@@ -27 +27 @@
 #include <assert.h>
 
+
+// add collection server to protocol
+void recptproto::add_collection (const text_t &/*collection*/, void * /*recpt*/, 
+                 const text_t &/*gsdlhome*/, const text_t &/*gdbmhome*/) {
+}
 
 // configure should be called for each line in the configuration file

trunk/gsdl/src/recpt/recptproto.h

@@ -53 +53 @@
 class recptproto {
 public:
+
+  // add collection server to protocol
+  virtual void add_collection (const text_t &collection, void *recpt, 
+                   const text_t &gsdlhome, const text_t &gdbmhome);
+
   // configure should be called for each line in the configuration file
   virtual void configure (const text_t &key, const text_tarray &cfgline);

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -54 +54 @@
 #include "receptionist.h"
 #include "nullproto.h"
-#include "collectserver.h"
-#include "infodbclass.h"
-#include "mggdbmsource.h"
-#include "mgsearch.h"
 
 // actions
@@ -79 +75 @@
 #include "pagedbrowserclass.h"
 #include "htmlbrowserclass.h"
-
-// filters
-#include "filter.h"
-#include "browsefilter.h"
-#include "mgqueryfilter.h"
-#include "phrasequeryfilter.h"
 
 // the number of times the library has been accessed
@@ -396 +386 @@
 
   while (thiscol != endcol) {
-
-    // this memory is created but never destroyed
-    // we're also not doing any error checking to make sure we didn't
-    // run out of memory
-    collectserver *cserver = new collectserver();
-    gdbmclass *gdbmhandler = new gdbmclass();
-    mgsearchclass *mgsearch = new mgsearchclass();
-    
-    // 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);
-    
-    // add a query filter
-    mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
-    queryfilter->set_gdbmptr (gdbmhandler);
-    queryfilter->set_mgsearchptr (mgsearch);
-    cserver->add_filter (queryfilter);
-    
-    // add an mg and gdbm source
-    mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass();
-    mggdbmsource->set_gdbmptr (gdbmhandler);
-    mggdbmsource->set_mgsearchptr (mgsearch);
-    cserver->add_source (mggdbmsource);
-    
-    // inform collection server and everything it contains about
-    // its collection name
-    cserver->configure ("collection", *thiscol);
-    
-    nproto.add_collectserver (cserver);
+    
+    // ignore the modelcol
+    if (*thiscol == "modelcol") {
+      thiscol ++;
+      continue;
+    }
+    
+    // create collection server and add to null protocol
+    nproto.add_collection (*thiscol, &recpt, gsdl_gsdlhome, gsdl_gsdlhome);
     
     thiscol ++;