[Omc-commit] SF.net SVN: omc: [405] clp/trunk/src

[<bni...@us...>]

Revision: 405
          http://svn.sourceforge.net/omc/?rev=405&view=rev
Author:   bnicholes
Date:     2006-11-29 12:05:27 -0800 (Wed, 29 Nov 2006)

Log Message:
-----------
allow each of the omcclpX binaries to use a different configuration file.

Modified Paths:
--------------
    clp/trunk/src/omcclp.cpp
    clp/trunk/src/omcclpc.cpp
    clp/trunk/src/omcclpprogram.cpp

Modified: clp/trunk/src/omcclp.cpp
===================================================================
--- clp/trunk/src/omcclp.cpp	2006-11-29 00:10:32 UTC (rev 404)
+++ clp/trunk/src/omcclp.cpp	2006-11-29 20:05:27 UTC (rev 405)
@@ -378,6 +378,8 @@
             String val = parser.getOptionValue(E_CMDOPT_CONFIG);
             clpsvrt.setConfFilename(val);
         }
+        else
+            clpsvrt.setConfFilename(OMCCLP_SYSCONF_DIR"/omcclp.conf");
         if (parser.isSet(E_CMDOPT_DEBUG))
         {
             clpsvrt.setDebugMode(true);
@@ -407,6 +409,8 @@
                 String val = parser.getOptionValue(E_CMDOPT_CONFIG);
                 clpt.setConfFilename(val);
             }
+            else
+                clpt.setConfFilename(OMCCLP_SYSCONF_DIR"/omcclp.conf");
             if (parser.isSet(E_CMDOPT_CMD))
             {
                 String val = parser.getOptionValue(E_CMDOPT_CMD);

Modified: clp/trunk/src/omcclpc.cpp
===================================================================
--- clp/trunk/src/omcclpc.cpp	2006-11-29 00:10:32 UTC (rev 404)
+++ clp/trunk/src/omcclpc.cpp	2006-11-29 20:05:27 UTC (rev 405)
@@ -692,6 +692,8 @@
             String val = parser.getOptionValue(E_CMDOPT_CONFIG);
             clp.setConfFilename(val);
         }
+        else
+            clp.setConfFilename(OMCCLP_SYSCONF_DIR"/omcclpc.conf");
         if (parser.isSet(E_CMDOPT_CMD))
         {
             String val = parser.getOptionValue(E_CMDOPT_CMD);

Modified: clp/trunk/src/omcclpprogram.cpp
===================================================================
--- clp/trunk/src/omcclpprogram.cpp	2006-11-29 00:10:32 UTC (rev 404)
+++ clp/trunk/src/omcclpprogram.cpp	2006-11-29 20:05:27 UTC (rev 405)
@@ -284,8 +284,8 @@
 bool OMCCLPProgram::initializeCLPSession()
 {
     /* Open the main configuration file */
-	loadConfigItemsFromFile(getConfigItem(OMCClpdConfigOpts::CONFIG_FILE_opt, 
-		OMCCLPD_DEFAULT_CONFIG_FILE));
+    String conffile = getConfFilename();
+    loadConfigItemsFromFile(conffile.length() ? conffile : OMCCLPD_DEFAULT_CONFIG_FILE);
 
     String url = getCIMURL();
     String ns = getCIMNamespace();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.