[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

2013-09-19 Thread Chris Hillery
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Rejected

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-09-19 Thread Chris Hillery
Rejecting this proposal as it is too far out of date, and since it is owned by 
~nbrinza we can't edit it any further. We should probably re-create the branch 
and re-propose it; possibly the failures that existed before on the old remote 
queue won't happen on the new remote queue.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Chris Hillery
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
text conflict in src/types/typeimpl.cpp
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Chris Hillery
Nicolae - please fix the merge conflicts; since you created this branch as 
~nbrinza rather than ~zorba-coders, I can't do it.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Nicolae Brinza
This merge proposal's problem is not the conflict but some failing tests. They 
are all schema-related and I'm waiting for some help with them from Cezar. 
Until those failing tests are fixed the branch cannot be merged.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Chris Hillery
Nicolae - please look at the comment from Zorba Build Bot immediately prior to 
mine. There are merge conflicts too. There may be a test failure as well, but 
we can't run the RQ to see it until the merge succeeds.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2013-01-29 Thread Nicolae Brinza
I'll fix the conflicts but Cezar already knows what the issue is and which 
tests are failing, so basically he knows what needs to be fixed. Solving the 
conflicts won't solve those bugs and the Changelog will start conflicting again 
on the next trunk merge.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-19 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-19 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2012-12-19T13-02-16.011Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-19 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job bugs-2012-12-19T13-02-16.011Z 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/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-19 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-14 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-14 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2012-12-14T08-00-08.241Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-14 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job bugs-2012-12-14T08-00-08.241Z 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/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-14 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-13 Thread Chris Hillery
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-13 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-13 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-12-13 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Commit message:
Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

Requested reviews:
  Markos Zaharioudakis (markos-za)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing. 

-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-12-12 08:11:40 +
+++ ChangeLog	2012-12-14 07:57:34 +
@@ -20,6 +20,7 @@
   * No need to cast xs:untypedAtomic to xs:string in order-by expression.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
   * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
   * Fixed bug #868640 (Node lifetime is shorter than expected due to let

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2012-12-12 07:36:20 +
+++ src/types/typeimpl.cpp	2012-12-14 07:57:34 +
@@ -794,8 +794,8 @@
   bool is_element_test = (
   m_node_kind == store::StoreConsts::documentNode 
   theContentType != NULL 
-  theContentType-type_kind() == XQType::NODE_TYPE_KIND 
-  dynamic_castconst NodeXQType*(theContentType.getp())-m_schema_test == false);
+  theContentType-type_kind() == XQType::NODE_TYPE_KIND /* 
+  dynamic_castconst NodeXQType*(theContentType.getp())-m_schema_test == false */);
 
   if (m_node_kind != store::StoreConsts::elementNode 
   m_node_kind != store::StoreConsts::attributeNode 
@@ -855,7 +855,7 @@
   if (m_node_kind == store::StoreConsts::documentNode)
   {
 os  document-node(;
-
+
 if (theContentType != NULL 
 theContentType-type_kind() == XQType::NODE_TYPE_KIND)
 {
@@ -872,7 +872,7 @@
   else
   {
 os  store::StoreConsts::toSchemaString(get_node_kind())  (;
-
+
 if (m_node_name != NULL)
 {
   os  m_node_name-getStringValue();
@@ -893,9 +893,9 @@
 os  ?;
 }
   }
-  
+
   os  );
-  
+
   return os.str();
 }
 

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	2012-12-14 07:57:34 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	2012-12-14 07:57:34 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	2012-12-14 07:57:34 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	2012-12-14 07:57:34 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	2012-12-14 07:57:34 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-11-06 10:11:37 +
+++ test/rbkt/Queries/CMakeLists.txt	2012-12-14 07:57:34 +
@@ -230,7 +230,6 @@
 
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  #EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
 
   IF (NOT ZORBA_WITH_BIG_INTEGER)

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	

[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

2012-12-13 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Commit Message changed to:

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-22 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-22 Thread Markos Zaharioudakis
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2012-06-22T09-15-04.275Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-22 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 
(message):
  Validation queue job bugs-2012-06-22T09-15-04.275Z 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/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-22 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-21 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing. 

-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-06-19 17:58:10 +
+++ ChangeLog	2012-06-21 12:19:23 +
@@ -12,6 +12,7 @@
 which is only a performance bug)
 
 Bug Fixes/Other Changes:
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Fixed bug #932314 (non-comparable values must be treated as distinct by
 fn:distinct-values)
   * Fixed bug #991088$ (raise XUST0001 in trycatch with mixed updating and simple clauses)

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2012-06-15 21:31:03 +
+++ src/types/typeimpl.cpp	2012-06-21 12:19:23 +
@@ -781,8 +781,8 @@
   bool is_element_test = (
   m_node_kind == store::StoreConsts::documentNode 
   theContentType != NULL 
-  theContentType-type_kind() == XQType::NODE_TYPE_KIND 
-  dynamic_castconst NodeXQType*(theContentType.getp())-m_schema_test == false);
+  theContentType-type_kind() == XQType::NODE_TYPE_KIND /* 
+  dynamic_castconst NodeXQType*(theContentType.getp())-m_schema_test == false */);
 
   if (m_node_kind != store::StoreConsts::elementNode 
   m_node_kind != store::StoreConsts::attributeNode 
@@ -842,7 +842,7 @@
   if (m_node_kind == store::StoreConsts::documentNode)
   {
 os  document-node(;
-
+
 if (theContentType != NULL 
 theContentType-type_kind() == XQType::NODE_TYPE_KIND)
 {
@@ -859,7 +859,7 @@
   else
   {
 os  store::StoreConsts::toSchemaString(get_node_kind())  (;
-
+
 if (m_node_name != NULL)
 {
   os  m_node_name-getStringValue();
@@ -880,9 +880,9 @@
 os  ?;
 }
   }
-  
+
   os  );
-  
+
   return os.str();
 }
 

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	2012-06-21 12:19:23 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	2012-06-21 12:19:23 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	2012-06-21 12:19:23 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	2012-06-21 12:19:23 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	2012-06-21 12:19:23 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-06-15 21:31:03 +
+++ test/rbkt/Queries/CMakeLists.txt	2012-06-21 12:19:23 +
@@ -241,7 +241,6 @@
 
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  #EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-001 997045)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-002 997045)

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	2012-06-21 

Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

2012-06-21 Thread Nicolae Brinza
I have fixed the failing tests and I'm resubmitting the merge proposal.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-21 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Commit Message changed to:

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-21 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/111390
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:~nbrinza/zorba/bugs into lp:zorba

2012-06-20 Thread Matthias Brantner
Review: Needs Information

What's the status of this? It needs merge with the trunk? Also, do the 6 tests 
that were failing work now?
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
text conflict in src/types/typeimpl.cpp
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing. 

-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-05-09 01:25:37 +
+++ ChangeLog	2012-05-10 12:31:19 +
@@ -3,6 +3,7 @@
 
 version 2.x
 
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
 
 

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-05-04 16:05:42 +
+++ test/rbkt/Queries/CMakeLists.txt	2012-05-10 12:31:19 +
@@ -230,7 +230,6 @@
 
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
 
   IF (ZORBA_TEST_XQUERYX)

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XPTY0004

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq	2012-05-10 12:31:19 +
@@ -0,0 +1,10 @@
+import schema default element namespace http://www.w3.org/XQueryTestOrderBy; at orderData.xsd; 
+
+declare variable $source := document { (
+!--comment--, 
+StringsorderDataone string/orderData/Strings,
+?processing instruction?
+  ) };
+
+let $document as document-node(schema-element(Strings)) := $source 
+return true()

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec	2012-05-10 12:31:19 +
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XPTY0004

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq	1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq	2012-05-10 12:31:19 +
@@ -0,0 +1,10 @@
+import schema default element namespace http://www.w3.org/XQueryTestOrderBy; at orderData.xsd; 
+
+declare variable $source := document { (
+

[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Commit Message changed to:

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2012-05-10T12-51-03.223Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 
(message):
  Validation queue job bugs-2012-05-10T12-51-03.223Z 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/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2012-05-10 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/105315
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Nicolae Brinza
Reposting a comment, as I have incorrectly put it in the description of the 
change:

Markos,

There are some tests in the XQTS with the document-node(schema-element()) node 
test. But they indeed do not cover all the cases. In fact I found a few queries 
involving variable declared as document-node(schema-element()) and instance 
of expressions which did not work correctly in Zorba. I have added a few tests 
to cover them.

-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Nicolae Brinza

I have struggled to reproduce the regression that is reported by the remote 
queue, but I have not been successful: the test passes on my machine. I have 
merged again the trunk into the branch and I'm resubmitting it again in the 
hopes it was a problem with the merge. Please re-approve.



-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing. 

-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-12-20 11:50:23 +
+++ ChangeLog	2011-12-20 14:39:27 +
@@ -1,5 +1,9 @@
 Zorba - The XQuery Processor
 
+version 2.x
+
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
+   
 version 2.2
 
   * Caching of results for recursive functions with atomic parameter and return types.

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +
+++ src/types/typeimpl.cpp	2011-12-20 14:39:27 +
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const NodeXQType supertype,
 const QueryLoc loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const store::Item* subitem,
 const QueryLoc loc) const
 {
@@ -488,14 +488,29 @@
 }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode  
-  m_node_kind != store::StoreConsts::attributeNode)
+  // document-node( E ) matches any document node that contains exactly one element
+  // node, optionally accompanied by one or more comment and processing instruction
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  bool is_element_test = (
+  m_node_kind == store::StoreConsts::documentNode 
+  m_content_type != NULL 
+  m_content_type-type_kind() == XQType::NODE_TYPE_KIND);
+
+  if (m_node_kind != store::StoreConsts::elementNode 
+  m_node_kind != store::StoreConsts::attributeNode 
+  !is_element_test)
 return true;
 
   if (m_content_type == NULL ||
   m_content_type-type_kind() == XQType::ANY_TYPE_KIND)
 return true;
 
+  if (is_element_test)
+  {
+xqtref_t documentNodeType = tm-create_value_type(subitem, loc);
+return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm-create_named_type(subitem-getType(),
   TypeConstants::QUANT_ONE,
   loc,

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	2011-12-20 14:39:27 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	2011-12-20 14:39:27 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	2011-12-20 14:39:27 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	2011-12-20 14:39:27 +
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	2011-12-20 14:39:27 +
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-20 09:04:58 +
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-20 14:39:27 +
@@ -210,7 +210,6 @@
 
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
 
 

[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-12-20T16-46-13.591Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Commit Message changed to:

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 
(message):
  Validation queue job bugs-2011-12-20T16-46-13.591Z 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/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-20 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-19 Thread Markos Zaharioudakis
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-19 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86150
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-15 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/85862
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:~nbrinza/zorba/bugs into lp:zorba

2011-12-15 Thread Markos Zaharioudakis
Nicolae, I have approved the branch, but it would be nice to also add a test 
for the document-node(schema-element-test) case. Apparently, the XQTS does not 
have one!
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/85862
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-17 Thread Markos Zaharioudakis
In computing the value of the is_element_test variable, why do we need the 
condition:

dynamic_castconst NodeXQType*(m_content_type.getp())-m_schema_test == false

? In fact, this seems wrong to me, because if this is 
document-node(SchemaElementTest), then we will return true without really 
checking the SchemaElementTest.

BTW, the dynamic_cast is not necessary since you have already checked the type 
kind. A static_cast is better here.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81480
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-15 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81480
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Commit Message changed to:

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T17-26-04.331Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue job bugs-2011-11-07T17-26-04.331Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T17-48-33.425Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue job bugs-2011-11-07T17-48-33.425Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T18-09-02.8Z/log.html
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Validation queue job bugs-2011-11-07T18-09-02.8Z is finished. The final status 
was:

All tests succeeded!
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Approve.
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-07 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81480

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81480
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-11-04 11:40:20 +
+++ ChangeLog	2011-11-07 18:34:31 +
@@ -1,7 +1,8 @@
 Zorba - The XQuery Processor
 
 version 2.x
-
+  
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Custom Full-text thesaurus.
   * Fixed bug #3401971 (node-by-reference on dynamic collections)
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +
+++ src/types/typeimpl.cpp	2011-11-07 18:34:31 +
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const NodeXQType supertype,
 const QueryLoc loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const store::Item* subitem,
 const QueryLoc loc) const
 {
@@ -488,14 +488,30 @@
 }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode  
-  m_node_kind != store::StoreConsts::attributeNode)
+  // document-node( E ) matches any document node that contains exactly one element
+  // node, optionally accompanied by one or more comment and processing instruction
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  bool is_element_test = (
+  m_node_kind == store::StoreConsts::documentNode 
+  m_content_type != NULL 
+  m_content_type-type_kind() == XQType::NODE_TYPE_KIND 
+  dynamic_castconst NodeXQType*(m_content_type.getp())-m_schema_test == false);
+
+  if (m_node_kind != store::StoreConsts::elementNode 
+  m_node_kind != store::StoreConsts::attributeNode 
+  !is_element_test)
 return true;
 
   if (m_content_type == NULL ||
   m_content_type-type_kind() == XQType::ANY_TYPE_KIND)
 return true;
 
+  if (is_element_test)
+  {
+xqtref_t documentNodeType = tm-create_value_type(subitem, loc);
+return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm-create_named_type(subitem-getType(),
   TypeConstants::QUANT_ONE,
   loc,

-- 
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-06 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81415

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81415
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-11-04 11:40:20 +
+++ ChangeLog	2011-11-06 20:00:30 +
@@ -1,7 +1,8 @@
 Zorba - The XQuery Processor
 
 version 2.x
-
+  
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Custom Full-text thesaurus.
   * Fixed bug #3401971 (node-by-reference on dynamic collections)
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a

=== modified file 'src/types/typeimpl.cpp' (properties changed: -x to +x)
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +
+++ src/types/typeimpl.cpp	2011-11-06 20:00:30 +
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const NodeXQType supertype,
 const QueryLoc loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const store::Item* subitem,
 const QueryLoc loc) const
 {
@@ -488,14 +488,28 @@
 }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode  
-  m_node_kind != store::StoreConsts::attributeNode)
+  if (m_node_kind != store::StoreConsts::elementNode 
+  m_node_kind != store::StoreConsts::attributeNode 
+  (m_content_type == NULL
+  ||
+  m_node_kind != store::StoreConsts::documentNode))
 return true;
 
   if (m_content_type == NULL ||
   m_content_type-type_kind() == XQType::ANY_TYPE_KIND)
 return true;
 
+  // document-node( E ) matches any document node that contains exactly one element 
+  // node, optionally accompanied by one or more comment and processing instruction 
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  if (m_node_kind == store::StoreConsts::documentNode 
+  m_content_type != NULL 
+  m_content_type-type_kind() == XQType::NODE_TYPE_KIND)
+  {
+xqtref_t documentNodeType = tm-create_value_type(subitem, loc);
+return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm-create_named_type(subitem-getType(),
   TypeConstants::QUANT_ONE,
   loc,

-- 
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-06 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81424
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-11-04 11:40:20 +
+++ ChangeLog	2011-11-07 02:12:25 +
@@ -1,7 +1,8 @@
 Zorba - The XQuery Processor
 
 version 2.x
-
+  
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Custom Full-text thesaurus.
   * Fixed bug #3401971 (node-by-reference on dynamic collections)
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +
+++ src/types/typeimpl.cpp	2011-11-07 02:12:25 +
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const NodeXQType supertype,
 const QueryLoc loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const store::Item* subitem,
 const QueryLoc loc) const
 {
@@ -488,14 +488,30 @@
 }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode  
-  m_node_kind != store::StoreConsts::attributeNode)
+  // document-node( E ) matches any document node that contains exactly one element
+  // node, optionally accompanied by one or more comment and processing instruction
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  bool is_element_test = (
+  m_node_kind == store::StoreConsts::documentNode 
+  m_content_type != NULL 
+  m_content_type-type_kind() == XQType::NODE_TYPE_KIND 
+  dynamic_castconst NodeXQType*(m_content_type.getp())-m_schema_test == false);
+
+  if (m_node_kind != store::StoreConsts::elementNode 
+  m_node_kind != store::StoreConsts::attributeNode 
+  !is_element_test)
 return true;
 
   if (m_content_type == NULL ||
   m_content_type-type_kind() == XQType::ANY_TYPE_KIND)
 return true;
 
+  if (is_element_test)
+  {
+xqtref_t documentNodeType = tm-create_value_type(subitem, loc);
+return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm-create_named_type(subitem-getType(),
   TypeConstants::QUANT_ONE,
   loc,

-- 
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-02 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867256 in Zorba: instance of document-node(element(x)) in predicate
  https://bugs.launchpad.net/zorba/+bug/867256

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/types/typeimpl.cpp' (properties changed: -x to +x)
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +
+++ src/types/typeimpl.cpp	2011-11-02 23:24:29 +
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const NodeXQType supertype,
 const QueryLoc loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-const TypeManager* tm, 
+const TypeManager* tm,
 const store::Item* subitem,
 const QueryLoc loc) const
 {
@@ -488,14 +488,28 @@
 }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode  
-  m_node_kind != store::StoreConsts::attributeNode)
+  if (m_node_kind != store::StoreConsts::elementNode 
+  m_node_kind != store::StoreConsts::attributeNode 
+  (m_content_type == NULL
+  ||
+  m_node_kind != store::StoreConsts::documentNode))
 return true;
 
   if (m_content_type == NULL ||
   m_content_type-type_kind() == XQType::ANY_TYPE_KIND)
 return true;
 
+  // document-node( E ) matches any document node that contains exactly one element 
+  // node, optionally accompanied by one or more comment and processing instruction 
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  if (m_node_kind == store::StoreConsts::documentNode 
+  m_content_type != NULL 
+  m_content_type-type_kind() == XQType::NODE_TYPE_KIND)
+  {
+xqtref_t documentNodeType = tm-create_value_type(subitem, loc);
+return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm-create_named_type(subitem-getType(),
   TypeConstants::QUANT_ONE,
   loc,

-- 
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-02 Thread Matthias Brantner
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-02 Thread Matthias Brantner
Review: Needs Fixing

Nicolae, could you please also update the ChangeLog?
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-02 Thread Zorba Build Bot
The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the 
output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 
(message):
  Validation queue job bugs-2011-11-03T02-45-02.853Z 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/~nbrinza/zorba/bugs/+merge/81095
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:~nbrinza/zorba/bugs into lp:zorba

2011-11-02 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/bugs into lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/81095
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