Changeset 1964 for trunk/cstr

Timestamp:

2001-02-13T15:49:48+13:00 (23 years ago)

Author:

nzdl

Message:

* empty log message *

Location:

trunk/cstr

Files:

• etc/collect.cfg (modified) (2 diffs)
• macros/cstr.dm (modified) (1 diff)
• src/recpt/cstrlibrarymain.cpp (modified) (6 diffs)

trunk/cstr/etc/collect.cfg

@@ -7 +7 @@
 defaultindex  document:text
 
-macrofiles    style.dm base.dm query.dm help.dm \
-              pref.dm about.dm document.dm \
-              english.dm chinese.dm maori.dm \
-              cstr.dm
+macrofiles      style.dm base.dm query.dm help.dm pref.dm \
+                about.dm document.dm status.dm authen.dm \
+                users.dm html.dm extlink.dm \
+                english.dm chinese.dm french.dm german.dm maori.dm \
+                english2.dm french2.dm arabic.dm spanish.dm dutch.dm \
+        port.dm collect.dm cstr.dm
+
 
 plugin        GMLPlug
@@ -38 +41 @@
 collectionmeta .document:text "documents"
 
-receptionist   /fast-cgi-bin/cstrlibrary?a=p&p=about
+receptionist   /cgi-bin/cstrlibrary?a=p&p=about
 
 

trunk/cstr/macros/cstr.dm

@@ -1 +1 @@
 package Global
 
-_httppagehome_ [c=cstr] {/fast-cgi-bin/library?a=p&p=home}
+_httppagehome_ [c=cstr] {/cgi-bin/library?a=p&p=home}
 
 package document

trunk/cstr/src/recpt/cstrlibrarymain.cpp

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
  *
  *********************************************************************/
 
-/*
-   $Log$
-   Revision 1.4  2000/04/04 04:43:07  nzdl
-   caught cstr collection up with DocumentColumn stuff
-
-   Revision 1.3  2000/02/21 21:45:08  sjboddie
-   gsdlhome now set from gsdlsite.cfg
-
-   Revision 1.2  2000/02/06 21:25:22  sjboddie
-   updated cstr
-
-   Revision 1.1  1999/09/07 21:49:43  sjboddie
-   new cstr receptionist
-
- */
-
 #include "receptionist.h"
+#include "collectset.h"
 #include "cgiwrapper.h"
 #include "nullproto.h"
-#include "collectserver.h"
-#include "filter.h"
-#include "browsefilter.h"
-#include "queryfilter.h"
-#include "infodbclass.h"
-#include "mgsearch.h"
-#include "mggdbmsource.h"
 #include "fileutil.h"
 #include <assert.h>
@@ -63 +40 @@
 #include "authenaction.h"
 #include "usersaction.h"
-#include "authenaction.h"
 
 #include "browserclass.h"
@@ -78 +54 @@
   receptionist recpt;
   nullproto nproto;
-  
-  // add a collection server
-  text_tarray collections;
-  collections.push_back ("cstr");
 
+  text_t gsdlhome, httpdomain, httpprefix;
   // get gsdlhome (if we fail the error will be picked up later -- in
   // cgiwrapper)
-  text_t gsdlhome;
-  site_cfg_read (gsdlhome);
+  site_cfg_read (gsdlhome, httpdomain, httpprefix);
+  collectset *cservers = new collectset();
+  cservers->add_collection ("cstr", &recpt, gsdlhome, gsdlhome);
 
-  text_tarray::const_iterator thiscol = collections.begin();
-  text_tarray::const_iterator endcol = collections.end();
+  nproto.set_collectset(cservers);
 
-  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
-    queryfilterclass *queryfilter = new queryfilterclass();
-    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);
-    
-    // inform collection server and everything it contains about its
-    // collection name
-    cserver->configure ("collection", *thiscol);
-    
-    nproto.add_collectserver (cserver);
-    thiscol ++;
-  }
+  // configure the receptionist server list
+  cservers->setReceptionistServers(recpt, gsdlhome);  
   
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
-
-  // add other converters
-  utf8inconvertclass utf8inconvert;
-  utf8outconvertclass utf8outconvert;
-  recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
-
-  if (!gsdlhome.empty()) {
-    mapinconvertclass gbinconvert;
-    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
-    mapoutconvertclass gboutconvert;
-    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
-    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
-  }
 
   // the list of actions. Note: these actions will become invalid
@@ -152 +77 @@
 
   pageaction apageaction;
+  apageaction.set_receptionist (&recpt);
   recpt.add_action (&apageaction);
 
@@ -158 +84 @@
 
   queryaction aqueryaction;
+  aqueryaction.set_receptionist (&recpt);
   recpt.add_action (&aqueryaction);
 
   cstrdocaction adocumentaction;
+  adocumentaction.set_receptionist (&recpt);
   recpt.add_action (&adocumentaction);
 
@@ -193 +121 @@
   return 0;
 }
-
-
-
-