From aae258de99b99e43bba18e0448e472340df872e6 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Mon, 18 Jul 2011 18:46:18 +0000
Subject: Allow references to scripts deep in the tree

---
 project2/commonObjects.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'project2/commonObjects.cpp')

diff --git a/project2/commonObjects.cpp b/project2/commonObjects.cpp
index 1d0b13e..63d4d1d 100644
--- a/project2/commonObjects.cpp
+++ b/project2/commonObjects.cpp
@@ -5,8 +5,6 @@
 
 CommonObjects::~CommonObjects()
 {
-	rowSets.clear();
-	datasources.clear();
 }
 
 RowSetPtr
@@ -22,7 +20,8 @@ CommonObjects::getSource(const std::string & name) const
 CommonObjects::DataSources::const_iterator
 CommonObjects::loadDataSource(const std::string & name) const
 {
-	XmlScriptParser xml(ApplicationEngine::getCurrent()->env()->getDatasourceRoot(), name, true);
+	XmlScriptParser xml(Environment::getCurrent()->resolveScript(
+				Environment::getCurrent()->getDatasourceRoot(), name), true);
 
 	LoaderBase loader(true);
 	loader.supportedStorers.insert(Storer::into(&datasources));
-- 
cgit v1.2.3