Changeset 1886

Show
Ignore:
Timestamp:
31.01.2001 15:03:30 (19 years ago)
Author:
sjboddie
Message:

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

Location:
trunk/gsdl/src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/colservr/collectset.cpp

    r1860 r1886  
    7979    text_tarray cfgline; 
    8080    text_t key; 
    81     text_t filename = filename_cat(collectdir, *thiscol, "index/build.cfg"); 
     81    text_t filename = filename_cat(collectdir, *thiscol, "index" , "build.cfg"); 
    8282    ifstream confin(filename.getcstr()); 
    8383 
  • trunk/gsdl/src/colservr/collectset.h

    r1860 r1886  
    2222 public: 
    2323  collectset(text_t &gsdlhome); 
     24  // this constructor is used by the local library 
     25  collectset() {} 
     26 
    2427  ~collectset(); 
    2528 
  • trunk/gsdl/src/w32server/cgiwrapper.cpp

    r1739 r1886  
    363363  if (!checkdir (gsdl_gsdlhome + "\\macros\\")) return 0; 
    364364 
     365  collectset *cservers = new collectset(); 
     366 
    365367  // get all collections from each gsdlhome (this relies  
    366368  // on there not being more than one collection with the same  
     
    453455    this_gdbmhome = (*it).second.gsdl_gdbmhome; 
    454456 
    455     nproto.add_collection (*thiscol, &recpt, this_gsdlhome, this_gdbmhome); 
     457    cservers->add_collection (*thiscol, &recpt, this_gsdlhome, this_gdbmhome); 
    456458     
    457459    thiscol ++; 
    458460  } 
     461 
     462  // set up the null protocol 
     463  nproto.set_collectset(cservers); 
    459464   
    460465  // add the protocol to the receptionist 
    461466  recpt.add_protocol (&nproto); 
    462  
    463   // add other converters 
    464   utf8inconvertclass *utf8inconvert = new utf8inconvertclass(); 
    465   utf8outconvertclass *utf8outconvert = new utf8outconvertclass(); 
    466   recpt.add_converter ("u", utf8inconvert, utf8outconvert); 
    467    
    468   mapinconvertclass *gbinconvert = new mapinconvertclass(); 
    469   gbinconvert->setmapfile (gsdl_gsdlhome, "gbku", 0x25a1); 
    470   mapoutconvertclass *gboutconvert = new mapoutconvertclass(); 
    471   gboutconvert->setmapfile (gsdl_gsdlhome, "ugbk", 0xa1f5); 
    472   recpt.add_converter ("g", gbinconvert, gboutconvert); 
    473467   
    474468  // the list of actions. 
     
    584578  GlobalMemoryStatus(&memstatus); 
    585579  baseavailvirtual = memstatus.dwAvailVirtual; // save for later comparison 
    586      
     580 
    587581  return 1; 
    588582}