Changeset 15589

Show
Ignore:
Timestamp:
20.05.2008 11:40:38 (11 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) Replacing almost all "gdbmhome" with "dbhome".

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

Legend:

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

    r7432 r15589  
    4444  if (key == "gsdlhome") { 
    4545    gsdlhome = cfgline[0]; 
    46     if (gdbmhome.empty()) gdbmhome = cfgline[0]; 
     46    if (dbhome.empty()) dbhome = cfgline[0]; 
    4747  } 
    48   if (key == "gdbmhome") {gdbmhome = cfgline[0];} 
     48  if (key == "gdbmhome") {dbhome = cfgline[0];} 
    4949} 
    5050 
  • gsdl/trunk/src/recpt/action.h

    r12507 r15589  
    4848  cgiargsinfoclass argsinfo; 
    4949  text_t gsdlhome; 
    50   text_t gdbmhome; 
     50  text_t dbhome; 
    5151 
    5252public: 
  • gsdl/trunk/src/recpt/authenaction.cpp

    r15433 r15589  
    131131 
    132132bool authenaction::init (ostream &logout) { 
    133   if (gdbmhome.empty()) { 
    134     logout << "ERROR (authenaction::init) gdbmhome is not set\n"; 
     133  if (dbhome.empty()) { 
     134    logout << "ERROR (authenaction::init) dbhome is not set\n"; 
    135135    return false; 
    136136  } 
  • gsdl/trunk/src/recpt/cgiwrapper.cpp

    r15402 r15589  
    312312   
    313313  cout << text_t2ascii << "gsdlhome=" << configinfo.gsdlhome << "\n"; 
    314   if (!configinfo.gdbmhome.empty()) 
    315     cout << text_t2ascii << "gdbmhome=" << configinfo.gdbmhome << "\n"; 
     314  if (!configinfo.dbhome.empty()) 
     315    cout << text_t2ascii << "dbhome=" << configinfo.dbhome << "\n"; 
    316316  cout << text_t2ascii << "httpprefix=" << configinfo.httpprefix << "\n"; 
    317317  cout << text_t2ascii << "httpimg=" << configinfo.httpimg << "\n"; 
  • gsdl/trunk/src/recpt/queryaction.cpp

    r15433 r15589  
    950950    text_t userid = args["z"]; 
    951951    text_tarray entries; 
    952     if (get_history_info (userid, entries, gdbmhome, logout)) { 
     952    if (get_history_info (userid, entries, dbhome, logout)) { 
    953953      int count = 1; 
    954954      text_tarray::iterator here = entries.begin(); 
     
    18121812  int hd = args.getintarg("hd"); 
    18131813  if (hd > 0) display=true; 
    1814   if (set_history_info(userid, query, gdbmhome, display)) return true; 
     1814  if (set_history_info(userid, query, dbhome, display)) return true; 
    18151815  else return false; 
    18161816 
  • gsdl/trunk/src/recpt/receptionist.cpp

    r15418 r15589  
    5252void recptconf::clear () { 
    5353  gsdlhome.clear(); 
    54   gdbmhome.clear(); 
     54  dbhome.clear(); 
    5555  collectinfo.erase(collectinfo.begin(), collectinfo.end()); 
    5656  collection.clear(); 
     
    9393void collectioninfo_t::clear () { 
    9494  gsdl_gsdlhome.clear(); 
    95   gsdl_gdbmhome.clear(); 
     95  gsdl_dbhome.clear(); 
    9696 
    9797  info_loaded = false; 
     
    220220    if (key == "gsdlhome") { 
    221221      configinfo.gsdlhome = cfgline[0]; 
    222       if (configinfo.gdbmhome.empty()) configinfo.gdbmhome = cfgline[0]; 
    223     } 
    224     else if (key == "gdbmhome") configinfo.gdbmhome = cfgline[0]; 
     222      if (configinfo.dbhome.empty()) configinfo.dbhome = cfgline[0]; 
     223    } 
     224    else if (key == "gdbmhome") configinfo.dbhome = cfgline[0]; 
    225225    else if (key == "collection") { 
    226226      configinfo.collection = cfgline[0]; 
     
    272272    collectioninfo_t cinfo; 
    273273    cinfo.gsdl_gsdlhome = cfgline[1]; 
    274     cinfo.gsdl_gdbmhome = cfgline[2]; 
     274    cinfo.gsdl_dbhome = cfgline[2]; 
    275275    configinfo.collectinfo[cfgline[0]] = cinfo; 
    276276      } 
     
    705705  } 
    706706 
    707   text_t logfile = filename_cat (configinfo.gdbmhome, "etc", "usage.txt"); 
     707  text_t logfile = filename_cat (configinfo.dbhome, "etc", "usage.txt"); 
    708708 
    709709  text_t logstr = script_name; 
  • gsdl/trunk/src/recpt/receptionist.h

    r12509 r15589  
    5555 
    5656  text_t gsdl_gsdlhome; 
    57   text_t gsdl_gdbmhome; 
     57  text_t gsdl_dbhome; 
    5858 
    5959  bool info_loaded; 
     
    7777struct recptconf { 
    7878   text_t gsdlhome; 
    79    text_t gdbmhome;   // will equal gsdlhome if not set 
     79   text_t dbhome;   // will equal gsdlhome if not set 
    8080   text_t collection; // will equal "" in 'general' mode 
    8181   text_t collectdir; // will equal gsdlhome in 'general' mode 
  • gsdl/trunk/src/recpt/statusaction.cpp

    r12508 r15589  
    882882                   ostream &textout, ostream &/*logout*/) { 
    883883 
    884   text_t maincfgfile = filename_cat (gdbmhome, "etc", "main.cfg"); 
     884  text_t maincfgfile = filename_cat (dbhome, "etc", "main.cfg"); 
    885885 
    886886  textout << outconvert << disp << "_status:infoheader_(main.cfg)\n" 
  • gsdl/trunk/src/recpt/usersaction.cpp

    r14269 r15589  
    152152bool usersaction::init (ostream &logout) { 
    153153 
    154   if (gdbmhome.empty()) { 
    155     logout << "ERROR (usersaction::init) gdbmhome is not set\n"; 
     154  if (dbhome.empty()) { 
     155    logout << "ERROR (usersaction::init) dbhome is not set\n"; 
    156156    return false; 
    157157  }