[Zorba-coders] [Bug 917577] [NEW] Module namespaces inconsistency
Public bug reported: Some module namespace have inconsistent naming conventions. For instance w3c seems to prefer - over _ in its namespaces and zorba namespaces should follow: http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml http://www.zorba-xquery.com/modules/project_xqdoc ** Affects: zorba Importance: Undecided Assignee: Matthias Brantner (matthias-brantner) Status: New ** Summary changed: - Namespace inconsistency + Module namespaces inconsistency ** Changed in: zorba Assignee: (unassigned) => Matthias Brantner (matthias-brantner) -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/917577 Title: Module namespaces inconsistency Status in Zorba - The XQuery Processor: New Bug description: Some module namespace have inconsistent naming conventions. For instance w3c seems to prefer - over _ in its namespaces and zorba namespaces should follow: http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml http://www.zorba-xquery.com/modules/project_xqdoc To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/917577/+subscriptions -- 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] [Bug 914686] Re: Inconsistent Make target dependencies
I was not able to reproduce the problem. ** Changed in: zorba Status: New => Invalid -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/914686 Title: Inconsistent Make target dependencies Status in Zorba - The XQuery Processor: Invalid Bug description: Something seems fishy in the make doc target dependencies. I'm doing the following: - $build-folder: make doc - Add new module in ZORBA_MODULES - $build-folder: make doc Throws an error. Where: - $build-folder: make doc - Add new module in ZORBA_MODULES - $build-folder: make - $build-folder: make doc Works like a charm. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/914686/+subscriptions -- 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:~danielturcanu/zorba/plan-serializer into lp:zorba
I would like to understand this better. What is the problem that this change fixes? -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba. -- 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/bug905035 into lp:zorba
I think I agree with Chris' comment about having a getNamespaceBindings() method instead. Any reason why it was not done that way? -- https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88271 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~danielturcanu/zorba/plan-serializer into lp:zorba
The user_functions were compiled during plan serialization, and this modified some expr trees that were already serialized. I had to ensure that all user_functions are compiled before plan serialization is started. -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba. -- 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/phpapi into lp:zorba
I fixed the typo and added doc comments for the XQueryIterator. -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~danielturcanu/zorba/plan-serializer into lp:zorba
> The user_functions were compiled during plan serialization, and this modified > some expr trees that were already serialized. I had to ensure that all > user_functions are compiled before plan serialization is started. Yes, I understood that myself, but what exactly was modified after having been serialized? -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba. -- 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/phpapi into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/phpapi into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
Matthias Brantner (matthias-brantner)
Rodolfo Ochoa (rodolfo-ochoa)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853
This merge adds the PHP API that was introduced at the PHP Tour 2011.
It contains a test for it (php2).
>From the last merge proposal, the following things have been done:
- Revert bogus change in swig/php/generate_proxy.php.in (renaming of libPrefix
to prefix).
- Introduce a STD Iterator for streaming results.
- Make the parseXML() method private.
- Improve importQueryFromURI
The two key tests are:
- php1
- php2
--
https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-01-11 17:30:25 +
+++ ChangeLog 2012-01-17 13:39:27 +
@@ -20,6 +20,7 @@
* Added split function to the string module that allows for streamable tokenization but doesn't have regular expression
support.
* zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
+ * Add new XQuery interface for the PHP bindings.
* Added API method Item::getNamespaceBindings().
version 2.1
=== modified file 'doc/php/CMakeLists.txt'
--- doc/php/CMakeLists.txt 2011-06-20 12:44:21 +
+++ doc/php/CMakeLists.txt 2012-01-17 13:39:27 +
@@ -1,4 +1,4 @@
-# Copyright 2006-2008 The FLWOR Foundation.
+# Copyright 2006-2012 The FLWOR Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
=== modified file 'doc/php/examples/CMakeLists.txt'
--- doc/php/examples/CMakeLists.txt 2011-08-19 00:03:31 +
+++ doc/php/examples/CMakeLists.txt 2012-01-17 13:39:27 +
@@ -1,4 +1,4 @@
-# Copyright 2006-2008 The FLWOR Foundation.
+# Copyright 2006-2012 The FLWOR Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,14 +20,21 @@
MESSAGE(STATUS "PHP Path:" ${phpPath})
SET(phpExtensionPath ${CMAKE_BINARY_DIR}/swig/php)
MESSAGE(STATUS "PHP Extension Path: " ${phpExtensionPath})
+ SET(phpIncludePath ${CMAKE_BINARY_DIR}/swig/php)
+ MESSAGE(STATUS "PHP Include Path: " ${phpExtensionPath})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/php.ini.in ${CMAKE_CURRENT_BINARY_DIR}/php.ini)
MESSAGE(STATUS "Configuration file: " ${CMAKE_CURRENT_BINARY_DIR}/php.ini)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/simple.php.in ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
MESSAGE(STATUS "Simple configuration file: " ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
- ADD_TEST("php" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test.php.in ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ MESSAGE(STATUS "PHP test file configured: " ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ ADD_TEST("php1" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
MESSAGE(STATUS "Installing: " ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
-
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/simple.php
+ ADD_TEST("php2" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ MESSAGE(STATUS "Installing: " ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+
+
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/simple.php ${CMAKE_CURRENT_BINARY_DIR}/test.php
COMPONENT "php_examples"
DESTINATION
share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/php/examples)
=== modified file 'doc/php/examples/php.ini.in'
--- doc/php/examples/php.ini.in 2009-10-30 16:34:37 +
+++ doc/php/examples/php.ini.in 2012-01-17 13:39:27 +
@@ -1,2 +1,3 @@
enable_dl=On
extension_dir=@phpExtensionPath@
+include_path=".:@phpIncludePath@"
\ No newline at end of file
=== modified file 'doc/php/examples/simple.php.in'
--- doc/php/examples/simple.php.in 2011-08-04 02:14:56 +
+++ doc/php/examples/simple.php.in 2012-01-17 13:39:27 +
@@ -1,6 +1,6 @@
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+require '@phpPath@/Zorba/XQueryProcessor.php';
+
+function omitXMLDecl($xml)
+{
+ $xml = str_replace('', '', $xml);
+ $xml = trim($xml);
+ return $xml;
+}
+
+function assertEquality($test, $reference, $label)
+{
+ $test = omitXMLDecl($test);
+ echo "=\n";
+ var_dump($test);
+ var_dump($reference);
+ if($test != $reference) {
+throw n
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba
For example in one test, in flwor_expr object, theClauses was receiving another flwor_clause in the vector, which made the vector to increase and move to another space. But the initial flwor_clause had already been serialized, and its address was registered for address duplication detection. Sometimes another object would be allocated at the same address, and the plan serializer thought it is the same object. This only occured sometimes, so the problem was hard to debug. So as a rule, all the objects should freeze during plan serialization, nothing should change. -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783 Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba. -- 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/phpapi into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/phpapi into lp:zorba has been updated. Commit Message changed to: This merge adds the PHP API that was introduced at the PHP Tour 2011. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 913822] Re: Debugger: Interrupt execution with Ctrl-C and stop at next breakpoint
Added this functionality in lp:~zorba-coders/zorba/debugger_ctrl_c. ** Changed in: zorba Assignee: (unassigned) => Gabriel Petrovay (gabipetrovay) ** Changed in: zorba Milestone: None => 2.2 ** Changed in: zorba Status: New => Incomplete ** Changed in: zorba Status: Incomplete => In Progress ** Branch linked: lp:~zorba-coders/zorba/debugger_ctrl_c -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/913822 Title: Debugger: Interrupt execution with Ctrl-C and stop at next breakpoint Status in Zorba - The XQuery Processor: In Progress Bug description: When a long query runs and the user presses Ctrl-C, the zorba execution must be stopped at the next breakable position. The debugger client must not be quit. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/913822/+subscriptions -- 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/debugger_ctrl_c into lp:zorba
Gabriel Petrovay has proposed merging lp:~zorba-coders/zorba/debugger_ctrl_c
into lp:zorba.
Requested reviews:
Gabriel Petrovay (gabipetrovay)
David Graf (davidagraf)
Related bugs:
Bug #913822 in Zorba: "Debugger: Interrupt execution with Ctrl-C and stop at
next breakpoint"
https://bugs.launchpad.net/zorba/+bug/913822
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/debugger_ctrl_c/+merge/88918
Added Ctrl-C hooking in the debugger. Ctrl-C can not kill the debugger anymore.
It will only stop the running query.
--
https://code.launchpad.net/~zorba-coders/zorba/debugger_ctrl_c/+merge/88918
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt 2012-01-11 17:30:25 +
+++ bin/CMakeLists.txt 2012-01-17 18:50:35 +
@@ -31,6 +31,7 @@
SET (DEBUG_CLIENT_SRCS
debugger/main.cpp
+debugger/xqdb_client.cpp
debugger/process_listener.cpp
debugger/command_prompt.cpp
debugger/command_line_handler.cpp
=== modified file 'bin/debugger/command_prompt.cpp'
--- bin/debugger/command_prompt.cpp 2012-01-11 17:30:25 +
+++ bin/debugger/command_prompt.cpp 2012-01-17 18:50:35 +
@@ -94,6 +94,8 @@
void
CommandPrompt::execute()
{
+ bool lWithOutput = true;
+
for (;;) {
#ifdef ZORBA_HAVE_LIBEDIT_H
const char* lBuf;
@@ -101,10 +103,19 @@
lBuf = el_gets(theEditLine, &lCharsRead);
std::string lCommandLine(lBuf, lCharsRead - 1);
#else
-std::cout << "(xqdb) ";
+if (lWithOutput) {
+ std::cout << "(xqdb) ";
+}
+lWithOutput = true;
std::string lCommandLine;
std::getline(std::cin, lCommandLine);
+if (std::cin.fail()) {
+ lWithOutput = false;
+ std::cin.clear();
+ continue;
+}
#endif
+
std::vector lArgs;
// split the command into arguments
=== modified file 'bin/debugger/main.cpp'
--- bin/debugger/main.cpp 2012-01-11 17:30:25 +
+++ bin/debugger/main.cpp 2012-01-17 18:50:35 +
@@ -24,67 +24,27 @@
#include
-#include "command_prompt.h"
-#include "command_line_handler.h"
+#include "xqdb_client.h"
#include "process_listener.h"
+
using namespace zorba;
using namespace zorba::debugger;
-class XqdbClient {
-
- public:
-
-XqdbClient(unsigned int aPort)
-{
- theIdQueue = new LockFreeQueue();
- theQuitQueue = new LockFreeQueue();
- theEventHandler = new EventHandler(*theIdQueue, *theQuitQueue);
- theEventHandler->init();
-
- theCommandPrompt = new CommandPrompt();
- theCommandLineHandler = new CommandLineHandler(aPort, *theIdQueue, *theQuitQueue, theEventHandler, theCommandPrompt);
-}
-
-~XqdbClient()
-{
- if (theCommandLineHandler) {
-delete theCommandLineHandler;
- }
- if (theCommandPrompt) {
-delete theCommandPrompt;
- }
- if (theEventHandler) {
-delete theEventHandler;
- }
-
- delete theIdQueue;
- delete theQuitQueue;
-}
-
-void start()
-{
- theCommandLineHandler->execute();
-}
-
- private:
-
-LockFreeQueue* theIdQueue;
-LockFreeQueue*theQuitQueue;
-
-EventHandler* theEventHandler;
-CommandPrompt* theCommandPrompt;
-CommandLineHandler* theCommandLineHandler;
-};
+
+std::auto_ptr theClient;
void
onExitProcess(ExitCode aExitCode) {
- //if (aExitCode != -1) {
- // std::cout << "Zorba has exited with code: " << aExitCode << std::endl;
- //}
- std::cout << "Terminating debugger client."<< std::endl;
- // TODO: and the memory?
+ std::cout << std::endl << "Terminating debugger client." << std::endl;
+
+#ifndef WIN32
+ XqdbClient* lClient = theClient.release();
+ if (lClient) {
+delete lClient;
+ }
+#endif
exit(aExitCode);
}
@@ -314,6 +274,23 @@
return true;
}
+#ifdef WIN32
+BOOL WINAPI
+ctrlC_Handler(DWORD aCtrlType)
+{
+ if (CTRL_C_EVENT == aCtrlType) {
+return true;
+ }
+ return false;
+}
+#else
+void
+ctrlC_Handler(int lParam)
+{
+ //exit(1);
+}
+#endif
+
#ifndef _WIN32_WCE
int
main(int argc, char* argv[])
@@ -322,6 +299,12 @@
_tmain(int argc, _TCHAR* argv[])
#endif
{
+#ifdef WIN32
+ SetConsoleCtrlHandler(ctrlC_Handler, TRUE);
+#else
+ signal(SIGINT, ctrlC_Handler);
+#endif
+
// **
// processing arguments
@@ -369,12 +352,19 @@
// **
// start the debugger command line
-std::auto_ptr theClient(new XqdbClient(lPort));
+theClient.reset(new XqdbClient(lPort));
theClient->start();
} catch (...) {
return -1;
}
+#ifndef WIN32
+ XqdbClient* lClient = theClient.release();
+ if (lClient) {
+delete lClient;
+ }
+#endif
+
return 0;
}
=== added file 'bin/debugger/xqdb_client.cpp'
--- bin/debugger/xqdb_client.cpp 1970-01-01 00:00:00 +
+++ bin/debugger/xqdb_client.cpp 2012-01-17 18:50:35 +
@@ -0
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/debugger_ctrl_c into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/debugger_ctrl_c/+merge/88918 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 913822] Re: Debugger: Interrupt execution with Ctrl-C and stop at next breakpoint
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/913822 Title: Debugger: Interrupt execution with Ctrl-C and stop at next breakpoint Status in Zorba - The XQuery Processor: Fix Committed Bug description: When a long query runs and the user presses Ctrl-C, the zorba execution must be stopped at the next breakable position. The debugger client must not be quit. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/913822/+subscriptions -- 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/bug905035 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug905035 into
lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Hybridum (hybridum)
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #905035 in Zorba: "there is no way to get the Namespace Prefixes"
https://bugs.launchpad.net/zorba/+bug/905035
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922
Implemented StaticContext::getNamespaceBindings to resolve bug #905035. In the
same commit, the function getNamespaceURIByPrefix was deprecated because it's
superseded by the new function.
--
https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-01-11 17:30:25 +
+++ ChangeLog 2012-01-17 19:11:32 +
@@ -21,6 +21,8 @@
support.
* zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
* Added API method Item::getNamespaceBindings().
+ * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
+ * Deprecated StaticContext:getNamespaceURIByPrefix()
version 2.1
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2011-12-21 14:40:33 +
+++ include/zorba/static_context.h 2012-01-17 19:11:32 +
@@ -99,10 +99,21 @@
* could be found for the given prefix and an DiagnosticHandler has been
* registered.
* @throw ZorbaException if an error occured (e.g. no URI could be found for the given prefix).
+ *
+ * @deprecated This function is deprecated. Use getNamespaceBindings instead.
*/
virtual String
getNamespaceURIByPrefix( const String& aPrefix ) const = 0;
+ /**
+ * \brief Get the list of all namespace bindings (prefix, uri)
+ * declared in this and its parent static contexts.
+ *
+ * @param aBindings the bindings are added to this list
+ */
+ virtual void
+ getNamespaceBindings( NsBindings& aBindings ) const = 0;
+
/** \brief Set the default element and type namespace
* (see http://www.w3.org/TR/xquery/#static_context)
*
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2012-01-11 17:30:25 +
+++ src/api/staticcontextimpl.cpp 2012-01-17 19:11:32 +
@@ -215,6 +215,37 @@
return "";
}
+/***
+
+/
+void
+StaticContextImpl::getNamespaceBindings( NsBindings& aBindings ) const
+{
+ try
+ {
+store::NsBindings lBindings;
+theCtx->get_namespace_bindings(lBindings);
+
+for (store::NsBindings::const_iterator lIter = lBindings.begin();
+ lIter != lBindings.end(); ++lIter)
+{
+ aBindings.push_back(
+std::pair(
+ lIter->first.str(),
+ lIter->second.str()
+)
+ );
+}
+ }
+ catch (ZorbaException const& e)
+ {
+ZorbaImpl::notifyError(theDiagnosticHandler, e);
+ }
+ catch (std::exception const& e)
+ {
+ZorbaImpl::notifyError(theDiagnosticHandler, e.what());
+ }
+}
/***
=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h 2011-12-21 14:40:33 +
+++ src/api/staticcontextimpl.h 2012-01-17 19:11:32 +
@@ -78,6 +78,9 @@
String getNamespaceURIByPrefix( const String& prefix ) const;
+ void
+ getNamespaceBindings( NsBindings& aBindings ) const;
+
bool setDefaultElementAndTypeNamespace( const String& URI );
String getDefaultElementAndTypeNamespace( ) const;
=== modified file 'test/unit/CMakeLists.txt'
--- test/unit/CMakeLists.txt 2012-01-11 17:30:25 +
+++ test/unit/CMakeLists.txt 2012-01-17 19:11:32 +
@@ -94,6 +94,7 @@
xquery_functions.cpp
xmldatamanager.cpp
staticcollectionmanager.cpp
+ static_context.cpp
)
IF (NOT ZORBA_NO_FULL_TEXT)
=== added file 'test/unit/static_context.cpp'
--- test/unit/static_context.cpp 1970-01-01 00:00:00 +
+++ test/unit/static_context.cpp 2012-01-17 19:11:32 +
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2006-2012 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+using namespace std;
+using namespace zorba;
+using namespace zorba::locale;
+
+b
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug905035 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug905035 into lp:zorba has been updated. Commit Message changed to: Implemented StaticContext::getNamespaceBindings to resolve bug #905035. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922 -- https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug905035 into lp:zorba
I have adapted the fix as suggested. However, I'm not sure how to address Rodolfo's issues regarding other language bindings. This seems to be a bigger problem which is present in many places in our api. -- https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/phpapi into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/phpapi-2012-01-17T19-41-11.72Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug905035 into lp:zorba
Review: Approve I think I can use it like it is now... BTW: NSBindings class is no on zorba website's documentation -- https://code.launchpad.net/~zorba-coders/zorba/bug905035/+merge/88922 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/phpapi into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message): Validation queue job phpapi-2012-01-17T19-41-11.72Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/phpapi into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 917923] [NEW] undeclared variable in built-in module if called through invoke
Public bug reported:
[err:XPDY0002]: "r:foo": undeclared variable is raised for the following
scenario.
--
A built-in module such as random declares a variable as follows:
declare variable $r:foo := 1;
--
A library module foo declares a variable and accesses $r:foo in a function.
module namespace foo = "http://foo.com/";;
import module namespace r = 'http://www.zorba-
xquery.com/modules/random';
declare variable $foo:blub := 1;
declare function foo:bar()
{
$r:foo
};
--
A main module imports the library module foo and invokes the function foo:bar()
import module namespace invoke =
'http://www.zorba-xquery.com/modules/reflection';
import module namespace foo = "http://foo.com/"; at
"/home/mbrantner/zorba/build/foo.xq";
invoke:invoke-s ( fn:QName ( 'http://foo.com/', 'bar' ) )
** Affects: zorba
Importance: Critical
Assignee: Markos Zaharioudakis (markos-za)
Status: New
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/917923
Title:
undeclared variable in built-in module if called through invoke
Status in Zorba - The XQuery Processor:
New
Bug description:
[err:XPDY0002]: "r:foo": undeclared variable is raised for the
following scenario.
--
A built-in module such as random declares a variable as follows:
declare variable $r:foo := 1;
--
A library module foo declares a variable and accesses $r:foo in a function.
module namespace foo = "http://foo.com/";;
import module namespace r = 'http://www.zorba-
xquery.com/modules/random';
declare variable $foo:blub := 1;
declare function foo:bar()
{
$r:foo
};
--
A main module imports the library module foo and invokes the function
foo:bar()
import module namespace invoke =
'http://www.zorba-xquery.com/modules/reflection';
import module namespace foo = "http://foo.com/"; at
"/home/mbrantner/zorba/build/foo.xq";
invoke:invoke-s ( fn:QName ( 'http://foo.com/', 'bar' ) )
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/917923/+subscriptions
--
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] [Bug 905035] Re: there is no way to get the Namespace Prefixes
** Changed in: zorba Status: New => In Progress -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/905035 Title: there is no way to get the Namespace Prefixes Status in Zorba - The XQuery Processor: In Progress Bug description: you can use the method: getNamespaceURIByPrefix( prefix ) but there is no way to know all namespace prefixes... it is required by XQJ standard to have this functionality. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/905035/+subscriptions -- 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/bug900677 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug900677 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) William Candillon (wcandillon) Related bugs: Bug #900677 in Zorba: "XQDDF access-keys($index) function" https://bugs.launchpad.net/zorba/+bug/900677 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Added a keys() function to the index dml module. This fixes bug #900677. -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2012-01-11 17:30:25 + +++ ChangeLog 2012-01-18 01:01:25 + @@ -21,6 +21,8 @@ support. * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors * Added API method Item::getNamespaceBindings(). + * Added a function to the http://www.zorba-xquery.com/modules/store/static/indexes/dml module which returns +the value of all keys contained in an index. version 2.1 === modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq' --- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq 2011-11-01 15:59:24 + +++ modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq 2012-01-18 01:01:25 + @@ -268,3 +268,28 @@ :) declare updating function idml:refresh-index($name as xs:QName) external; +(:~ + : The keys function returns a sequence of all keys contained in the + : index with the given name. + : + : @param $name The QName of the index + : @return The result of the function is sequence of elements each representing + : one key contained in the index. Each element has the following + : structure: + : + :+ : + : + : + : Note that the order of the attribute elements reflects the order of + : the keys in the index specification. Also note that the values in + : these attributes have the type that is declared in the corresponding + : index specification. + : + : @error zerr:ZDDY0021 if the index with name $name is not declared. + : @error zerr:ZDDY0023 if the index with name $name does not exist. + :) +declare function idml:keys($name as xs:QName) as node()* external; === modified file 'src/functions/library.cpp' --- src/functions/library.cpp 2011-10-14 07:35:51 + +++ src/functions/library.cpp 2012-01-18 01:01:25 + @@ -41,6 +41,7 @@ #include "functions/func_fnput.h" #include "functions/func_hoist.h" #include "functions/func_index_ddl.h" +#include "functions/func_index_func.h" #include "functions/func_ic_ddl.h" #include "functions/func_maths.h" #include "functions/func_nodes.h" @@ -106,6 +107,7 @@ populate_context_errors_and_diagnostics(sctx); populate_context_fnput(sctx); populate_context_index_ddl(sctx); + populate_context_index_func(sctx); populate_context_ic_ddl(sctx); populate_context_maths(sctx); populate_context_nodes(sctx); === added file 'src/functions/pregenerated/func_index_func.cpp' --- src/functions/pregenerated/func_index_func.cpp 1970-01-01 00:00:00 + +++ src/functions/pregenerated/func_index_func.cpp 2012-01-18 01:01:25 + @@ -0,0 +1,63 @@ +/* + * Copyright 2006-2008 The FLWOR Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// ** +// ** +// * THIS IS A GENERATED FILE. DO NOT EDIT! * +// * SEE .xml FILE WITH SAME NAME * +// ** +// ** + + +#include "stdafx.h" +#include "runtime/indexing/index_func.h" +#include "functions/func_index_func.h" + + +namespace zorba{ + + + +PlanIter_t zorba_store_indexes_static_dml_keys::codegen( + CompilerCB*, + static_context* sctx, + const QueryLoc& loc, + std::vector& argv, + AnnotationHolder& ann) const +{ + return new IndexKeysIterator(sctx, loc, argv); +} + +void populate_context_index_func(static_context* sctx) +{ + { + + +DECL_WITH_KIND(sctx, zorba_store_indexes_static_dml_keys, +(createQName("http://www.zorba-xquery.com/modules/store/static/indexes/dml","","keys";), +GENV_TYPESYSTEM.QNAME_TYPE_ONE, +GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), +FunctionCons+ : + : + :
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug900677-2012-01-18T01-02-56.733Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 900677] Re: XQDDF access-keys($index) function
** Changed in: zorba Status: New => In Progress -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/900677 Title: XQDDF access-keys($index) function Status in Zorba - The XQuery Processor: In Progress Bug description: XQDDF lacks a function for reading index keys from an index. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/900677/+subscriptions -- 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] [Bug 900677] Re: XQDDF access-keys($index) function
** Branch linked: lp:~zorba-coders/zorba/bug900677 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/900677 Title: XQDDF access-keys($index) function Status in Zorba - The XQuery Processor: In Progress Bug description: XQDDF lacks a function for reading index keys from an index. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/900677/+subscriptions -- 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/bug900677 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message): Validation queue job bug900677-2012-01-18T01-02-56.733Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88972 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug900677 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) William Candillon (wcandillon) Related bugs: Bug #900677 in Zorba: "XQDDF access-keys($index) function" https://bugs.launchpad.net/zorba/+bug/900677 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Added a keys() function to the index dml module. This fixes bug #900677. -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2012-01-11 17:30:25 + +++ ChangeLog 2012-01-18 01:10:33 + @@ -21,6 +21,8 @@ support. * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors * Added API method Item::getNamespaceBindings(). + * Added a function to the http://www.zorba-xquery.com/modules/store/static/indexes/dml module which returns +the value of all keys contained in an index. version 2.1 === modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq' --- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq 2011-11-01 15:59:24 + +++ modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq 2012-01-18 01:10:33 + @@ -268,3 +268,28 @@ :) declare updating function idml:refresh-index($name as xs:QName) external; +(:~ + : The keys function returns a sequence of all keys contained in the + : index with the given name. + : + : @param $name The QName of the index + : @return The result of the function is sequence of elements each representing + : one key contained in the index. Each element has the following + : structure: + : + :+ : + : + : + : Note that the order of the attribute elements reflects the order of + : the keys in the index specification. Also note that the values in + : these attributes have the type that is declared in the corresponding + : index specification. + : + : @error zerr:ZDDY0021 if the index with name $name is not declared. + : @error zerr:ZDDY0023 if the index with name $name does not exist. + :) +declare function idml:keys($name as xs:QName) as node()* external; === modified file 'src/functions/library.cpp' --- src/functions/library.cpp 2011-10-14 07:35:51 + +++ src/functions/library.cpp 2012-01-18 01:10:33 + @@ -41,6 +41,7 @@ #include "functions/func_fnput.h" #include "functions/func_hoist.h" #include "functions/func_index_ddl.h" +#include "functions/func_index_func.h" #include "functions/func_ic_ddl.h" #include "functions/func_maths.h" #include "functions/func_nodes.h" @@ -106,6 +107,7 @@ populate_context_errors_and_diagnostics(sctx); populate_context_fnput(sctx); populate_context_index_ddl(sctx); + populate_context_index_func(sctx); populate_context_ic_ddl(sctx); populate_context_maths(sctx); populate_context_nodes(sctx); === added file 'src/functions/pregenerated/func_index_func.cpp' --- src/functions/pregenerated/func_index_func.cpp 1970-01-01 00:00:00 + +++ src/functions/pregenerated/func_index_func.cpp 2012-01-18 01:10:33 + @@ -0,0 +1,63 @@ +/* + * Copyright 2006-2008 The FLWOR Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// ** +// ** +// * THIS IS A GENERATED FILE. DO NOT EDIT! * +// * SEE .xml FILE WITH SAME NAME * +// ** +// ** + + +#include "stdafx.h" +#include "runtime/indexing/index_func.h" +#include "functions/func_index_func.h" + + +namespace zorba{ + + + +PlanIter_t zorba_store_indexes_static_dml_keys::codegen( + CompilerCB*, + static_context* sctx, + const QueryLoc& loc, + std::vector& argv, + AnnotationHolder& ann) const +{ + return new IndexKeysIterator(sctx, loc, argv); +} + +void populate_context_index_func(static_context* sctx) +{ + { + + +DECL_WITH_KIND(sctx, zorba_store_indexes_static_dml_keys, +(createQName("http://www.zorba-xquery.com/modules/store/static/indexes/dml","","keys";), +GENV_TYPESYSTEM.QNAME_TYPE_ONE, +GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), +FunctionCons+ : + : + :
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Commit Message changed to: Added a keys() function to the index dml module. This fixes bug #900677. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug900677-2012-01-18T01-16-57.605Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 917981] [NEW] DECLARE_ZORBA_MODULE() should raise error on duplicates
Public bug reported: If you call DECLARE_ZORBA_MODULE() twice with the same URI, nothing happens, and you get duplicate entries in ZorbaManifest.xml. This sometimes messes up xqdoc generation. It should fail if the same module is declared twice with either the same version or with no version. ** Affects: zorba Importance: Undecided Status: New -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/917981 Title: DECLARE_ZORBA_MODULE() should raise error on duplicates Status in Zorba - The XQuery Processor: New Bug description: If you call DECLARE_ZORBA_MODULE() twice with the same URI, nothing happens, and you get duplicate entries in ZorbaManifest.xml. This sometimes messes up xqdoc generation. It should fail if the same module is declared twice with either the same version or with no version. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/917981/+subscriptions -- 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/bug900677 into lp:zorba
Validation queue job bug900677-2012-01-18T01-16-57.605Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/88973 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/feature-json_parser into lp:zorba
> - make a separate branch where the deprecated external JSON 1.0 is removed; > make this merge proposal dependent of this branch. I'm not sure if it will be possible to make this merge proposal dependent on that one, because they are being merged *to* different branches (this one to the trunk, that one to lp:zorba/data-converters-module). > - make sure that during the Zorba compilation there is only one module linked > to any given URI I'm fixing that problem now. However, it shouldn't hold up progress on this branch. The only problem here is that the JSON module is declared twice, which doesn't make sense. I will check in a change to fix that shortly. -- https://code.launchpad.net/~zorba-coders/zorba/feature-json_parser/+merge/88721 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/fix-declare-module-bug917981 into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #917981 in Zorba: "DECLARE_ZORBA_MODULE() should raise error on
duplicates"
https://bugs.launchpad.net/zorba/+bug/917981
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977
--
https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-01-11 17:30:25 +
+++ ChangeLog 2012-01-18 02:19:25 +
@@ -21,6 +21,7 @@
support.
* zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
* Added API method Item::getNamespaceBindings().
+ * Fixed bug #917981 (disallow declaring same module twice).
version 2.1
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2011-12-21 14:40:33 +
+++ cmake_modules/ZorbaModule.cmake 2012-01-18 02:19:25 +
@@ -159,41 +159,51 @@
MATH (EXPR num_zorba_modules "${num_zorba_modules} + 1")
SET_PROPERTY (GLOBAL PROPERTY ZORBA_MODULE_COUNT ${num_zorba_modules})
- # Compute the version numbers, if any provided.
- IF (MODULE_VERSION)
-STRING (REPLACE "." ";" version "${MODULE_VERSION}")
-LIST (LENGTH version version_len)
-IF (NOT (version_len EQUAL 2) OR (version_len EQUAL 3))
- MESSAGE (FATAL_ERROR
-"Version ${MODULE_VERSION} not of form 'major.minor[.patch]'")
-ENDIF (NOT (version_len EQUAL 2) OR (version_len EQUAL 3))
-LIST (GET version 0 major_ver)
-LIST (GET version 1 minor_ver)
-IF (version_len EQUAL 3)
- LIST (GET version 2 patch_ver)
- MATH (EXPR version_int
-"${major_ver} * 1 + ${minor_ver} * 10 + ${patch_ver}")
-ELSE (version_len EQUAL 3)
- SET (patch_ver)
- MATH (EXPR version_int "${major_ver} * 1 + ${minor_ver} * 10")
-ENDIF (version_len EQUAL 3)
-
-# We maintain a global CMake property named after the target URI
-# which remembers all versions of this URI which have been
-# declared. If a *lower* version has already been declared, the
-# output file rules will be messed up, so die.
-GET_PROPERTY (target_versions GLOBAL PROPERTY "${uri_sym}-versions")
-FOREACH (known_ver ${target_versions})
- IF (known_ver LESS version_int)
-MESSAGE (FATAL_ERROR
- "The module ${MODULE_URI} has already been declared with a "
- "lower version number than ${MODULE_VERSION}. "
- "Please call DECLARE_ZORBA_MODULE() for higher versions of the same "
- "module first.")
- ENDIF (known_ver LESS version_int)
-ENDFOREACH (known_ver)
-SET_PROPERTY (GLOBAL APPEND PROPERTY "${uri_sym}-versions" ${version_int})
- ENDIF (MODULE_VERSION)
+ # If no version specified, it is effectively treated as 0.0.0.
+ IF (NOT MODULE_VERSION)
+SET (MODULE_VERSION "0.0.0")
+ ENDIF (NOT MODULE_VERSION)
+
+ # Compute a unique integer, version_int, based on the version
+ # number, so we can more easily compare with other versions later.
+ STRING (REPLACE "." ";" version "${MODULE_VERSION}")
+ LIST (LENGTH version version_len)
+ IF (NOT ( (version_len EQUAL 2) OR (version_len EQUAL 3) ) )
+MESSAGE (FATAL_ERROR
+ "Version ${version_len} ${MODULE_VERSION} not of form 'major.minor[.patch]'")
+ ENDIF (NOT ( (version_len EQUAL 2) OR (version_len EQUAL 3) ) )
+ LIST (GET version 0 major_ver)
+ LIST (GET version 1 minor_ver)
+ IF (version_len EQUAL 3)
+LIST (GET version 2 patch_ver)
+MATH (EXPR version_int
+ "${major_ver} * 1 + ${minor_ver} * 10 + ${patch_ver}")
+ ELSE (version_len EQUAL 3)
+SET (patch_ver)
+MATH (EXPR version_int "${major_ver} * 1 + ${minor_ver} * 10")
+ ENDIF (version_len EQUAL 3)
+
+ # We maintain a global CMake property named after the target URI
+ # which remembers all versions of this URI which have been
+ # declared. If a *lower* version has already been declared, the
+ # output file rules will be messed up, so die. If the *same* version
+ # has already been declare, XQdoc will be messed up, so die.
+ GET_PROPERTY (target_versions GLOBAL PROPERTY "${uri_sym}-versions")
+ FOREACH (known_ver ${target_versions})
+IF (known_ver LESS version_int)
+ MESSAGE (FATAL_ERROR
+"The module ${MODULE_URI} has already been declared with a "
+"lower version number than ${MODULE_VERSION}. "
+"Please call DECLARE_ZORBA_MODULE() for higher versions of the same "
+"module first.")
+ElSEIF (known_ver EQUAL version_int)
+ MESSAGE (FATAL_ERROR
+"The module ${MODULE_URI} has already been declared with the "
+"version number ${MODULE_VERSION}. You cannot declare the same "
+"module twice.")
+ENDIF (known_ver LESS v
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/fix-declare-module-bug917981 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-declare-module-bug917981-2012-01-18T02-20-58.486Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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] [Bug 917981] Re: DECLARE_ZORBA_MODULE() should raise error on duplicates
** Branch linked: lp:~zorba-coders/zorba/fix-declare-module-bug917981 ** Changed in: zorba Milestone: None => 2.2 ** Changed in: zorba Assignee: (unassigned) => Chris Hillery (ceejatec) ** Changed in: zorba Importance: Undecided => Medium -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/917981 Title: DECLARE_ZORBA_MODULE() should raise error on duplicates Status in Zorba - The XQuery Processor: New Bug description: If you call DECLARE_ZORBA_MODULE() twice with the same URI, nothing happens, and you get duplicate entries in ZorbaManifest.xml. This sometimes messes up xqdoc generation. It should fail if the same module is declared twice with either the same version or with no version. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/917981/+subscriptions -- 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/fix-declare-module-bug917981 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message): Validation queue job fix-declare-module-bug917981-2012-01-18T02-20-58.486Z is finished. The final status was: 6 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/phpapi into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/phpapi/+merge/88853 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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/http-client-version into lp:zorba/http-client-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/http-client-version into lp:zorba/http-client-module. Requested reviews: Chris Hillery (ceejatec) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-version/+merge/88986 The http-client.xq file uses Zorba versioning to declare itself to be version 1.0. However, the DECLARE_ZORBA_MODULE() entry in CMakeLists.txt did not declare the version at all. This turns out to cause trouble with another fix I am making. However, I am curious: Is this the correct fix? Or should the http-client.xq module be unversioned, since it is from expath? I thought that generally modules from other sources (such as functx) we left as unversioned. However, the expath file module is also versioned, so I am unsure. -- https://code.launchpad.net/~zorba-coders/zorba/http-client-version/+merge/88986 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. === modified file 'src/org/expath/ns/CMakeLists.txt' --- src/org/expath/ns/CMakeLists.txt 2011-08-10 09:40:41 + +++ src/org/expath/ns/CMakeLists.txt 2012-01-18 07:53:36 + @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_MODULE (URI "http://expath.org/ns/http-client"; FILE "http-client.xq") +DECLARE_ZORBA_MODULE (URI "http://expath.org/ns/http-client"; FILE "http-client.xq" VERSION 1.0) -- 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/http-client-version into lp:zorba/http-client-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/http-client-version/+merge/88986 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/http-client-version into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/http-client-version into lp:zorba/http-client-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-version/+merge/88986 -- https://code.launchpad.net/~zorba-coders/zorba/http-client-version/+merge/88986 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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
