Changeset 19820

Show
Ignore:
Timestamp:
12.06.2009 15:39:06 (10 years ago)
Author:
mdewsnip
Message:

Now also looks for collect/<collection>/custom/<collection>/etc/custom.cfg files too, to be consistent with src/colservr/colservrconfig.cpp.

Files:
1 modified

Legend:

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

    r16347 r19820  
    8787      rv |= recpt.read_configfile(filename); 
    8888    } 
     89 
     90    // Look for custom.cfg in <collecthome>/collection-name/custom/collection-name/etc too 
     91    filename = filename_cat (collecthome, collection, "custom", collection, "etc", "custom.cfg"); 
     92    if (file_exists(filename)) 
     93    { 
     94      rv |= recpt.read_configfile(filename); 
     95    } 
    8996  } 
    9097  return rv;