Changeset 1886

Timestamp:

2001-01-31T15:03:30+13:00 (23 years ago)

Author:

sjboddie

Message:

Caught local library up with changes brought about when corba stuff
was added.

Location:

trunk/gsdl/src

Files:

• colservr/collectset.cpp (modified) (1 diff)
• colservr/collectset.h (modified) (1 diff)
• w32server/cgiwrapper.cpp (modified) (3 diffs)

trunk/gsdl/src/colservr/collectset.cpp

@@ -79 +79 @@
     text_tarray cfgline;
     text_t key;
-    text_t filename = filename_cat(collectdir, *thiscol, "index/build.cfg");
+    text_t filename = filename_cat(collectdir, *thiscol, "index" , "build.cfg");
     ifstream confin(filename.getcstr());
 

trunk/gsdl/src/colservr/collectset.h

@@ -22 +22 @@
  public:
   collectset(text_t &gsdlhome);
+  // this constructor is used by the local library
+  collectset() {}
+
   ~collectset();
 

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -363 +363 @@
   if (!checkdir (gsdl_gsdlhome + "\\macros\\")) return 0;
 
+  collectset *cservers = new collectset();
+
   // get all collections from each gsdlhome (this relies 
   // on there not being more than one collection with the same 
@@ -453 +455 @@
     this_gdbmhome = (*it).second.gsdl_gdbmhome;
 
-    nproto.add_collection (*thiscol, &recpt, this_gsdlhome, this_gdbmhome);
+    cservers->add_collection (*thiscol, &recpt, this_gsdlhome, this_gdbmhome);
     
     thiscol ++;
   }
+
+  // set up the null protocol
+  nproto.set_collectset(cservers);
   
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
-
-  // add other converters
-  utf8inconvertclass *utf8inconvert = new utf8inconvertclass();
-  utf8outconvertclass *utf8outconvert = new utf8outconvertclass();
-  recpt.add_converter ("u", utf8inconvert, utf8outconvert);
-  
-  mapinconvertclass *gbinconvert = new mapinconvertclass();
-  gbinconvert->setmapfile (gsdl_gsdlhome, "gbku", 0x25a1);
-  mapoutconvertclass *gboutconvert = new mapoutconvertclass();
-  gboutconvert->setmapfile (gsdl_gsdlhome, "ugbk", 0xa1f5);
-  recpt.add_converter ("g", gbinconvert, gboutconvert);
   
   // the list of actions.
@@ -584 +578 @@
   GlobalMemoryStatus(&memstatus);
   baseavailvirtual = memstatus.dwAvailVirtual; // save for later comparison
-    
+
   return 1;
 }