diff options
Diffstat (limited to 'project2/iterate.cpp')
| -rw-r--r-- | project2/iterate.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/project2/iterate.cpp b/project2/iterate.cpp index 843d598..59f41ff 100644 --- a/project2/iterate.cpp +++ b/project2/iterate.cpp @@ -2,7 +2,8 @@ #include <boost/foreach.hpp> #include <syslog.h> #include "xmlObjectLoader.h" -#include "sqlIterate.h" +#include "sqlRows.h" +#include "fileRows.h" #include "task.h" _Iterate::_Iterate(const xmlpp::Element * p) : @@ -10,8 +11,8 @@ _Iterate::_Iterate(const xmlpp::Element * p) : _NoOutputExecute(p) { Loaders loaders; - _Iterate::AddLoaders(loaders, subIterates); - _Task::AddLoaders(loaders, subIterates); + _Iterate::AddLoaders(loaders, subNOEs); + _Task::AddLoaders(loaders, subNOEs); _LoaderBase::collectAll(loaders, "project2", p, true, true); } @@ -20,24 +21,19 @@ _Iterate::~_Iterate() } void -_Iterate::AddLoaders(Loaders & l, Iterates & iterates) -{ - l.insert(LoadersVT("sqliterate", _LoaderBase::Make<_SqlIterate, _Iterate, std::string, _SourceObject, &_SourceObject::name>(&iterates))); -} - -void _Iterate::AddLoaders(Loaders & l, NoOutputExecutes & iterates) { l.insert(LoadersVT("sqliterate", _LoaderBase::Make<_SqlIterate, _NoOutputExecute, unsigned int, _SourceObject, &_SourceObject::order>(&iterates))); + l.insert(LoadersVT("fileiterate", _LoaderBase::Make<_FileIterate, _NoOutputExecute, unsigned int, _SourceObject, &_SourceObject::order>(&iterates))); } void -_Iterate::executeChildren(const ApplicationEngine * ep, const PerRowValues * parent) const +_Iterate::executeChildren() const { try { PerRowValues::beginRow(this); - BOOST_FOREACH(NoOutputExecutes::value_type sq, subIterates) { - sq.second->execute(ep, this); + BOOST_FOREACH(NoOutputExecutes::value_type sq, subNOEs) { + sq.second->execute(); } PerRowValues::endRow(this); } |