Changeset 268 for trunk/gsdl/src/recpt

Timestamp:

1999-06-15T13:56:12+12:00 (25 years ago)

Author:

sjboddie

Message:

Got multiple collections working

File:

• trunk/gsdl/src/recpt/librarymain.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/06/15 01:56:12  sjboddie
+   Got multiple collections working
+
    Revision 1.6  1999/05/10 03:40:39  sjboddie
    lots of changes - slowly getting document action sorted out
@@ -51 +54 @@
   nullproto nproto;
   
-  // add a collection server for each collection ... (not implemented yet)
-  //  text_tarray collections;
-  //  collections.push_back ("gberg");
-  //  collections.push_back ("hdl");
+  // add a collection server for each collection
+  text_tarray collections;
+  collections.push_back ("gberg");
+  collections.push_back ("hdl");
 
-  //  text_tarray::const_iterator thiscol = collections.begin();
-  //  text_tarray::const_iterator endcol = collections.end();
+  text_tarray::const_iterator thiscol = collections.begin();
+  text_tarray::const_iterator endcol = collections.end();
 
-  //  while (thiscol != endcol) {
+  while (thiscol != endcol) {
 
-    collectserver cserver;
-    gdbmclass gdbmhandler;
-    mgsearchclass mgsearch;
-
+    // 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;
-    cserver.add_filter (&filter);
+    filterclass *filter = new filterclass ();
+    cserver->add_filter (filter);
     
     // add a browse filter
-    browsefilterclass browsefilter;
-    browsefilter.set_gdbmptr (&gdbmhandler);
-    cserver.add_filter (&browsefilter);
+    browsefilterclass *browsefilter = new browsefilterclass();
+    browsefilter->set_gdbmptr (gdbmhandler);
+    cserver->add_filter (browsefilter);
     
     // add a query filter
-    queryfilterclass queryfilter;
-    queryfilter.set_gdbmptr (&gdbmhandler);
-    queryfilter.set_mgsearchptr (&mgsearch);
-    cserver.add_filter (&queryfilter);
+    queryfilterclass *queryfilter = new queryfilterclass();
+    queryfilter->set_gdbmptr (gdbmhandler);
+    queryfilter->set_mgsearchptr (mgsearch);
+    cserver->add_filter (queryfilter);
     
     // add a mg and gdbm source
-    mggdbmsourceclass mggdbmsource;
-    mggdbmsource.set_gdbmptr (&gdbmhandler);
-    mggdbmsource.set_mgsearchptr (&mgsearch);
-    cserver.add_source (&mggdbmsource);
+    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", "hdl");
+    cserver->configure ("collection", *thiscol);
     
-    nproto.add_collectserver (&cserver);
-    //    thiscol ++;
-    //  }
-
+    nproto.add_collectserver (cserver);
+    thiscol ++;
+  }
+  
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
 
-  cgiwrapper (recpt, "hdl");
+  cgiwrapper (recpt, "");
   return 0;
 }