summaryrefslogtreecommitdiff
path: root/project2/commonObjects.cpp
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2011-07-18 18:46:18 +0000
committerrandomdan <randomdan@localhost>2011-07-18 18:46:18 +0000
commitaae258de99b99e43bba18e0448e472340df872e6 (patch)
tree2713d8909eb14f0dd28b830454e9b501f678b819 /project2/commonObjects.cpp
parentAutomatically sort the order of the MailParts to make life carefree and fix t... (diff)
downloadproject2-aae258de99b99e43bba18e0448e472340df872e6.tar.bz2
project2-aae258de99b99e43bba18e0448e472340df872e6.tar.xz
project2-aae258de99b99e43bba18e0448e472340df872e6.zip
Allow references to scripts deep in the tree
Diffstat (limited to 'project2/commonObjects.cpp')
-rw-r--r--project2/commonObjects.cpp5
1 files changed, 2 insertions, 3 deletions
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));