Changeset 1649 for trunk/gsdl/src/recpt/collectoraction.cpp

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

File:

• trunk/gsdl/src/recpt/collectoraction.cpp (modified) (5 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";
+}