Merge pull request #925 from RussWhitehead/issue709

Fix gh-709 StandAlone data file location fix
Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

dali/base/dautils.hpp

@@ -129,7 +129,7 @@ public:
     const CDfsLogicalFileName &multiItem(unsigned idx) const;
     const void resolveWild();  // only for multi
     IPropertyTree *createSuperTree() const;
-    void allowOsPath(bool set=true) { allowospath = true; } // allow local OS path to be specified
+    void allowOsPath(bool allow=true) { allowospath = allow; } // allow local OS path to be specified
 };
 
 // abstract class, define getCmdText to return tracing text of commands

ecl/eclagent/eclagent.cpp

@@ -3233,19 +3233,12 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
             PrintLog("ECLAGENT build %s", BUILD_TAG);
             startLogMsgParentReceiver();    
             connectLogMsgManagerToDali();
-            StringBuffer datadir;
-            StringBuffer repdir;
-
-            const char * overrideBaseDirectory = "hthor";         // relative to UserDataDirectory in dali
-            const char * overrideReplicateDirectory = "hthor";    // relative to UserMirrorDirectory in dali
-            if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"data","eclagent",agentTopology->queryProp("@name"),datadir))
-                overrideBaseDirectory = datadir.str();
-            if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"mirror","eclagent",agentTopology->queryProp("@name"),repdir))
-                overrideReplicateDirectory = repdir.str();
-            if (overrideBaseDirectory&&*overrideBaseDirectory)
-                setBaseDirectory(overrideBaseDirectory, false);
-            if (overrideReplicateDirectory&&*overrideReplicateDirectory)
-                setBaseDirectory(overrideReplicateDirectory, true);
+
+            StringBuffer baseDir;
+            if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"data","eclagent",agentTopology->queryProp("@name"),baseDir.clear()))
+                setBaseDirectory(baseDir.str(), false);
+            if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"mirror","eclagent",agentTopology->queryProp("@name"),baseDir.clear()))
+                setBaseDirectory(baseDir.str(), true);
 
             if (standAloneWorkUnit)
             {