Changeset 16347

Show
Ignore:
Timestamp:
10.07.2008 14:46:12 (11 years ago)
Author:
davidb
Message:

Tidying up of some of the use of filename_cat

Files:
1 modified

Legend:

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

    r16310 r16347  
    4747 
    4848  text_t collecthome = filename_cat(gsdlhome,"collect"); 
     49 
     50  cerr << "Setting collecthome to be " << collecthome << endl; 
     51 
     52 
    4953  return main_cfg_read(recpt,gsdlhome,collecthome,collection); 
    5054} 
     
    6266  text_t key, filename; 
    6367  text_tarray cfgline; 
    64   filename = filename_cat (gsdlhome, "etc"); 
    65   filename = filename_cat (filename, "main.cfg"); 
     68  filename = filename_cat (gsdlhome, "etc", "main.cfg"); 
    6669  if (!collection.empty() && file_exists(filename)) { 
    6770    rv = recpt.read_configfile(filename); 
    6871  } else { 
    69     filename_cat (filename, gsdlhome, "etc", "main.cfg"); 
    7072    if (file_exists (filename)) { 
    7173      rv = recpt.read_configfile(filename); 
     
    7678  // (if this is for a particular collection), and then GSDLHOME/etc. 
    7779  if (!collection.empty()) { 
    78     filename = filename_cat (collecthome, collection); 
    79     filename = filename_cat (filename, "etc"); 
    80     filename = filename_cat (filename, "collect.cfg"); 
     80    filename = filename_cat (collecthome, collection, "etc", "collect.cfg"); 
    8181    if (!file_exists (filename)) { 
    82       filename = filename_cat (gsdlhome, "etc"); 
    83       filename = filename_cat (filename, "collect.cfg"); 
     82      filename = filename_cat (gsdlhome, "etc", "collect.cfg"); 
    8483      if (!file_exists (filename)) filename.clear(); 
    8584    }