zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #24794
[Merge] lp:~zorba-coders/zorba/mz-schema-tools-module into lp:zorba/schema-tools-module
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/mz-schema-tools-module into lp:zorba/schema-tools-module.
Commit message:
XmlDataManager is not a singleton anymore
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620
XmlDataManager is not a singleton anymore
--
https://code.launchpad.net/~zorba-coders/zorba/mz-schema-tools-module/+merge/178620
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.
=== modified file 'src/schema-tools.xq.src/schema-tools.cpp'
--- src/schema-tools.xq.src/schema-tools.cpp 2013-06-12 14:02:42 +0000
+++ src/schema-tools.xq.src/schema-tools.cpp 2013-08-05 18:27:25 +0000
@@ -57,13 +57,11 @@
private:
const ExternalModule* theModule;
ItemFactory* theFactory;
- XmlDataManager* theDataManager;
public:
Inst2xsdFunction(const ExternalModule* aModule) :
theModule(aModule),
- theFactory(Zorba::getInstance(0)->getItemFactory()),
- theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+ theFactory(Zorba::getInstance(0)->getItemFactory())
{}
~Inst2xsdFunction()
@@ -77,23 +75,22 @@
{ return "inst2xsd-internal"; }
virtual ItemSequence_t
- evaluate(const ExternalFunction::Arguments_t& args,
- const zorba::StaticContext*,
- const zorba::DynamicContext*) const;
+ evaluate(const ExternalFunction::Arguments_t& args,
+ const zorba::StaticContext*,
+ const zorba::DynamicContext*) const;
};
+
class Xsd2instFunction : public ContextualExternalFunction
{
private:
const ExternalModule* theModule;
ItemFactory* theFactory;
- XmlDataManager* theDataManager;
public:
Xsd2instFunction(const ExternalModule* aModule) :
theModule(aModule),
- theFactory(Zorba::getInstance(0)->getItemFactory()),
- theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+ theFactory(Zorba::getInstance(0)->getItemFactory())
{}
~Xsd2instFunction()
@@ -355,7 +352,7 @@
//std::cout << " lBinaryString '" << lBinaryString << "'" << std::endl; std::cout.flush();
std::stringstream lStream(lBinaryString);
- Item lRes = theDataManager->parseXML(lStream);
+ Item lRes = Zorba::getInstance(0)->getXmlDataManager()->parseXML(lStream);
vec.push_back(lRes);
}
@@ -538,7 +535,7 @@
//std::cout << " lBinaryString '" << lBinaryString << "'" << std::endl; std::cout.flush();
std::stringstream lStream(lBinaryString);
- Item lRes = theDataManager->parseXML(lStream);
+ Item lRes = Zorba::getInstance(0)->getXmlDataManager()->parseXML(lStream);
return ItemSequence_t(new SingletonItemSequence(lRes));
}
Follow ups