Changeset 15587

Show
Ignore:
Timestamp:
20.05.2008 11:24:59 (12 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) Changed a lot of "gdbmhome" to "dbhome".

Location:
gsdl/trunk/src/colservr
Files:
8 modified

Legend:

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

    r15558 r15587  
    8080  } 
    8181  // get the filename for the database and make sure it exists 
    82   db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem); 
     82  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem); 
    8383 
    8484  if (littleEndian()) db_filename += ".ldb"; 
  • gsdl/trunk/src/colservr/collectserver.cpp

    r15419 r15587  
    8484    } 
    8585    else if (key == "gsdlhome") configinfo.gsdlhome = value; 
    86     else if (key == "gdbmhome") configinfo.gdbmhome = value; 
     86    else if (key == "gdbmhome") configinfo.dbhome = value; 
    8787    else if (key == "collection") { 
    8888      configinfo.collection = value; 
  • gsdl/trunk/src/colservr/collectserver.h

    r15002 r15587  
    5959struct colservrconf { 
    6060  text_t gsdlhome; 
    61   text_t gdbmhome; 
     61  text_t dbhome; 
    6262  text_t collection; 
    6363  text_t collectdir; 
  • gsdl/trunk/src/colservr/filter.cpp

    r9620 r15587  
    4646    else if (key == "collectdir") collectdir = value; 
    4747    else if (key == "gsdlhome") gsdlhome = value; 
    48     else if (key == "gdbmhome") gdbmhome = value; 
     48    else if (key == "gdbmhome") dbhome = value; 
    4949    else if ((key == "filteroptdefault") && (cfgline.size() == 2)) { 
    5050      // see if this filter has an option with this name 
     
    7070  } 
    7171 
    72   if (gdbmhome.empty()) gdbmhome = gsdlhome; 
     72  if (dbhome.empty()) dbhome = gsdlhome; 
    7373   
    7474  // get the collection directory name 
  • gsdl/trunk/src/colservr/filter.h

    r2212 r15587  
    3636protected: 
    3737  text_t gsdlhome; 
    38   text_t gdbmhome; 
     38  text_t dbhome; 
    3939  text_t collection; 
    4040  text_t collectdir; 
  • gsdl/trunk/src/colservr/gdbmsource.cpp

    r15584 r15587  
    4848    else if (key == "collectdir") collectdir = value; 
    4949    else if (key == "gsdlhome") gsdlhome = value; 
    50     else if (key == "gdbmhome") gdbmhome = value; 
     50    else if (key == "gdbmhome") dbhome = value; 
    5151  } 
    5252 
     
    7777  outconvertclass text_t2ascii; 
    7878   
    79   if (gdbmhome.empty()) gdbmhome = gsdlhome; 
     79  if (dbhome.empty()) dbhome = gsdlhome; 
    8080 
    8181  if (!sourceclass::init (logout)) return false; 
     
    117117    indexstem = collection; 
    118118  } 
    119   db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem); 
     119  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem); 
    120120  if (littleEndian()) db_filename += ".ldb"; 
    121121  else db_filename += ".bdb"; 
  • gsdl/trunk/src/colservr/gdbmsource.h

    r15584 r15587  
    4040protected: 
    4141  text_t gsdlhome; 
    42   text_t gdbmhome; 
     42  text_t dbhome; 
    4343  text_t collection; 
    4444  text_t collectdir; 
  • gsdl/trunk/src/colservr/queryfilter.cpp

    r15558 r15587  
    409409    indexstem = collection; 
    410410  } 
    411   db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem); 
     411  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem); 
    412412 
    413413  if (littleEndian()) db_filename += ".ldb";