[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
Validation queue job bug-1180220-schema-tools-2013-06-04T17-37-42.364Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180220-schema-tools-2013-06-04T17-37-42.364Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module has been updated. Description changed to: Removed unnecessary #include. This is a prerequisite for bug 1180220. The rest of the apparent changes are just to replace tabs with spaces. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180220-schema-tools into lp:zorba/schema-tools-module
Paul J. Lucas has proposed merging
lp:~zorba-coders/zorba/bug-1180220-schema-tools into
lp:zorba/schema-tools-module.
Commit message:
Removed unnecessary #include. This is a prerequisite for bug 1180220.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351
Removed unnecessary #include. This is a prerequisite for bug 1180220.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-schema-tools/+merge/167351
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 2012-04-05 11:51:23 +
+++ src/schema-tools.xq.src/schema-tools.cpp 2013-06-04 17:30:35 +
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -66,14 +65,14 @@
theDataManager(Zorba::getInstance(0)->getXmlDataManager())
{}
- ~Inst2xsdFunction()
+~Inst2xsdFunction()
{}
public:
- virtual String getURI() const
- { return theModule->getURI(); }
+virtual String getURI() const
+{ return theModule->getURI(); }
- virtual String getLocalName() const
+virtual String getLocalName() const
{ return "inst2xsd-internal"; }
virtual ItemSequence_t
@@ -84,29 +83,29 @@
class Xsd2instFunction : public ContextualExternalFunction
{
- private:
- const ExternalModule* theModule;
- ItemFactory* theFactory;
- XmlDataManager* theDataManager;
+ private:
+const ExternalModule* theModule;
+ItemFactory* theFactory;
+XmlDataManager* theDataManager;
- public:
- Xsd2instFunction(const ExternalModule* aModule) :
+ public:
+Xsd2instFunction(const ExternalModule* aModule) :
theModule(aModule),
theFactory(Zorba::getInstance(0)->getItemFactory()),
- theDataManager(Zorba::getInstance(0)->getXmlDataManager())
- {}
-
- ~Xsd2instFunction()
-{}
-
- public:
- virtual String getURI() const
- { return theModule->getURI(); }
-
- virtual String getLocalName() const
+ theDataManager(Zorba::getInstance(0)->getXmlDataManager())
+{}
+
+~Xsd2instFunction()
+{}
+
+ public:
+virtual String getURI() const
+{ return theModule->getURI(); }
+
+virtual String getLocalName() const
{ return "xsd2inst-internal"; }
- virtual ItemSequence_t
+virtual ItemSequence_t
evaluate(const ExternalFunction::Arguments_t& args,
const zorba::StaticContext*,
const zorba::DynamicContext*) const;
@@ -115,28 +114,28 @@
class SchemaToolsModule : public ExternalModule {
private:
- ExternalFunction* inst2xsd;
- ExternalFunction* xsd2inst;
+ExternalFunction* inst2xsd;
+ExternalFunction* xsd2inst;
- public:
+ public:
SchemaToolsModule() :
- inst2xsd(new Inst2xsdFunction(this)),
+ inst2xsd(new Inst2xsdFunction(this)),
xsd2inst(new Xsd2instFunction(this))
- {}
+{}
- ~SchemaToolsModule()
- {
- delete inst2xsd;
- delete xsd2inst;
+~SchemaToolsModule()
+{
+ delete inst2xsd;
+ delete xsd2inst;
}
- virtual String getURI() const
- { return SCHEMATOOLS_MODULE_NAMESPACE; }
+virtual String getURI() const
+{ return SCHEMATOOLS_MODULE_NAMESPACE; }
virtual ExternalFunction* getExternalFunction(const String& localName);
- virtual void destroy()
- {
+virtual void destroy()
+{
delete this;
}
};
@@ -220,15 +219,15 @@
ExternalFunction* SchemaToolsModule::getExternalFunction(const String& localName)
{
if (localName == "inst2xsd-internal")
- {
- return inst2xsd;
- }
+ {
+return inst2xsd;
+ }
else if (localName == "xsd2inst-internal")
- {
- return xsd2inst;
- }
+ {
+return xsd2inst;
+ }
- return 0;
+ return 0;
}
@@ -237,41 +236,41 @@
const zorba::StaticContext* aStaticContext,
const zorba::DynamicContext* aDynamincContext) const
{
- jthrowable lException = 0;
- static JNIEnv* env;
+ jthrowable lException = 0;
+ static JNIEnv* env;
- try
+ try
{
env = zorba::jvm::JavaVMSingleton::getInstance(aStaticContext)->getEnv();
- // Local variables
- Zorba_SerializerOptions_t lOptions;
- lOptions.omit_xml_declaration = ZORBA_OMIT_XML_DECLARATION_YES;
- Serializer_t lSerializer = Serializer::createSerializer(lOptions);
- jclass myClass;
- jmethodID myMethod;
+// Local variables
+Zorba_SerializerOptions_t lOptions;
+lOptions.omit_xml_declaration = ZORBA_OMIT_XML_DECLARATION_YES;
+Serializer_t lSerializer = Serializer::createSerializer(lOptions);
+jclass myClass;
+jmethodID myMethod;
- // read input param 0
+// read input param 0
Iterator_t lIter = args[0]->getIterator();
- lIter->open();
-
- Item item;
- std::vector xmlUtfVec;
-
- while( lIter->next(item) )
- {
- // Searialize Item
- std::ostringstream os;
- SingletonItemS
