Changeset 11998

Timestamp:

2006-07-04T15:23:58+12:00 (18 years ago)

Author:

davidb

Message:

First cut at 'The Depositor' -- Greenstone support for institutional
repositories

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (7 diffs)
• cgiutils.cpp (modified) (3 diffs)
• cgiwrapper.cpp (modified) (2 diffs)
• collectoraction.cpp (modified) (21 diffs)
• collectoraction.h (modified) (6 diffs)
• documentaction.cpp (modified) (6 diffs)
• gsdl_modules_cfg.h (modified) (1 diff)
• librarymain.cpp (modified) (5 diffs)
• pageaction.cpp (modified) (4 diffs)
• pageaction.h (modified) (1 diff)
• wizardaction.cpp (added)
• wizardaction.h (added)

trunk/gsdl/src/recpt/Makefile.in

@@ -55 +55 @@
        -I../../packages/mg/lib -I../../packages/mg/src/text \
            -I../../packages/expat/include \
+           -I../../packages/cgicc/include \
        -I../mgpp/lib -I../mgpp/text -I../..
 else 
@@ -61 +62 @@
        -I../../packages/mg/lib -I../../packages/mg/src/text \
            -I../../packages/expat/include \
+           -I../../packages/cgicc/include \
            -I../../packages/fcgi/include -I../mgpp/lib \
        -I../mgpp/text -I../..
@@ -93 +95 @@
 LDFLAGS = @LDFLAGS@
 GDBM_LIBS=@GDBM_LIBPATH@ -lgdbm
-LIBS = $(GDBM_LIBS) $(LC_LIBS) @LIBS@
+LIBS = $(GDBM_LIBS) $(LC_LIBS) -L../../packages/cgicc/lib -lcgicc @LIBS@
 GSDLOS = @gsdlos@
 INSTALL = @INSTALL@
@@ -109 +111 @@
 
 # in case gdbm.h/libgdbm.a are in a non-standard place...
-GDBM_OBJS=argdb.o authenaction.o collectoraction.o infodbclass.o userdb.o usersaction.o historydb.o librarymain.o nullproto.o queryaction.o z3950proto.o
+GDBM_OBJS=argdb.o authenaction.o collectoraction.o depositoraction.o wizardaction.o infodbclass.o userdb.o usersaction.o historydb.o librarymain.o nullproto.o queryaction.o z3950proto.o
 
 ifeq ($(USE_CORBA), 1)
@@ -154 +156 @@
                 userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
-        htmlbrowserclass.h phindbrowserclass.h historydb.h collectoraction.h \
+        htmlbrowserclass.h phindbrowserclass.h historydb.h collectoraction.h depositoraction.h wizardaction.h \
         phindaction.h summarise.h highlighttext.h gtiaction.h
 
@@ -176 +178 @@
         vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
-        phindbrowserclass.cpp  historydb.cpp collectoraction.cpp argdb.cpp \
+        phindbrowserclass.cpp  historydb.cpp collectoraction.cpp depositoraction.cpp wizardaction.cpp argdb.cpp \
         browseactiontools.h formattools.cpp phindaction.cpp summarise.cpp \
         highlighttext.cpp gtiaction.cpp
@@ -210 +212 @@
         hlistbrowserclass.o datelistbrowserclass.o invbrowserclass.o \
         pagedbrowserclass.o htmlbrowserclass.o phindbrowserclass.o \
-        historydb.o $(Z_COMOBJS) collectoraction.o phindaction.o \
+        historydb.o $(Z_COMOBJS) collectoraction.o depositoraction.o wizardaction.o phindaction.o \
         summarise.o highlighttext.o gtiaction.o
 

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -26 +26 @@
 #include "cgiutils.h"
 #include "gsdlunicode.h"
+#include "fileutil.h"
 #include "unitool.h" // in mg, for output_utf8_char
+
 
 static unsigned short hexdigit (unsigned short c) {
@@ -120 +122 @@
   text_t::const_iterator end = argstr.end();
   text_t key, value;
-  
+
+  text_tset multivalue;
+
+ 
   // extract out the key=value pairs
   while (here != end) {
@@ -140 +145 @@
       // again before use) - it should use an array instead
       const cgiarginfo *info = argsinfo.getarginfo (key);
-      if (info != NULL && info->multiplevalue) {
-    text_t newvalue = args[key];
-    if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
-    newvalue += encode_commas(value);
-    args.setarg (key, newvalue, cgiarg_t::cgi_arg);
-
-      } else {
-    args.setarg (key, value, cgiarg_t::cgi_arg);
+
+      if (info==NULL) {
+    if (args.getarg(key)==NULL) {
+      args.setarg (key, encode_commas(value), cgiarg_t::cgi_arg);
+    }
+    else {
+      text_t newvalue = args[key];
+
+      newvalue += "," + encode_commas(value);
+      args.setarg (key, newvalue, cgiarg_t::cgi_arg);
+    }
+      }
+      else {
+    if (info->multiplevalue) {
+
+      text_t newvalue = args[key];
+      if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
+      newvalue += encode_commas(value);
+      args.setarg (key, newvalue, cgiarg_t::cgi_arg);
+
+    } else {
+      args.setarg (key, value, cgiarg_t::cgi_arg);
+    }
       }
     }

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -42 +42 @@
 #endif
 
+#include "cgicc/Cgicc.h"
+
+using namespace cgicc;
+extern Cgicc* formData;
+
+
 #ifdef USE_FASTCGI
 #include "fcgiapp.h"
@@ -467 +473 @@
   char *aURIStr;
   if (!isfastcgi) {
-    char *request_method_str = getenv("REQUEST_METHOD");
-    char *content_length_str = getenv("CONTENT_LENGTH");
-    if (request_method_str != NULL && strcmp(request_method_str, "POST") == 0 &&
-    content_length_str != NULL)  {
-      // POST form data
-      int content_length = text_t(content_length_str).getint();
-      if (content_length > 0) {
-    char c;
-    do {
-      cin.get(c);
-      if (cin.eof()) break;
-      argstr.push_back (c);
-      --content_length;
-    } while (content_length > 0);
+
+    
+    // Iterate through the vector, and synthesis argstr
+    bool first = true;
+
+    for(const_form_iterator iter = formData->getElements().begin();
+    iter != formData->getElements().end();
+    ++iter) {
+      
+      const char* name_cstr = iter->getName().c_str();
+      const char* value_cstr = iter->getValue().c_str();
+      if (first) {
+    
+    argstr = name_cstr;
+    argstr.append("=");
+    argstr.append(value_cstr);
+    first = false;
       }
-      
-    } else {
-      aURIStr = getenv("QUERY_STRING");
-      if ((request_method_str != NULL && strcmp(request_method_str, "GET") == 0)
-      || aURIStr != NULL) {
-    // GET form data
-    if (aURIStr != NULL) argstr = aURIStr;
-      } else {
-    // debugging from command line
-    debug = true;
+      else {
+    argstr.append("&");
+    argstr.append(name_cstr);
+    argstr.append("=");
+    argstr.append(value_cstr);
       }
-    }
+    }   
   }
 

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -56 +56 @@
 #endif
 
-collectoraction::collectoraction () {
-
-  recpt = NULL;
-  disabled = true;
+collectoraction::collectoraction () 
+  : wizardaction()
+{
+  macro_prefix = "bc1";
+
   do_mkcol = false;
   badsources = false;
   failedsources.erase(failedsources.begin(), failedsources.end());
-  gsdlosc = NULL;
-  gsdlhomec = NULL;
-  pathc = NULL;
 
   cgiarginfo arg_ainfo;
@@ -245 +243 @@
 
 collectoraction::~collectoraction () {
-  if (gsdlosc != NULL) delete []gsdlosc;
-  if (gsdlhomec != NULL) delete []gsdlhomec;
-  if (pathc != NULL) delete []pathc;
 }
 
 
-void collectoraction::configure (const text_t &key, const text_tarray &cfgline) {
-  if ((key == "collector") && (cfgline.size() == 1) && 
-      (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
-    disabled = false;
-  } else {
-    // call the parent class to deal with the things which
-    // are not dealt with here
-    action::configure (key, cfgline);
-  }
-}
-
-
-bool collectoraction::init (ostream & /*logout*/) {
-
-  // set up GSDLOS, GSDLHOME and PATH environment variables
-  text_t gsdlos, path;
-  unsigned int path_separator = ':';
-#if defined (__WIN32__)
-  gsdlos = "windows";
-  path_separator = ';';
-
-  path = filename_cat (gsdlhome, "bin", "windows", "perl", "bin;");
-
-#else
-  struct utsname *buf = new struct utsname();
-  int i = uname (buf);
-  if (i == -1) gsdlos = "linux"; // uname failed
-  else gsdlos.setcstr (buf->sysname);
-  delete buf;
-  lc (gsdlos);
-#endif
-
-  pathc = getenv ("PATH");
-  path += filename_cat (gsdlhome, "bin", gsdlos);
-  path.push_back (path_separator);
-  path += filename_cat (gsdlhome, "bin", "script");
-  if (pathc != NULL) {
-    path.push_back (path_separator);
-    path += pathc;
-  }
-  path = "PATH=" + path;
-
-  gsdlos = "GSDLOS=" + gsdlos;
-  text_t setgsdlhome = "GSDLHOME=" + gsdlhome;
-
-  // these will be cleaned up in the destructor
-  gsdlosc = gsdlos.getcstr();
-  gsdlhomec = setgsdlhome.getcstr();
-  pathc = path.getcstr();
-  
-  putenv (gsdlosc);
-  putenv (gsdlhomec);
-  putenv (pathc);
-
-  return true;
-}
 
 bool collectoraction::check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
@@ -335 +274 @@
     // clean up any old builds left laying about in the tmp directory
     // (note that it's possible this could take some time if there's a huge
-    // partially built collection laying about so we'll make it an asynchronous
+    // partially built collecton laying about so we'll make it an asynchronous
     // system call)
     gsdl_system ("perl -S cleantmp.pl", false, logout);
@@ -710 +649 @@
 }
 
-void collectoraction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
-                    response_t &response,text_t &response_data, 
-                    ostream &/*logout*/) {
-  response = content;
-  response_data = "text/html";
-}
 
 // return html for buttons used in collector bar
@@ -728 +661 @@
 // will be hyperlinked
 
-text_t collectoraction::get_button(const text_t &thispage, const text_t &color, 
-                    const text_t &type, bool enabled) {
-
-  if ((color != "green" && color != "grey" && color != "yellow") ||
-      (type != "info" && type != "srce" && type != "conf" && type != "bild" && type != "view"))
-    return g_EmptyText;
-
-  text_t href = "_http"+type+"_";
-  text_t target = "";
-  if (thispage == "info" || thispage == "srce" || thispage == "conf" || 
-      thispage == "bildcancel" || thispage == "bildfail") {
-    // call the check submit macro instead of linking directly to the page
-    href="\"javascript:check_submit('"+type+"');\"";
-  } else if (type == "view") {
-    // view button is special case as it needs a target=_top
-    target = " target=_top";
-  }
-  
-  text_t tdclass = "collectorbar"+color;
-  if (enabled) {
-    // link to the appropriate page
-    return "<td class="+tdclass+"><a href="+href+target+">_text"+type+"_</a></td>";
-  }
-  else {
-    // just display the text
-    return "<td class="+tdclass+">_text"+type+"_</td>";
-  }
-}
-
+// Wendy left a comment suggesting this be move, but where to
+// was not specified.  Into wizardaction.cpp?
 
 // set the _fullnamemenu_ macro (and _warnindex_ and _selectedindex_ if
@@ -771 +677 @@
 
   text_t &current_page = args["p"];
-  text_t currentname = args["bc1dirname"];
-  if (current_page == "srce") currentname = args["bc1clonecol"];
+  text_t currentname = args[macro_prefix+"dirname"];
+  if (current_page == "srce") currentname = args[macro_prefix + "clonecol"];
 
   text_tarray dirnames;
@@ -825 +731 @@
 
   bool first = true;
+
   text_t warnindex;
-  text_t fullnamemenu = "<select name=\"bc1dirname\">\n";
+  text_t fullnamemenu = "<select name=\""+macro_prefix+"dirname\" onChange=\"menuchange();\">\n";
+
   if (current_page == "srce") {
-    fullnamemenu = "<select name=\"bc1clonecol\" onChange=\"menuchange();\">\n";
+    fullnamemenu = "<select name=\""+macro_prefix+"clonecol\" onChange=\"menuchange();\">\n";
     fullnamemenu += "<option value=defaultstructure";
     if (!is_selected) fullnamemenu += " selected>";
@@ -834 +742 @@
     fullnamemenu += "_collector:textdefaultstructure_\n";
   }
+
+  fullnamemenu += "<option value=\"\"></option>\n";
+
   for (int i = 0; i < index; ++i) {
     // don't want write protected collections in list on "change existing
@@ -863 +774 @@
   }
   fullnamemenu += "</select>\n";
-
-  disp.setmacro ("fullnamemenu", "collector", fullnamemenu);
+  text_t action_name = get_action_name();
+  disp.setmacro ("fullnamemenu", action_name, fullnamemenu);
   if (current_page == "srce") {
-    disp.setmacro ("warnindex", "collector", warnindex);
-    disp.setmacro ("selectedindex", "collector", text_t(selected_index));
+    disp.setmacro ("warnindex",action_name , warnindex);
+    disp.setmacro ("selectedindex", action_name, text_t(selected_index));
   }
 }
+
 
 // set _sourcelist_ and _badsources_ macros
@@ -1005 +917 @@
 }
 
-// set the _statusline_ macro
-void collectoraction::set_statusline (displayclass &disp, cgiargsclass &args, ostream & /*logout*/) {
-
-  // the build command creates .bld.download, .bld.import, and .bld.build files (in that
-  // order) and deletes them (also in that order) when each stage is complete. the .bld
-  // file is the concatenation of all these files.
-  text_t bld_file = filename_cat (gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld");
-  text_t statusline;
-
-  if (file_exists (bld_file + ".download")) {
-    statusline = "_collector:textdownloadingfiles_<br>\n";
-    statusline += dm_safe(file_tail(bld_file + ".download", 1, 0));
-  } else if (file_exists (bld_file + ".import")) {
-    statusline = "_collector:textimportingcollection_<br>\n";
-    statusline += dm_safe(file_tail(bld_file + ".import", 1, 0));
-  } else if (file_exists (bld_file + ".build")) {
-    statusline = "_collector:textbuildingcollection_<br>\n";
-    statusline += dm_safe(file_tail(bld_file + ".build", 1, 0));
-  } else {
-    statusline += "_collector:textcreatingcollection_<br>\n";
-    statusline += dm_safe(file_tail(bld_file, 1, 0));
-  }
-
-  disp.setmacro ("statusline", "collector", statusline);
-
-}
 
 void collectoraction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
@@ -1065 +951 @@
 
   // set the collectorbar macro
-  text_t collectorbar = "<table class=collectorbar border=0 cellspacing=4 cellpadding=0><tr>\n";
+  text_t collectorbar = "<table class=wizardbar border=0 cellspacing=4 cellpadding=0><tr>\n";
 
   if (collector_page == "new") {
     collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "info", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "srce", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "conf", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "bild", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "view", false);
+    collectorbar += get_button (args,collector_page, "green", "info", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "srce", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "conf", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "bild", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "view", false);
 
   } else if (collector_page == "info") {
     collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "info", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "srce", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "conf", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "bild", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "view", false);
+    collectorbar += get_button (args,collector_page, "yellow", "info", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "green", "srce", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "conf", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "bild", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "view", false);
     collectorbar += "</tr><tr><td></td><td align=center>_icongreyuparrow_</td><td colspan=8></td>\n";
 
@@ -1097 +983 @@
       // if we came from the "change an existing collection" page previous button(s)
       // are disabled
-      collectorbar += get_button (collector_page, "grey", "info", false);
+      collectorbar += get_button (args,collector_page, "grey", "info", false);
     } else {
-      collectorbar += get_button (collector_page, "yellow", "info", true);
-    }
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "srce", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "conf", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "bild", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "view", false);
+      collectorbar += get_button (args,collector_page, "yellow", "info", true);
+    }
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "yellow", "srce", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "green", "conf", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "green", "bild", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "view", false);
     collectorbar += "</tr><tr><td colspan=3></td><td align=center>_icongreyuparrow_</td><td colspan=6></td>\n";
 
@@ -1116 +1002 @@
     // page
     if (esrce == 1 || econf == 1) {
-      collectorbar += get_button (collector_page, "grey", "info", false);
+      collectorbar += get_button (args,collector_page, "grey", "info", false);
     } else {
-      collectorbar += get_button (collector_page, "yellow", "info", true);
+      collectorbar += get_button (args,collector_page, "yellow", "info", true);
     }
     collectorbar += "<td>_icongreyarrow_</td>\n";
     if (econf == 1) {
-      collectorbar += get_button (collector_page, "grey", "srce", false);
+      collectorbar += get_button (args,collector_page, "grey", "srce", false);
     } else {
-      collectorbar += get_button (collector_page, "yellow", "srce", true);
-    }
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "conf", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "bild", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "view", false);
+      collectorbar += get_button (args,collector_page, "yellow", "srce", true);
+    }
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "yellow", "conf", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "green", "bild", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "view", false);
     collectorbar += "</tr><tr><td colspan=5></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";
 
@@ -1137 +1023 @@
     collectorbar += "<td>_icongreyarrow_</td>\n";
     // all previous buttons grey after build was completed
-    collectorbar += get_button (collector_page, "grey", "info", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "srce", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "conf", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "bild", false);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "green", "view", true);
+    collectorbar += get_button (args,collector_page, "grey", "info", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "srce", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "conf", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "yellow", "bild", false);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "green", "view", true);
     collectorbar += "</tr><tr><td colspan=7></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n";
 
@@ -1153 +1039 @@
     // page
     if (esrce == 1 || econf == 1) {
-      collectorbar += get_button (collector_page, "grey", "info", false);
+      collectorbar += get_button (args,collector_page, "grey", "info", false);
     } else {
-      collectorbar += get_button (collector_page, "yellow", "info", true);
+      collectorbar += get_button (args,collector_page, "yellow", "info", true);
     }
     collectorbar += "<td>_icongreyarrow_</td>\n";
     if (econf == 1) {
-      collectorbar += get_button (collector_page, "grey", "srce", false);
+      collectorbar += get_button (args,collector_page, "grey", "srce", false);
     } else {
-      collectorbar += get_button (collector_page, "yellow", "srce", true);
-    }
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "conf", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "bild", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "view", false);
+      collectorbar += get_button (args,collector_page, "yellow", "srce", true);
+    }
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "yellow", "conf", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "yellow", "bild", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (args,collector_page, "grey", "view", false);
   }
 
@@ -1207 +1093 @@
   disp.setmacro ("gsdlhome", "collector", dm_safe(gsdlhome));
 }
+
 
 bool collectoraction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/, 
@@ -1439 +1326 @@
 }
 
-// if sw = 0 replace all carriage returns in intext with the string "\n"
-// else replace all occurances of "\n" with a carriage return
-text_t collectoraction::carriage_replace (const text_t &intext, int sw) {
-   
-  text_t outtext;
-  text_t::const_iterator here = intext.begin();
-  text_t::const_iterator end = intext.end();
-  while (here != end) {
-    if (sw == 0) {
-      if (*here == '\n') {
-    if ((here+1) != end && *(here+1) == '\r') ++here;
-    outtext += "\\n";
-      } else if (*here == '\r') {
-    if ((here+1) != end && *(here+1) == '\n') ++here;
-    outtext += "\\n";
-      } else {
-    outtext.push_back (*here);
-      }
-    } else if (*here == '\\' && (here+1) != end && *(here+1) == 'n') {
-      outtext.push_back ('\n');
-      ++here;
-    } else {
-      outtext.push_back (*here);
-    }
-    ++here;
-  }
-  return outtext;
-}
-
-// create a short directory name from fullname
-text_t collectoraction::get_directory_name (const text_t &fullname) {
-
-  text_t shortname;
-  if (fullname.empty()) {
-    shortname = "coll";
-
-  } else {
-    
-    // first make all lowercase and remove any dodgy characters
-    // (i.e. anything not [a-z]
-    text_t::const_iterator here = fullname.begin();
-    text_t::const_iterator end = fullname.end();
-    while (here != end) {
-      if ((*here >= 'A' && *here <= 'Z') || (*here >= 'a' && *here <= 'z') ||
-      (*here == ' ')) {
-    if (*here >= 'A' && *here <= 'Z') shortname.push_back (*here+32);
-    else if (*here == ' ') {
-      while ((*(here+1)) == ' ') ++here;
-      shortname.push_back (*here);
-    } else shortname.push_back (*here);
-      }
-      ++here;
-    }
-
-    text_tarray words;
-    splitchar (shortname.begin(), shortname.end(), ' ', words);
-    int num_words = words.size();
-
-    if (num_words == 0) {
-      shortname = "coll";
-
-    } else {
-
-      shortname.clear();
-      int use_words = (num_words <= 6) ? num_words : 6;
-      unsigned int substr_len = 6 / use_words;
-      
-      for (int i = 0; i < use_words; ++i) {
-    if (words[i].size() < substr_len) shortname += words[i];
-    else shortname += substr (words[i].begin(), words[i].begin()+substr_len);
-      }
-    }
-  }
-
-  // check to see if shortname is unique
-  text_t fulldirname = filename_cat (gsdlhome, "collect", shortname);
-  if (directory_exists (fulldirname)) {
-    int version = 0;
-    text_t newname;
-    do {
-      ++version;
-      newname = shortname;
-      newname.push_back ('v');
-      newname.appendint (version);
-      fulldirname = filename_cat (gsdlhome, "collect", newname);
-    } while (directory_exists (fulldirname));
-
-    shortname = newname;
-  }
-  
-  return shortname;
-}
-
-// tests if collection is write protected (currently just checks if
-// collect.cfg file is writable
-bool collectoraction::collection_protected (const text_t &collection) {
-  text_t cfgfile = filename_cat(gsdlhome, "collect", collection, "etc", "collect.cfg");
-  if (file_writable(cfgfile)) return false;
-  return true;
-}
-
-// assigns a temporary directory name for this collector session
-// and creates temporary directory
-// returns false if it couldn't create the directory
-bool collectoraction::assign_tmpname (cgiargsclass &args, ostream &logout) {
-
-  int i = 0;
-  text_t tmpname = "tbuild";
-  while (directory_exists (filename_cat (gsdlhome, "tmp", tmpname + text_t(i)))) {
-    ++i;
-  }
-  tmpname.appendint (i);
-
-  text_t fulltmpdir = filename_cat (gsdlhome, "tmp", tmpname);
-  if (!mk_dir (fulltmpdir)) {
-    outconvertclass text_t2ascii;
-    logout << text_t2ascii << "collectoraction::assign_tmpname unable to create directory ("
-       << fulltmpdir << ")\n";
-    return false;
-  }
-
-  args["bc1tmp"] = tmpname;
-  return true;
-}
-
 void collectoraction::gsdl_mkcol (cgiargsclass &args, ostream &logout) {
 
@@ -1569 +1331 @@
   if (!directory_exists (tmpdir)) {
     message = "tmpfail";
+    cerr << "WE CANNOT CREATE THE DIRECTORY!!! " << endl; 
     return;
   }
@@ -1605 +1368 @@
   text_t mkcol_cmd = "perl -S mkcol.pl -optionfile \"" + optionfile;
   mkcol_cmd += "\" " + collection;
+
+
   gsdl_system (mkcol_cmd, true, logout);
 
@@ -1627 +1392 @@
 }
 
-void collectoraction::gsdl_build (cgiargsclass &args, ostream &logout) {
-
-  outconvertclass text_t2ascii;
-
-  text_t tmpdir = filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
-  if (!directory_exists (tmpdir)) {
-    message = "tmpfail";
-    return;
-  }
-  
-  text_t &collection = args["bc1dirname"];
-  if (collection.empty()) {
-    message = "nocollection";
-    return;
-  }
-
-  // check for a .build file - if it exists then we've already built
-  // the collection (or are in the process of building it)
-  text_t buildfile = filename_cat (tmpdir, ".build");
-  if (file_exists (buildfile)) {
-    return;
-  } else {
-    // create the .build file (this file is just a place holder to let any future
-    // pages know that we've already been here)
-    char *buildfilec = buildfile.getcstr();
-    ofstream bfile_out (buildfilec);
-    delete []buildfilec;
-    if (bfile_out) {
-      bfile_out << "collection building\n";
-      bfile_out.close();
-    } else {
-      message = "tmpfail";
-      return;
-    }
-  }
-
-  const recptconf &rcinfo = recpt->get_configinfo ();
-
-  // create the event header file if LogEvents, EmailEvents or
-  // EmailUserEvents options are turned on.
-  bool logevents = 
-    (rcinfo.LogEvents == CollectorEvents || rcinfo.LogEvents == AllEvents || 
-     rcinfo.EmailEvents == CollectorEvents || rcinfo.EmailEvents == AllEvents ||
-     rcinfo.EmailUserEvents);
-  text_t ehead_file = filename_cat (tmpdir, "ehead.txt");
-  if (logevents) {
-    if (!create_event_header_file (ehead_file, args, logout)) {
-      logevents = false;
-    }
-  }
-    
-  text_t collectdir = get_collectdir (args);
-
-  // set up build options
-  text_t options = "-make_writable -remove_import -out \"";
-  options += filename_cat (tmpdir, collection + ".bld");
-  options += "\" -collectdir \"" + collectdir + "\" -statsfile \"";
-  options += filename_cat(collectdir, collection, "etc", "import.log") + "\"";
-
-  if (args["bc1esrce"] == 1) {
-    // we're adding data to an existing collection
-    options += " -save_archives -append";
-  }
-
-  text_tarray inputvalues, inputtypes;
-  splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);
-  splitchar (args["bc1inputtype"].begin(), args["bc1inputtype"].end(), ',', inputtypes);
-  int numvalues = inputvalues.size();
-  int numtypes = inputtypes.size();
-  for (int i = 0; i < numvalues; ++i) {
-    if (!inputvalues[i].empty()) {
-      text_t type = "file://"; // default
-      if (i < numtypes) type = inputtypes[i];
-      options += " -download \"" + 
-    remove_trailing_slashes(type + format_url(decode_commas(inputvalues[i]))) + "\"";
-    }
-  }
-
-  if (logevents) {
-    if (rcinfo.LogEvents == CollectorEvents || rcinfo.LogEvents == AllEvents) 
-      options += " -log_events";
-    if (rcinfo.EmailEvents == CollectorEvents || rcinfo.EmailEvents == AllEvents) {
-      options += " -mail_server " + rcinfo.MailServer;
-      options += " -email_events " + rcinfo.maintainer;
-      if (rcinfo.EmailUserEvents) options += "," + args["bc1contactemail"];
-    } else if (rcinfo.EmailUserEvents) {
-      options += " -mail_server " + rcinfo.MailServer;
-      options += " -email_events " + args["bc1contactemail"];
-    }
-    options += " -event_header " + ehead_file;
-  }
-
-  text_t optionfile = filename_cat (tmpdir, "build.opt");
-  char *optionfilec = optionfile.getcstr();
-  ofstream ofile_out (optionfilec);
-  delete []optionfilec;
-  if (!ofile_out) {
-    message = "tmpfail";
-    return;
-  }
-  ofile_out << text_t2ascii << options << "\n";
-  ofile_out.close();
-
-  // if we're altering an existing collection we need to kill off
-  // the existing collection server - we do this for the local library
-  // (and any other persistent version of the library) as the existing
-  // gdbm file can't be deleted while the collection server holds it open
-  if ((args["bc1econf"] == 1) || (args["bc1esrce"] == 1)) {
-    remove_colservr (collection, logout);
-  }    
-
-  // set up the build command - build.bat has some issues with quoting
-  // on win2k when gsdlhome contains spaces so we'll avoid using 
-  // "perl -S" here in favor of calling the "build" perl script explicitly
-  text_t build_cmd = "perl \"" + filename_cat (gsdlhome, "bin", "script", "build");
-  build_cmd += "\" -optionfile \"" + optionfile + "\" " + collection;
-  // run build command in background (i.e. asynchronously)
-  gsdl_system (build_cmd, false, logout);
-}
-
-void collectoraction::gsdl_cancel_build (cgiargsclass &args, ostream &logout) {
-  // I really wanted to do what this perl script does from within the library
-  // c++ code. I ran into some problems though (like how do you write a portable
-  // "rm -r" in c++?). One day I'll spend some time sorting it out ... maybe.
-  text_t cancel_cmd = "perl -S cancel_build.pl -collectdir \"";
-  cancel_cmd += filename_cat (gsdlhome, "tmp", args["bc1tmp"]) + "\" ";
-  cancel_cmd += args["bc1dirname"];
-  // To be on the safe side we'll make this a synchronous call
-  // so that all tidying up is done before the user has a chance
-  // to do anything else (like start rebuilding their collection).
-  // This means that for a big collection where there's lots of 
-  // stuff to delete etc. it might take a while before the "build
-  // cancelled" page appears.
-  gsdl_system (cancel_cmd, true, logout);
-}
-
-text_t collectoraction::get_collectdir (cgiargsclass &args)
-{
-  if ((args["bc1econf"] == 1) || (args["bc1esrce"] == 1)) {
-    // we're adding to a collection in place
-    return filename_cat(gsdlhome, "collect");  
-  }
-  else {
-    return filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
-  }
-}
-
-// checks to see if any of the plugins in pluginset occur in 
-// collections configuration file
-bool collectoraction::uses_weird_plugin (const text_t &collection) {
-
-  text_tset pluginset;
-  pluginset.insert ("HBPlug");
-
-  text_t cfgfile_content;
-  text_t cfgfile_name = filename_cat (gsdlhome, "collect", collection, "etc", "collect.cfg");
-  text_t pluginstr, pluginname;
-
-  if (read_file (cfgfile_name, cfgfile_content)) {
-    text_t::const_iterator here = cfgfile_content.begin();
-    text_t::const_iterator end = cfgfile_content.end();
-    while (here != end) {
-      here = findchar (here, end, 'p');
-      if (here == end) break;
-      if ((here+6 < end) && (substr (here, here+6) == "plugin")) {
-    getdelimitstr (here+6, end, '\n', pluginstr);
-    text_t::const_iterator hp = pluginstr.begin();
-    text_t::const_iterator ep = pluginstr.end();
-    bool found = false;
-    // remove any leading whitespace, trailing options etc.
-    while (hp != ep) {
-      if (*hp == '\t' || *hp == ' ' || *hp == '\n') {
-        if (found) break;
-      } else {
-        pluginname.push_back (*hp);
-        found = true;
-      }
-      ++hp;
-    }
-    text_tset::const_iterator it = pluginset.find (pluginname);
-    if (it != pluginset.end()) return true; // found matching plugin
-    pluginname.clear();
-      }
-      ++here;
-    }
-  }
-  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) {
-    comerror_t err = noError;
-    if ((*rprotolist_here).p != NULL) {
-      if ((*rprotolist_here).p->get_protocol_name (err) == "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, err);
-    // re-initialize the null protocol
-    if (!(*rprotolist_here).p->init (err, logout)) {
-      logout << "collectoraction::create_colserver: nullproto init failed\n";
-    }
-    return;
-      }
-    }
-    ++rprotolist_here;
-  }
-
-  logout << "collectoraction::create_colserver: no valid nullproto found\n";
-}
-
-// delete a collection server from the null protocol
-void collectoraction::remove_colservr (const text_t &collection, ostream &logout) {
-
-  recpt->uncache_collection (collection);
-
-  recptprotolistclass *protos = recpt->get_recptprotolist_ptr();
-  recptprotolistclass::iterator rprotolist_here = protos->begin();
-  recptprotolistclass::iterator rprotolist_end = protos->end();
-  while (rprotolist_here != rprotolist_end) {
-    comerror_t err = noError;
-    if ((*rprotolist_here).p != NULL) {
-      if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {
-    (*rprotolist_here).p->remove_collection (collection, logout);
-    return;
-      }
-    }
-    ++rprotolist_here;
-  }
-
-  logout << "collectoraction::create_colserver: no valid nullproto found\n";
-}
-
-bool collectoraction::create_event_header_file (const text_t &filename, cgiargsclass &args, 
-                        ostream &logout) {
-
-  outconvertclass text_t2ascii;
-  char *filenamec = filename.getcstr();
-  ofstream eheadfile (filenamec);
-  delete []filenamec;
-
-  if (eheadfile) {
-    eheadfile << text_t2ascii << get_event_header (args);
-    eheadfile.close();
-    return true;
-  }
-   
-  logout << text_t2ascii << "collectoraction::create_event_header ERROR: Couldn't create "
-     << "Event Header file " << filename << ". Event logging disabled\n";
-  return false;
-}
-
-text_t collectoraction::get_event_header (cgiargsclass &args) {
-  text_t header = "Greenstone Username: " + args["un"] + "\n";
-  header += "Collection: " + args["bc1dirname"] + "\n";
-  header += "Collection Creator: " + args["bc1contactemail"] + "\n";
-  header += "GSDLHOME: " + gsdlhome + "\n";
-  header += "Build Location: " + get_collectdir(args) + "\n";
-
-  return header;
-}
 
 bool collectoraction::check_sources (cgiargsclass &args, ostream &logout) {
@@ -1946 +1442 @@
 }
 
-// format_url simply strips "http://", "ftp://", or "file://" off the
-// beginning of url if they're there
-text_t collectoraction::format_url (const text_t &url) {
-  text_t::const_iterator begin = url.begin();
-  text_t::const_iterator end = url.end();
-
-  if (url.size() >= 7) {
-    text_t prefix = substr(begin, begin+7);
-    if (prefix == "http://" || prefix == "file://") {
-      return substr(begin+7, end);
-    }
-  }
-  if (url.size() >= 6) {
-    if (substr(begin, begin+6) == "ftp://") {
-      return substr(begin+6, end);
-    }
-  }
-  return url;
+text_t collectoraction::get_button(cgiargsclass &args, const text_t &thispage, 
+                   const text_t &color, 
+                   const text_t &type, bool enabled) 
+{
+
+  if ((color != "green" && color != "grey" && color != "yellow") ||
+      (type != "info" && type != "srce" && type != "conf" && type != "bild" && type != "view"))
+    return g_EmptyText;
+
+  text_t href = "_http"+type+"_";
+  text_t target = "";
+
+  if (thispage == "info" || thispage == "srce" || thispage == "conf" || 
+      thispage == "bildcancel" || thispage == "bildfail") {
+    // call the check submit macro instead of linking directly to the page
+    href="\"javascript:check_submit('"+type+"');\"";
+  } else if (type == "view") {
+    // view button is special case as it needs a target=_top
+    target = " target=_top";
+  }
+
+  text_t tdclass = "wizardbar"+color; 
+  if (enabled) {
+    // link to the appropriate page
+    return "<td class="+tdclass+"><a href="+href+target+">_text"+type+"_</a></td>";
+  }
+  else {
+    // just display the text
+    return "<td class="+tdclass+">_text"+type+"_</td>";
+  }
 }
 
-text_t collectoraction::remove_trailing_slashes (text_t str) {
-
-  while (*(str.end()-1) == '\\') {
-    str.pop_back();
-  }
-  return str;
-}
-
 #endif //GSDL_USE_COLLECTOR_ACTION

trunk/gsdl/src/recpt/collectoraction.h

@@ -30 +30 @@
 #define COLLECTORACTION_H
 
-#include "action.h"
+#include "wizardaction.h"
 #include "receptionist.h"
 
-class collectoraction : public action {
+class collectoraction : public wizardaction {
   
 protected:
-
-  bool disabled;
-  receptionist *recpt;
-  char *gsdlosc;
-  char *gsdlhomec;
-  char *pathc;
-
-  text_t message;
-  char failcode;
 
   bool do_mkcol;
@@ -51 +42 @@
   text_tmap failedsources;
 
-  text_t get_button (const text_t &thispage, const text_t &color, 
-             const text_t &type, bool enabled);
+  void set_fullnamemenu (displayclass &disp, cgiargsclass &args, 
+             recptprotolistclass *protos, ostream &logout);
 
-  void set_fullnamemenu (displayclass &disp, cgiargsclass &args,
-             recptprotolistclass *protos, ostream &logout);
 
   void set_inputsourceboxes (displayclass &disp, cgiargsclass &args, 
@@ -65 +54 @@
   void set_cfgfile (displayclass &disp, cgiargsclass &args, ostream &logout);
 
-  void set_statusline (displayclass &disp, cgiargsclass &args, ostream &logout);
 
   void update_cfgfile_clone (cgiargsclass &args, ostream &logout);
@@ -73 +61 @@
   void update_cfgfile_complete (cgiargsclass &args, ostream &logout);
 
-  text_t carriage_replace (const text_t &intext, int sw);
-
-  text_t get_directory_name (const text_t &fullname);
-
-  bool collection_protected (const text_t &collection);
-
-  bool assign_tmpname (cgiargsclass &args, ostream &logout);
 
   void gsdl_mkcol (cgiargsclass &args, ostream &logout);
 
-  void gsdl_build (cgiargsclass &args, ostream &logout);
 
-  void gsdl_cancel_build (cgiargsclass &args, ostream &logout);
-
-  text_t get_collectdir (cgiargsclass &args);
-
-  bool uses_weird_plugin (const text_t &collection);
-
-  void create_colserver (const text_t &collection, ostream &logout);
-
-  void remove_colservr (const text_t &collection, ostream &logout);
-
-  bool create_event_header_file (const text_t &filename, cgiargsclass &args, 
-                 ostream &logout);
-
-  text_t get_event_header (cgiargsclass &args);
 
   bool check_sources (cgiargsclass &args, ostream &logout);
 
-  text_t format_url (const text_t &url);
+  text_t get_button (cgiargsclass &args, const text_t &thispage, 
+             const text_t &color, 
+             const text_t &type, bool enabled);
 
-  text_t remove_trailing_slashes (text_t str);
 
 public:
@@ -110 +77 @@
   virtual ~collectoraction ();
 
-  void configure (const text_t &key, const text_tarray &cfgline);
-
-  bool init (ostream &logout);
-
-  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
-
   text_t get_action_name () {return "collector";}
 
   bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
               recptprotolistclass *protos, ostream &logout);
-
-  void get_cgihead_info (cgiargsclass &args, recptprotolistclass *protos,
-             response_t &response,text_t &response_data, 
-             ostream &logout);
 
   void define_internal_macros (displayclass &disp, cgiargsclass &args, 
@@ -132 +89 @@
           outconvertclass &outconvert, ostream &textout, 
           ostream &logout);
+
 };
 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -619 +619 @@
   if (get_info (inlink, args["c"], args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
+#ifndef DOCHANDLE
       outlink = "_httpdocument_&d=" + response.docInfo[0].metadata["section"].values[0];
+#else
+      outlink = "_httpdocumenthandle_("+args["c"]+","+response.docInfo[0].metadata["section"].values[0]+")";
+#endif
+
       return true;
     }
@@ -642 +647 @@
       if (get_info (inlink, *col_here, args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
+#ifndef DOCHANDLE
       outlink = "_httpdocument_&c=" + *col_here + "&d=" +
         response.docInfo[0].metadata["section"].values[0];
+#else
+      outlink = "_httpdocumenthandle_("+*col_here+","+response.docInfo[0].metadata["section"].values[0]+")";
+#endif
+
       return true;
     }
@@ -1003 +1013 @@
         << "<frameset rows=\"68,*\" noresize border=0>\n"
         << "<frame scrolling=no frameborder=0 src=\"_gwcgi_?_optsite_e=_compressedoptions_&a=p&p=nav\">\n"
+#ifndef DOCHANDLE
         << "<frame name=\"documenttop\" frameborder=0 src=\"_gwcgi_?_optsite_e=_compressedoptions_&a=d&d=" 
         << args["d"] << "\">"
+#else
+        << "<frame name=\"documenttop\" frameborder=0 src=\"_httpdocumenthandle_(" 
+        << args["c"] << "," << args["d"] << ")\">"
+#endif
         << "<noframes>\n"
         << "<p>You must have a frame enabled browser to view this.</p>\n"
@@ -1297 +1312 @@
   // work out values for next link
   if (haschildren) {
+#ifndef DOCHANLE
     disp.setmacro ("httpnextarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
            "&amp;d=" + arg_d + ".fc");
+#else
+    disp.setmacro ("httpnextarrow", "document", "_httpdocumenthandle_("+args["c"]+","+arg_d + ".fc)";
+
+#endif
+
   } else {
     text_tarray::const_iterator h = next_siblings.begin();
@@ -1304 +1325 @@
     while (h != e) {
       if (!(*h).empty()) {
+#ifndef DOCHANLE
     disp.setmacro ("httpnextarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
                "&amp;d=" + *h);
+#else
+    disp.setmacro ("httpnextarrow", "document", "_httpdocumenthandle_("+args["c"]+","+*h+")";
+
+#endif
+
     break;
       }
@@ -1314 +1341 @@
   // work out value for previous link
   if (!previous_sibling.empty()) {
+#ifndef DOCHANDLE
     disp.setmacro ("httpprevarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
            "&amp;d=" + previous_sibling);
+#else
+    disp.setmacro ("httpprevarrow", "document", "_httpdocumenthandle_("+args["c"]+","+ previous_sibling+")");
+
+#endif
+
   } else {
     if (countchar(arg_d.begin(), arg_d.end(), '.')) {
+#ifndef DOCHANDLE
       disp.setmacro ("httpprevarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
              "&amp;d=" + get_parent(arg_d));
+#else
+      disp.setmacro ("httpprevarrow", "document", "_httpdocumenthandle_("+args["c"]+","+get_parent(arg_d)+")");
+
+#endif
+
     }
   }

trunk/gsdl/src/recpt/gsdl_modules_cfg.h

@@ -53 +53 @@
 #define GSDL_USE_BROWSE_ACTION
 #define GSDL_USE_COLLECTOR_ACTION
+#define GSDL_USE_DEPOSITOR_ACTION
 #define GSDL_USE_EXTLINK_ACTION
 #undef  GSDL_USE_GTI_ACTION

trunk/gsdl/src/recpt/librarymain.cpp

@@ -85 +85 @@
 #include "tipaction.h"
 #include "collectoraction.h"
+#include "depositoraction.h"
 #include "browseaction.h"
 #include "phindaction.h"
@@ -107 +108 @@
 #endif //GSDL_USE_CLASSIFIER_BROWSER
 
+#include "cgicc/Cgicc.h"
+using namespace cgicc;
+
+Cgicc* formData;
+
 int main () {
   receptionist recpt;
@@ -115 +121 @@
 #endif
   text_t       gsdlhome;
+
+  formData = new Cgicc();
 
   cservers = new collectset(gsdlhome);
@@ -200 +208 @@
 #endif
 
+#ifdef GSDL_USE_DEPOSITOR_ACTION
+  depositoraction *adepositoraction = new depositoraction();
+  adepositoraction->set_receptionist (&recpt);
+  recpt.add_action(adepositoraction);
+#endif
+
 #ifdef GSDL_USE_BROWSE_ACTION
   browseaction *abrowseaction = new browseaction();
@@ -276 +290 @@
   thisAction = recpt.get_actionmap_ptr()->begin();
   recpt.get_actionmap_ptr()->erase(thisAction, endAction);
+
+  delete formData;
   return 0;
 }

trunk/gsdl/src/recpt/pageaction.cpp

@@ -45 +45 @@
   status_disabled = true;
   collector_disabled = true;
+  depositor_disabled = true; 
   translator_disabled = true;
   gliapplet_disabled = true;
@@ -586 +587 @@
   // if page is "home" or "homehelp"
   // _textgocollector_     set to "" if collector is disabled in main.cfg
+  // _textgodepositor_     set to "" if depositor is disabled in main.cfg
   // _textgoadmin_         set to "" if status is disabled in main.cfg
   // _textgotranslator_    set to "" if translator is disabled in main.cfg
@@ -669 +671 @@
     if (status_disabled) disp.setmacro ("textgoadmin", "home", "");
     if (collector_disabled) disp.setmacro ("textgocollector", "home", "");
+    if (depositor_disabled) disp.setmacro ("textgodepositor", "home", "");
     if (translator_disabled) disp.setmacro ("textgotranslator", "home", "");
 
@@ -912 +915 @@
          (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
     collector_disabled = false;
-  } else if ((key == "translator") && (cfgline.size() == 1) && 
+  }
+ else if ((key == "depositor") && (cfgline.size() == 1) && 
+         (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
+    depositor_disabled = false;
+  }
+    else if ((key == "translator") && (cfgline.size() == 1) && 
          (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
     translator_disabled = false;

trunk/gsdl/src/recpt/pageaction.h

@@ -95 +95 @@
   bool status_disabled;
   bool collector_disabled;
+  bool depositor_disabled;
   bool translator_disabled;
   bool gliapplet_disabled;