Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 91:c35eee0cbd12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
service
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 28 Sep 2012 13:41:20 +0200
parents 8936a3bbb129
children a6e41de88a53
comparison
equal deleted inserted replaced
90:10184c6eabc0 91:c35eee0cbd12
47 Toolbox::ReadFile(content, configurationFile); 47 Toolbox::ReadFile(content, configurationFile);
48 printf("Using the configuration from: [%s]\n", configurationFile); 48 printf("Using the configuration from: [%s]\n", configurationFile);
49 } 49 }
50 else 50 else
51 { 51 {
52 #if ORTHANC_STANDALONE == 1 && defined(__linux) 52 #if 0 && ORTHANC_STANDALONE == 1 && defined(__linux)
53 // Unused anymore
53 // Under Linux, try and open "../../etc/orthanc/Configuration.json" 54 // Under Linux, try and open "../../etc/orthanc/Configuration.json"
54 try 55 try
55 { 56 {
56 boost::filesystem::path p = Toolbox::GetDirectoryOfExecutable(); 57 boost::filesystem::path p = Toolbox::GetDirectoryOfExecutable();
57 p = p.parent_path().parent_path(); 58 p = p.parent_path().parent_path();
68 printf("Using the default Orthanc configuration\n"); 69 printf("Using the default Orthanc configuration\n");
69 return; 70 return;
70 } 71 }
71 72
72 #elif ORTHANC_STANDALONE == 1 73 #elif ORTHANC_STANDALONE == 1
73 // No default path for the configuration file in Windows 74 // No default path for the standalone configuration
74 printf("Using the default Orthanc configuration\n"); 75 printf("Using the default Orthanc configuration\n");
75 return; 76 return;
76 77
77 #else 78 #else
78 // In a non-standalone build, we use the 79 // In a non-standalone build, we use the