Changeset 14376

Show
Ignore:
Timestamp:
20.08.2007 15:14:53 (12 years ago)
Author:
mdewsnip
Message:

Changed to read custom collect.cfg file from "custom" collection sub-directory, to match changes to building code.

Files:
1 modified

Legend:

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

    r9631 r14376  
    6868  text_t filename = filename_cat (gsdlhome, "collect"); 
    6969  filename = filename_cat (filename, collection); 
     70  filename = filename_cat (filename, "custom"); 
     71  filename = filename_cat (filename, collection); 
    7072  filename = filename_cat (filename, "etc"); 
    71   filename = filename_cat (filename, "collect.cfg"); 
     73  filename = filename_cat (filename, "custom.cfg"); 
     74 
    7275  if (!file_exists (filename)) { 
    73     filename = filename_cat (gsdlhome, "etc"); 
     76    filename = filename_cat (gsdlhome, "collect"); 
     77    filename = filename_cat (filename, collection); 
     78    filename = filename_cat (filename, "etc"); 
    7479    filename = filename_cat (filename, "collect.cfg"); 
    75     if (!file_exists (filename)) return false; 
     80 
     81    if (!file_exists (filename)) { 
     82      filename = filename_cat (gsdlhome, "etc"); 
     83      filename = filename_cat (filename, "collect.cfg"); 
     84      if (!file_exists (filename)) return false; 
     85    } 
    7686  } 
    7787