Changeset 1649 for trunk/gsdl/src/w32server/cgiwrapper.cpp

Timestamp:

2000-11-03T10:21:01+13:00 (23 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/w32server/cgiwrapper.cpp (modified) (3 diffs)

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 ++;