Changeset 1308

Show
Ignore:
Timestamp:
26.07.2000 16:59:46 (19 years ago)
Author:
sjboddie
Message:

fixed a minor bug that was causing problems for end-user collection
building

Location:
trunk/gsdl/src/recpt
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/cgiwrapper.cpp

    r1285 r1308  
    637637      ofstream errout (eout, ios::app); 
    638638      delete eout; 
     639      // note that the following line appears to cause a runtime  
     640      // error using debug versions of VC++ 6.0 (on windows) 
    639641      cerr = errout; 
    640642     
  • trunk/gsdl/src/recpt/nullproto.cpp

    r1285 r1308  
    6565    if ((*here).second.c != NULL) { 
    6666      const colservrconf &configinfo = (*here).second.c->get_configinfo (); 
     67      bool failed = false; 
    6768 
    6869      // configure this collection server 
     
    7879           << configinfo.collection << "\", gsdlhome=\"" 
    7980           << configinfo.gsdlhome << "\"\n"; 
    80     //  return false; //**** 
    81     here ++; 
    82     continue; 
     81    failed = true;  
    8382      } 
    8483 
     
    9089           << configinfo.collection << "\", gsdlhome=\""  
    9190           << configinfo.gsdlhome << "\"\n"; 
    92     //  return false; //**** 
    93     here ++; 
    94     continue; 
     91    failed = true; 
    9592      } 
    9693 
    97       if (!(*here).second.c->init (logout)) return false; 
     94      // don't bother initializing if one of the config files 
     95      // wasn't read correctly 
     96      if (!failed) { 
     97    if (!(*here).second.c->init (logout)) return false; 
     98      } 
    9899    } 
    99100    here++;