[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch 
into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228

w3c test modules-schema-context now passes
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/rbkt/Queries/w3c_known_failures.txt'
--- test/rbkt/Queries/w3c_known_failures.txt	2012-01-26 09:38:39 +
+++ test/rbkt/Queries/w3c_known_failures.txt	2012-02-02 09:59:20 +
@@ -5,7 +5,6 @@
 test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001
 test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-013
 test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a
-test/rbkt/w3c_testsuite/XQuery/SchemaImport/SchemaImportProlog/modules-schema-context
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-904
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-031
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-037
@@ -78,3 +77,4 @@
 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
 test/rbkt/w3c_testsuite/XQuery/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
+

-- 
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/markos-scratch into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
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/markos-scratch into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
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/markos-scratch into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-02-02T10-10-00.571Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
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 925366] [NEW] Setting a prefixed default value for an attribute typed as xs:QName makes zorba crash.

2012-02-02 Thread Ghislain Fourny
Public bug reported:

Upon import of the following schema in a query, Zorba crashes.

schema.xsd
=
?xml version=1.0 encoding=UTF-8?
xs:schema
  xmlns:xs=http://www.w3.org/2001/XMLSchema;
  xmlns:my=http://ns.example.com/;
  targetNamespace=http://www.example.com/;
  xs:element name=element
xs:complexType
  xs:attribute name=type-name type=xs:QName 
default=my:default-value/
/xs:complexType
  /xs:element
/xs:schema


Query
=
import schema namespace pul = http://www.example.com/; at schema.xsd;
()


It seems to be because the prefix binding of my (the default value's prefix) 
is forgotten outside of the schema (removing this prefix does not lead to a 
crash).

** Affects: zorba
 Importance: High
 Assignee: Cezar Andrei (cezar-andrei)
 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/925366

Title:
  Setting a prefixed default value for an attribute typed as xs:QName
  makes zorba crash.

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Upon import of the following schema in a query, Zorba crashes.

  schema.xsd
  =
  ?xml version=1.0 encoding=UTF-8?
  xs:schema
xmlns:xs=http://www.w3.org/2001/XMLSchema;
xmlns:my=http://ns.example.com/;
targetNamespace=http://www.example.com/;
xs:element name=element
  xs:complexType
xs:attribute name=type-name type=xs:QName 
default=my:default-value/
  /xs:complexType
/xs:element
  /xs:schema

  
  Query
  =
  import schema namespace pul = http://www.example.com/; at schema.xsd;
  ()

  
  It seems to be because the prefix binding of my (the default value's 
prefix) is forgotten outside of the schema (removing this prefix does not lead 
to a crash).

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925366/+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 920717] Re: json 2.0 bug: json:serialize(json:parse(VALID_JSON))

2012-02-02 Thread Markos Zaharioudakis
On which branch does the bug show up? I ran the query in the jsoniq
branch, and I get the following result (same for all optimization
levels):

?xml version=1.0 encoding=UTF-8?
lt;json type=object 
xmlns=http://www.zorba-xquery.com/modules/converters/jsongt;lt;pair 
name=html type=stringgt;lt;bgt;boldlt;/bgt;lt;/pairgt;lt;/jsongt;

Is this result correct?

If the bug shows up in another branch, maybe that branch is not up-to-
date w.r.t. the trunk? Recently, I have fixed a couple of bugs related
to the no-copy rule, so if the problem is really with the no-copy rule,
then the branch must be updated.

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/920717

Title:
  json 2.0 bug: json:serialize(json:parse(VALID_JSON))

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Should be possible to call json:serialize(json:parse(VALID_JSON))
  where VALID_JSON is any valid JSON string
  see added failing test test/rbkt/zorba/json/json-snelson-serialize-parse:

  
  import module namespace 
json=http://www.zorba-xquery.com/modules/converters/json;;
  declare variable $json-value := '{html:bbold/b}';
  json:serialize(json:parse($json-value))

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/920717/+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/markos-scratch into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue job markos-scratch-2012-02-02T10-10-00.571Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
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/markos-scratch into lp:zorba

2012-02-02 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/91228
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 925384] [NEW] JSONiq: no error upon pair name collision in object

2012-02-02 Thread Ghislain Fourny
Public bug reported:

The following query does not raise an error although the object contains
several pairs with the same name:

object {
 for $x in 1 to 20
 return pair { foo : $x }
}

** Affects: zorba
 Importance: High
 Assignee: Matthias Brantner (matthias-brantner)
 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/925384

Title:
  JSONiq: no error upon pair name collision in object

Status in Zorba - The XQuery Processor:
  New

Bug description:
  The following query does not raise an error although the object
  contains several pairs with the same name:

  object {
   for $x in 1 to 20
   return pair { foo : $x }
  }

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925384/+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:~gislenius/zorba/item-typos into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/item-typos into lp:zorba has been 
updated.

Commit Message changed to:

Correcting two typos (parameter name and document debug output).

For more details, see:
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
-- 
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
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:~gislenius/zorba/item-typos into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/item-typos-2012-02-02T10-51-58.31Z/log.html
-- 
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
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:~gislenius/zorba/item-typos into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/item-typos into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
-- 
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
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:~gislenius/zorba/item-typos into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/item-typos into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
-- 
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
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:~gislenius/zorba/qname-pool-refactoring into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/qname-pool-refactoring into lp:zorba 
has been updated.

Commit Message changed to:

Refactored QName pool and QNameItem class.

For more details, see:
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
-- 
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
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:~gislenius/zorba/qname-pool-refactoring into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/qname-pool-refactoring into lp:zorba 
has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
-- 
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
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/bug924987 into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
1. Zorba does not support the (optional) namespace nodes and associated 
sequence types. So, the releted code should be removed.

2. Why do the createSchemaElementType and createSchemaAttributeType have a 
contentType param? This is not according to the sequence type syntax and should 
be removed.

3. Just curious: why doesn't the emit() method print out the type using the w3c 
sequence type syntax?

4. An XQType of USER_DEFINED_KIND (i.e., an instance of the UserDefinedXQType 
class) represents a sequence type only if the type is atomic. So, in 
TypeOps::get_type_identifier(), a TypeIdentifier should be created only is the 
type is atomic; otherwise an error should be thrown (or an assertion triggered).

5. To be complete, the TypeManagerImpl::create_type(const TypeIdentifier 
ident) method should also be fixed. It's up to you whether you want to do it or 
not.

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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/bug924987 into lp:zorba

2012-02-02 Thread Markos Zaharioudakis
Review: Needs Fixing


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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:~gislenius/zorba/item-typos into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue job item-typos-2012-02-02T10-51-58.31Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~gislenius/zorba/item-typos/+merge/91098
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:~gislenius/zorba/qname-pool-refactoring into lp:zorba

2012-02-02 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 3 Pending.
-- 
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
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:~gislenius/zorba/qname-pool-refactoring into lp:zorba

2012-02-02 Thread Zorba Build Bot
The proposal to merge lp:~gislenius/zorba/qname-pool-refactoring into lp:zorba 
has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
-- 
https://code.launchpad.net/~gislenius/zorba/qname-pool-refactoring/+merge/90447
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:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Ghislain Fourny
Ghislain Fourny has proposed merging 
lp:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260

Actually using the GET_PUL_FACTORY() macro defined in store_defs.h.

Replaced all occurrences of GET_STORE().getPULFactory() with GET_PUL_FACTORY().
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp	2011-10-30 00:18:34 +
+++ src/store/naive/simple_pul.cpp	2012-02-02 12:45:24 +
@@ -262,7 +262,7 @@
 
   if (!found)
   {
-UpdDelete* upd = GET_STORE().getPULFactory().createUpdDelete(pul, aQueryLoc, target);
+UpdDelete* upd = GET_PUL_FACTORY().createUpdDelete(pul, aQueryLoc, target);
 pul-theDeleteList.push_back(upd);
 
 updates = new NodeUpdates(1);
@@ -278,7 +278,7 @@
 return;
 }
 
-UpdDelete* upd = GET_STORE().getPULFactory().createUpdDelete(pul,  aQueryLoc,target);
+UpdDelete* upd = GET_PUL_FACTORY().createUpdDelete(pul,  aQueryLoc,target);
 pul-theDeleteList.push_back(upd);
 updates-push_back(upd);
   }
@@ -361,7 +361,7 @@
   NodeUpdates* updates = 0;
   bool found = pul-theNodeToUpdatesMap.get(n, updates);
 
-  UpdInsertChildren* upd = GET_STORE().getPULFactory().
+  UpdInsertChildren* upd = GET_PUL_FACTORY().
   createUpdInsertChildren(pul, aQueryLoc, kind, target, sibling, children);
 
   if (kind == store::UpdateConsts::UP_INSERT_INTO)
@@ -403,7 +403,7 @@
   NodeUpdates* updates = 0;
   bool found = pul-theNodeToUpdatesMap.get(n, updates);
 
-  UpdInsertAttributes* upd = GET_STORE().getPULFactory().
+  UpdInsertAttributes* upd = GET_PUL_FACTORY().
   createUpdInsertAttributes(pul, aQueryLoc, target, attrs);
 
   pul-theDoFirstList.push_back(upd);
@@ -511,7 +511,7 @@
 
   if (!found)
   {
-UpdatePrimitive* upd = GET_STORE().getPULFactory().createUpdReplaceElemContent(pul, aQueryLoc, target, newChild);
+UpdatePrimitive* upd = GET_PUL_FACTORY().createUpdReplaceElemContent(pul, aQueryLoc, target, newChild);
 pul-theReplaceContentList.push_back(upd);
 
 updates = new NodeUpdates(1);
@@ -527,7 +527,7 @@
 throw XQUERY_EXCEPTION(err::XUDY0017);
 }
 
-UpdatePrimitive* upd = GET_STORE().getPULFactory().createUpdReplaceElemContent(pul, aQueryLoc, target, newChild);
+UpdatePrimitive* upd = GET_PUL_FACTORY().createUpdReplaceElemContent(pul, aQueryLoc, target, newChild);
 pul-theReplaceContentList.push_back(upd);
 updates-push_back(upd);
   }
@@ -555,20 +555,20 @@
   {
   case store::StoreConsts::attributeNode:
   {
-upd = GET_STORE().getPULFactory().
+upd = GET_PUL_FACTORY().
 createUpdReplaceAttrValue(pul, aQueryLoc, target, newValue);
 break;
   }
   case store::StoreConsts::textNode:
-upd = GET_STORE().getPULFactory().
+upd = GET_PUL_FACTORY().
 createUpdReplaceTextValue(pul, aQueryLoc, target, newValue);
 break;
   case store::StoreConsts::piNode:
-upd = GET_STORE().getPULFactory().
+upd = GET_PUL_FACTORY().
 createUpdReplacePiValue(pul, aQueryLoc, target, newValue);
 break;
   case store::StoreConsts::commentNode:
-upd = GET_STORE().getPULFactory().
+upd = GET_PUL_FACTORY().
 createUpdReplaceCommentValue(pul, aQueryLoc, target, newValue);
 break;
   default:
@@ -625,7 +625,7 @@
 ElementNode* elemTarget = ELEM_NODE(target);
 elemTarget-checkNamespaceConflict(newName.getp(), err::XUDY0023);
 
-upd = GET_STORE().getPULFactory().
+upd = GET_PUL_FACTORY().
 createUpdRenameElem(pul, aQueryLoc, target, newName);
 break;
   }
@@ -636,14 +636,14 @@
 if (elemParent != NULL)
   elemParent-checkNamespaceConflict(newName.getp(), err::XUDY0023);
 
-upd = GET_STORE().getPULFactory().createUpdRenameAttr(pul, aQueryLoc, target, newName);
+upd = GET_PUL_FACTORY().createUpdRenameAttr(pul, aQueryLoc, target, newName);
 break;
   }
   case store::StoreConsts::piNode:
   {
 zstring tmp;
 newName-getStringValue2(tmp);
-upd = GET_STORE().getPULFactory().createUpdRenamePi(pul, aQueryLoc, target, tmp);
+upd = GET_PUL_FACTORY().createUpdRenamePi(pul, aQueryLoc, target, tmp);
 break;
   }
   default:
@@ -698,7 +698,7 @@
 }
   }
 
-  UpdatePrimitive* upd = GET_STORE().getPULFactory().createUpdPut(this, aQueryLoc, target, uri);
+  UpdatePrimitive* upd = GET_PUL_FACTORY().createUpdPut(this, aQueryLoc, target, uri);
 
   thePutList.push_back(upd);
 }
@@ -718,7 +718,7 @@
 bool isInSubstitutionGroup)
 {
   UpdatePrimitive* upd = 
-  GET_STORE().getPULFactory().createUpdSetElementType(this,
+  GET_PUL_FACTORY().createUpdSetElementType(this,
   aQueryLoc,
   target,

[Zorba-coders] [Merge] lp:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Ghislain Fourny
The proposal to merge lp:~gislenius/zorba/use-get-pul-factory-macro into 
lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
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:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/use-get-pul-factory-macro-2012-02-02T12-45-58.451Z/log.html
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
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:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue job use-get-pul-factory-macro-2012-02-02T12-45-58.451Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
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:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 2 Pending.
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
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:~gislenius/zorba/use-get-pul-factory-macro into lp:zorba

2012-02-02 Thread Zorba Build Bot
The proposal to merge lp:~gislenius/zorba/use-get-pul-factory-macro into 
lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
-- 
https://code.launchpad.net/~gislenius/zorba/use-get-pul-factory-macro/+merge/91260
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:~gislenius/zorba/same-directory-store-includes into lp:zorba

2012-02-02 Thread Ghislain Fourny
Ghislain Fourny has proposed merging 
lp:~gislenius/zorba/same-directory-store-includes into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279

Made store includes occur in same directory, i.e. replaced

#include store/naive/include-file

with

#include include-file

for all files in the /src/store/naive directory.
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2012-01-26 19:56:14 +
+++ src/store/naive/atomic_items.cpp	2012-02-02 14:45:36 +
@@ -32,14 +32,14 @@
 #include store/api/store.h
 #include store/api/item_factory.h
 #include store/api/collection.h
-#include store/naive/qname_pool.h
-#include store/naive/simple_store.h
-#include store/naive/simple_item_factory.h
-#include store/naive/store_defs.h
-#include store/naive/item_iterator.h
-#include store/naive/node_items.h
-#include store/naive/atomic_items.h
-#include store/naive/ordpath.h
+#include qname_pool.h
+#include simple_store.h
+#include simple_item_factory.h
+#include store_defs.h
+#include item_iterator.h
+#include node_items.h
+#include atomic_items.h
+#include ordpath.h
 
 #include util/ascii_util.h
 #include util/string_util.h

=== modified file 'src/store/naive/collection_set.cpp'
--- src/store/naive/collection_set.cpp	2011-10-03 09:18:49 +
+++ src/store/naive/collection_set.cpp	2012-02-02 14:45:36 +
@@ -15,9 +15,9 @@
  */
 #include stdafx.h
 
-#include store/naive/collection_set.h
+#include collection_set.h
 #include store/api/iterator.h
-#include store/naive/name_iterator.h
+#include name_iterator.h
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/dataguide.cpp'
--- src/store/naive/dataguide.cpp	2011-07-12 20:15:01 +
+++ src/store/naive/dataguide.cpp	2012-02-02 14:45:36 +
@@ -16,7 +16,7 @@
 #include stdafx.h
 
 #include zorbautils/fatal.h
-#include store/naive/dataguide.h
+#include dataguide.h
 
 
 namespace zorba 

=== modified file 'src/store/naive/inmemorystore.cpp'
--- src/store/naive/inmemorystore.cpp	2011-06-14 17:26:33 +
+++ src/store/naive/inmemorystore.cpp	2012-02-02 14:45:36 +
@@ -15,9 +15,9 @@
  */
 #include stdafx.h
 
-#include store/naive/store_manager_impl.h
+#include store_manager_impl.h
 
-#include store/naive/simple_store.h
+#include simple_store.h
 
 namespace zorba 
 { 

=== modified file 'src/store/naive/inmemorystorec.cpp'
--- src/store/naive/inmemorystorec.cpp	2011-06-14 17:26:33 +
+++ src/store/naive/inmemorystorec.cpp	2012-02-02 14:45:36 +
@@ -17,7 +17,7 @@
 
 #include zorba/store_manager_c.h
 #include zorba/store_manager.h
-#include store/naive/simple_store.h
+#include simple_store.h
 
 void* 
 create_store()

=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp	2012-01-26 19:56:14 +
+++ src/store/naive/item.cpp	2012-02-02 14:45:36 +
@@ -23,9 +23,9 @@
 
 #include store/api/item.h
 #include store/api/iterator.h
-#include store/naive/store_defs.h
-#include store/naive/atomic_items.h
-#include store/naive/node_items.h
+#include store_defs.h
+#include atomic_items.h
+#include node_items.h
 
 #include runtime/function_item/function_item.h
 

=== modified file 'src/store/naive/item_iterator.cpp'
--- src/store/naive/item_iterator.cpp	2011-06-14 17:26:33 +
+++ src/store/naive/item_iterator.cpp	2012-02-02 14:45:36 +
@@ -15,7 +15,7 @@
  */
 #include stdafx.h
 #include store/api/item.h
-#include store/naive/item_iterator.h
+#include item_iterator.h
 #include store/api/collection.h
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/item_vector.cpp'
--- src/store/naive/item_vector.cpp	2011-06-14 17:26:33 +
+++ src/store/naive/item_vector.cpp	2012-02-02 14:45:36 +
@@ -18,7 +18,7 @@
 #include sstream
 
 #include store/api/item.h
-#include store/naive/item_vector.h
+#include item_vector.h
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp	2012-01-11 17:30:25 +
+++ src/store/naive/loader_dtd.cpp	2012-02-02 14:45:36 +
@@ -26,17 +26,17 @@
 
 #include zorba/store_consts.h
 
-#include store/naive/store_defs.h
-#include store/naive/string_pool.h
-#include store/naive/qname_pool.h
-#include store/naive/simple_store.h
-#include store/naive/atomic_items.h
-#include store/naive/node_items.h
-#include store/naive/dataguide.h
-#include store/naive/nsbindings.h
-#include store/naive/loader.h
-#include store/naive/simple_item_factory.h
-#include store/naive/node_factory.h
+#include store_defs.h
+#include string_pool.h
+#include qname_pool.h
+#include simple_store.h
+#include atomic_items.h
+#include node_items.h
+#include dataguide.h
+#include nsbindings.h
+#include loader.h
+#include 

[Zorba-coders] [Merge] lp:~gislenius/zorba/same-directory-store-includes into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/same-directory-store-includes-2012-02-02T14-45-57.461Z/log.html
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
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/bug918592 into lp:zorba

2012-02-02 Thread William Candillon
The proposal to merge lp:~zorba-coders/zorba/bug918592 into lp:zorba has been 
updated.

Commit Message changed to:

Fix for bug #918592

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug918592/+merge/89398
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug918592/+merge/89398
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:~gislenius/zorba/same-directory-store-includes into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue job same-directory-store-includes-2012-02-02T14-45-57.461Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
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:~gislenius/zorba/same-directory-store-includes into lp:zorba

2012-02-02 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
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/bug918592 into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug918592-2012-02-02T15-13-56.111Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug918592/+merge/89398
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:~gislenius/zorba/same-directory-store-includes into lp:zorba

2012-02-02 Thread Zorba Build Bot
The proposal to merge lp:~gislenius/zorba/same-directory-store-includes into 
lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
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/bug918592 into lp:zorba

2012-02-02 Thread Zorba Build Bot
Validation queue job bug918592-2012-02-02T15-13-56.111Z is finished. The final 
status was:

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

2012-02-02 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug918592 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug918592/+merge/89398
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug918592/+merge/89398
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 920717] Re: json 2.0 bug: json:serialize(json:parse(VALID_JSON))

2012-02-02 Thread Paul J. Lucas
The bug shows up on the feature-json_parser branch. The test that fails
is json-snelson-serialize-parse.xq. The test still fails even after a
merge from the trunk.

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/920717

Title:
  json 2.0 bug: json:serialize(json:parse(VALID_JSON))

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Should be possible to call json:serialize(json:parse(VALID_JSON))
  where VALID_JSON is any valid JSON string
  see added failing test test/rbkt/zorba/json/json-snelson-serialize-parse:

  
  import module namespace 
json=http://www.zorba-xquery.com/modules/converters/json;;
  declare variable $json-value := '{html:bbold/b}';
  json:serialize(json:parse($json-value))

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/920717/+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 925384] Re: JSONiq: no error upon pair name collision in object

2012-02-02 Thread Matthias Brantner
Fixed in rev. 10621 in the jsoniq branch.

** Changed in: zorba
   Status: New = Fix Committed

** Changed in: zorba
Milestone: None = 3.0

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/925384

Title:
  JSONiq: no error upon pair name collision in object

Status in Zorba - The XQuery Processor:
  Fix Committed

Bug description:
  The following query does not raise an error although the object
  contains several pairs with the same name:

  object {
   for $x in 1 to 20
   return pair { foo : $x }
  }

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925384/+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 920717] Re: json 2.0 bug: json:serialize(json:parse(VALID_JSON))

2012-02-02 Thread Markos Zaharioudakis
Ok, I was able to reproduce it. But it's not due to the no-copy rule: I
get the same error if I disable that rule. I will investigate further.

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/920717

Title:
  json 2.0 bug: json:serialize(json:parse(VALID_JSON))

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Should be possible to call json:serialize(json:parse(VALID_JSON))
  where VALID_JSON is any valid JSON string
  see added failing test test/rbkt/zorba/json/json-snelson-serialize-parse:

  
  import module namespace 
json=http://www.zorba-xquery.com/modules/converters/json;;
  declare variable $json-value := '{html:bbold/b}';
  json:serialize(json:parse($json-value))

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/920717/+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:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module

2012-02-02 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/csv_conv_module 
into lp:zorba/data-converters-module.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Daniel Turcanu (danielturcanu)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91335

Changed type in csvOptions from xs:string to xs:boolean.
-- 
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91335
Your team Zorba Coders is subscribed to branch lp:zorba/data-converters-module.
=== modified file 'src/com/zorba-xquery/www/modules/converters/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/converters/CMakeLists.txt	2012-01-23 19:28:30 +
+++ src/com/zorba-xquery/www/modules/converters/CMakeLists.txt	2012-02-02 19:16:18 +
@@ -40,6 +40,38 @@
 ENDIF (ZORBA_SUPPRESS_LIBTIDY)
 MESSAGE (STATUS )
 
+ TREE
+===
+
+#
+# Jansson
+#
+IF (ZORBA_SUPPRESS_JANSSON)
+  MESSAGE (STATUS ZORBA_SUPPRESS_JANSSON is true - not searching for Jansson.)
+ELSE (ZORBA_SUPPRESS_JANSSON)
+
+  MESSAGE (STATUS Looking for Jansson)
+  FIND_PACKAGE (Jansson)
+ 
+  IF (Jansson_FOUND)
+MESSAGE (STATUS Found Jansson library --  ${Jansson_LIBRARIES})
+
+SET (JSON_LINK_LIBRARIES ${Jansson_LIBRARIES})
+INCLUDE_DIRECTORIES (${Jansson_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES (json.xq.src)
+DECLARE_ZORBA_SCHEMA (FILE json-options.xsd
+  URI http://www.zorba-xquery.com/modules/converters/json-options;)
+DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/converters/json; VERSION 1.0 FILE json.xq LINK_LIBRARIES ${Jansson_LIBRARIES})
+ADD_TEST_DIRECTORY (${PROJECT_SOURCE_DIR}/test_json)
+
+  ELSE (Jansson_FOUND)
+MESSAGE (STATUS Jansson library not found -- if you want to use Json functionality please set Jansson_INCLUDE_DIRS and Jansson_LIBRARIES cmake parameters.)
+  ENDIF (Jansson_FOUND)
+ENDIF (ZORBA_SUPPRESS_JANSSON)
+MESSAGE (STATUS )
+
+
+ MERGE-SOURCE
 # csv
 DECLARE_ZORBA_SCHEMA (FILE csv-options.xsd
   URI http://www.zorba-xquery.com/modules/converters/csv-options;)
@@ -59,7 +91,10 @@
 ADD_TEST (streamable_string_streambuf StreambufUnitTests streambuftest)
 ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
 
+ TREE
 IF(ZORBA_NO_UNICODE)
   SET_TESTS_PROPERTIES(zorba_data-converters_module/converters/csv/csv_parse_utf8_11.xq
   PROPERTIES WILL_FAIL TRUE)
 ENDIF(ZORBA_NO_UNICODE)
+===
+ MERGE-SOURCE

=== modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd'
--- src/com/zorba-xquery/www/modules/converters/csv-options.xsd	2011-08-17 23:28:43 +
+++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd	2012-02-02 19:16:18 +
@@ -35,20 +35,8 @@
 /restriction
   /simpleType
 /attribute
-attribute name=ignore-foreign-input default=false
-  simpleType
-restriction base=string
-  pattern value=true|false/
-/restriction
-  /simpleType
-/attribute
-attribute name=accept-all-lines default=false
-  simpleType
-restriction base=string
-  pattern value=true|false/
-/restriction
-  /simpleType
-/attribute
+attribute name=ignore-foreign-input type=boolean default=false/
+attribute name=accept-all-lines type=boolean default=false/
   /complexType
   complexType name=start-from-rowType
 attribute name=line

=== modified file 'test_html/Queries/converters/html/link_crawler2.xq2'
--- test_html/Queries/converters/html/link_crawler2.xq2	2011-10-06 07:40:17 +
+++ test_html/Queries/converters/html/link_crawler2.xq2	2012-02-02 19:16:18 +
@@ -18,6 +18,7 @@
 import module namespace map = http://www.zorba-xquery.com/modules/store/data-structures/unordered-map;;
 import module namespace html = http://www.zorba-xquery.com/modules/converters/html;;
 import module namespace parse-xml = http://www.zorba-xquery.com/modules/xml;;
+import module namespace file = http://expath.org/ns/file;;
 
 declare namespace ann = http://www.zorba-xquery.com/annotations;;
 declare namespace xhtml=http://www.w3.org/1999/xhtml;;
@@ -25,16 +26,23 @@
 declare namespace err=http://www.w3.org/2005/xqt-errors;;
 declare namespace httpsch = http://expath.org/ns/http-client;;
 
-declare variable $top-uri  as xs:string := http://www.zorba-xquery.com/site2/html/index.html;;
-declare variable $uri-host as xs:string := http://www.zorba-xquery.com/site2/;;
-
-
-declare variable $supported-media-types as xs:string+ := (text/xml, application/xml, text/xml-external-parsed-entity, application/xml-external-parsed-entity,
- application/atom+xml, text/html);
-
-
-declare variable $local:processed-internal-links:=xs:QName(processed-internal-links);
-declare variable $local:processed-external-links  :=xs:QName(processed-external-links);
+declare variable $top-uri  as xs:string := http://www.zorba-xquery.com/site2/;;
+declare variable $uri-host as xs:string := http://www.zorba-xquery.com;;
+
+
+
+declare variable 

[Zorba-coders] [Merge] lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module

2012-02-02 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/csv_conv_module 
into lp:zorba/data-converters-module.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Zorba Coders (zorba-coders)
Related bugs:
  Bug #925133 in Zorba: replace string restriction with xs:boolean in 
csv-options.xsd
  https://bugs.launchpad.net/zorba/+bug/925133

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337

Changed type in csv options from xs:string to xs:boolean
-- 
https://code.launchpad.net/~danielturcanu/zorba/csv_conv_module/+merge/91337
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module.
=== modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd'
--- src/com/zorba-xquery/www/modules/converters/csv-options.xsd	2011-08-17 23:28:43 +
+++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd	2012-02-02 19:36:21 +
@@ -35,20 +35,8 @@
 /restriction
   /simpleType
 /attribute
-attribute name=ignore-foreign-input default=false
-  simpleType
-restriction base=string
-  pattern value=true|false/
-/restriction
-  /simpleType
-/attribute
-attribute name=accept-all-lines default=false
-  simpleType
-restriction base=string
-  pattern value=true|false/
-/restriction
-  /simpleType
-/attribute
+attribute name=ignore-foreign-input type=boolean default=false/
+attribute name=accept-all-lines type=boolean default=false/
   /complexType
   complexType name=start-from-rowType
 attribute name=line

-- 
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/bug924987 into lp:zorba

2012-02-02 Thread Till Westmann
1. ok

2. I see your point, but I think that I need information about the content 
type. Is there a way to get that from the public API? (I looked over the public 
static context and didn't see something obvious.)

3. Good question. Actually, the type doesn't really reflect the structure of a 
sequence type. But as it is, it is an extension of the existing on and thus 
probably compatible.

4. That's interesting. It seems that the schema types also end up there. At 
least that's how I used it. I had a as schema-element(...) declaration and 
the content type of the ELEMENT_KIND was a USER_DEFINED_KIND.

5. I'll look at that, but first we need to make sure that points 2-4 are 
clarified.


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug924987/+merge/91144
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 925716] [NEW] Windows doesn't compile

2012-02-02 Thread Rodolfo Ochoa
Public bug reported:

Error   25  error C1010: unexpected end of file while looking for 
precompiled header.  func_serialize_impl.cpp
Error   21  error C2370: 'zorba::uri::hex2dec' : redefinition; different 
storage class
Error   22  error C2370: 'zorba::uri::uri_safe' : redefinition; different 
storage class
Error   25  error C1010: unexpected end of file while looking for 
precompiled header.   string_instantiate.cpp
Error   32  error C1010: unexpected end of file while looking for 
precompiled header. string.cpp
Error   34  error C1010: unexpected end of file while looking for 
precompiled header. unique_ptr.cpp

** Affects: zorba
 Importance: High
 Assignee: Rodolfo Ochoa (rodolfo-ochoa)
 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/925716

Title:
  Windows doesn't compile

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Error 25  error C1010: unexpected end of file while looking for 
precompiled header.  func_serialize_impl.cpp
  Error 21  error C2370: 'zorba::uri::hex2dec' : redefinition; different 
storage class
  Error 22  error C2370: 'zorba::uri::uri_safe' : redefinition; different 
storage class
  Error 25  error C1010: unexpected end of file while looking for 
precompiled header.   string_instantiate.cpp
  Error 32  error C1010: unexpected end of file while looking for 
precompiled header. string.cpp
  Error 34  error C1010: unexpected end of file while looking for 
precompiled header. unique_ptr.cpp

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925716/+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/bug925716 into lp:zorba

2012-02-02 Thread Rodolfo Ochoa
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug925716 into 
lp:zorba.

Requested reviews:
  Juan Zacarias (juan457)
Related bugs:
  Bug #925716 in Zorba: Windows doesn't compile
  https://bugs.launchpad.net/zorba/+bug/925716

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug925716/+merge/91351

added 
#include stdafx.h

and changed uri_util.h having
ZORBA_DLL_PUBLIC extern char const uri_safe[];
ZORBA_DLL_PUBLIC extern signed char const hex2dec[];


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug925716/+merge/91351
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/functions/func_serialize_impl.cpp'
--- src/functions/func_serialize_impl.cpp	2012-01-11 17:30:25 +
+++ src/functions/func_serialize_impl.cpp	2012-02-02 21:21:20 +
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include stdafx.h
 #include functions/function.h
 #include functions/func_parsing_and_serializing.h
 

=== modified file 'src/unit_tests/stemmer.cpp'
--- src/unit_tests/stemmer.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/stemmer.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include cassert
 #include iostream
 

=== modified file 'src/unit_tests/string.cpp'
--- src/unit_tests/string.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/string.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include cstring
 #include cwchar
 #include sstream

=== modified file 'src/unit_tests/string_instantiate.cpp'
--- src/unit_tests/string_instantiate.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/string_instantiate.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include cassert
 #include string
 

=== modified file 'src/unit_tests/thesaurus.cpp'
--- src/unit_tests/thesaurus.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/thesaurus.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include cassert
 #include iostream
 #include list

=== modified file 'src/unit_tests/tokenizer.cpp'
--- src/unit_tests/tokenizer.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/tokenizer.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include algorithm
 #include cctype
 #include cstdlib

=== modified file 'src/unit_tests/unique_ptr.cpp'
--- src/unit_tests/unique_ptr.cpp	2012-02-02 09:56:52 +
+++ src/unit_tests/unique_ptr.cpp	2012-02-02 21:21:20 +
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include stdafx.h
 #include iostream
 #include iomanip
 

-- 
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 925716] Re: Windows doesn't compile

2012-02-02 Thread Rodolfo Ochoa
** Branch linked: lp:~zorba-coders/zorba/bug925716

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/925716

Title:
  Windows doesn't compile

Status in Zorba - The XQuery Processor:
  New

Bug description:
  Error 25  error C1010: unexpected end of file while looking for 
precompiled header.  func_serialize_impl.cpp
  Error 21  error C2370: 'zorba::uri::hex2dec' : redefinition; different 
storage class
  Error 22  error C2370: 'zorba::uri::uri_safe' : redefinition; different 
storage class
  Error 25  error C1010: unexpected end of file while looking for 
precompiled header.   string_instantiate.cpp
  Error 32  error C1010: unexpected end of file while looking for 
precompiled header. string.cpp
  Error 34  error C1010: unexpected end of file while looking for 
precompiled header. unique_ptr.cpp

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925716/+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 920724] Re: json 2.0 bug: XQDoc issues

2012-02-02 Thread Paul J. Lucas
** 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/920724

Title:
  json 2.0 bug: XQDoc issues

Status in Zorba - The XQuery Processor:
  Fix Committed

Bug description:
  - there is no @project tag for the new json.xq module: as a result, in the 
XQDoc documentation is generated in the www.zorba-xquery.com/modules/converters 
instead of data processing/data converters
  Please add a @project data processing/data converters in the module 
description in order to fix this.

  - first parse function does not state
  zerr:ZJPE0006 as a possible error condition if the passes JSON string is 
invalid
  See added test json-snelson-invalid-json.xq

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/920724/+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/feature-json_parser into lp:zorba

2012-02-02 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-json_parser/+merge/91360
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/iframe into lp:zorba

2012-02-02 Thread Rodolfo Ochoa
This also happens for script tag when you specify a file, i.e.
script src=../file.js/script

-- 
https://code.launchpad.net/~zorba-coders/zorba/iframe/+merge/91202
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/bug925716 into lp:zorba

2012-02-02 Thread Rodolfo Ochoa
uri_util.h is already fixed in trunk, so, only headers
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug925716/+merge/91351
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 925816] [NEW] URI resolver doesn't support Java URI format

2012-02-02 Thread Rodolfo Ochoa
Public bug reported:

URI resolver doesn't support Java URI format, 
Java URI format is valid without Authority for files:
file:/C:/file.

** Affects: zorba
 Importance: Medium
 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/925816

Title:
  URI resolver doesn't support Java URI format

Status in Zorba - The XQuery Processor:
  New

Bug description:
  URI resolver doesn't support Java URI format, 
  Java URI format is valid without Authority for files:
  file:/C:/file.

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925816/+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/bug925716 into lp:zorba

2012-02-02 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug925716/+merge/91351
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/stack into lp:~zorba-coders/zorba/zorba-experimental

2012-02-02 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/stack into 
lp:~zorba-coders/zorba/zorba-experimental has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91178
-- 
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91178
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/stack into lp:~zorba-coders/zorba/zorba-experimental.

-- 
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/stack into lp:~zorba-coders/zorba/zorba-experimental

2012-02-02 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/stack into 
lp:~zorba-coders/zorba/zorba-experimental has been updated.

Commit Message changed to:

...

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91380
-- 
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91380
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/stack into lp:~zorba-coders/zorba/zorba-experimental.

-- 
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/stack into lp:~zorba-coders/zorba/zorba-experimental

2012-02-02 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/stack into 
lp:~zorba-coders/zorba/zorba-experimental has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91380
-- 
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/91380
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/stack into lp:~zorba-coders/zorba/zorba-experimental.

-- 
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 925816] Re: URI resolver doesn't support Java URI format

2012-02-02 Thread Rodolfo Ochoa
** Changed in: zorba
 Assignee: (unassigned) = Rodolfo Ochoa (rodolfo-ochoa)

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/925816

Title:
  URI resolver doesn't support Java URI format

Status in Zorba - The XQuery Processor:
  New

Bug description:
  URI resolver doesn't support Java URI format, 
  Java URI format is valid without Authority for files:
  file:/C:/file.

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925816/+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/bug925816 into lp:zorba

2012-02-02 Thread Rodolfo Ochoa
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug925816 into 
lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Cezar Andrei (cezar-andrei)
  Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
  Bug #925816 in Zorba: URI resolver doesn't support Java URI format
  https://bugs.launchpad.net/zorba/+bug/925816

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug925816/+merge/91382

Added recognition for URIs without authority, this is a JAVA URI case.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug925816/+merge/91382
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp	2011-12-21 14:40:33 +
+++ src/zorbatypes/URI.cpp	2012-02-03 01:31:20 +
@@ -99,6 +99,18 @@
 zstring tmp(uri.c_str() + 8);
 uri::decode(tmp, filepath);
   }
+  else if (uri.compare(0, 6, file:/) == 0  //JAVA Exception for File URIs without Authority
+  ((uri.compare(7, 1, :) == 0) || (uri.compare(7, 4, %3A/) == 0))) 
+  {
+zstring tmp(uri.c_str() + 6);
+uri::decode(tmp, filepath);
+  }
+  else if (uri.compare(0, 17, file://localhost/) == 0  
+  ((uri.compare(18, 1, :) == 0) || (uri.compare(18, 4, %3A/) == 0))) 
+  {
+zstring tmp(uri.c_str() + 17);
+uri::decode(tmp, filepath);
+  }
   else
 #endif
 if (uri.compare(0, 8, file:///) == 0) 
@@ -621,9 +633,13 @@
* Authority
* two slashes means generic URI syntax, so we get the authority
*/
-  if (lTrimmedURI.compare(lIndex, 2, //) == 0) 
+  if ( (lTrimmedURI.compare(lIndex, 2, //) == 0) ||
+// allow JAVA FILE constructs without authority, i.e.: file:/D:/myFile 
+   (ZSTREQ(theScheme, file)  (lTrimmedURI.compare(lIndex, 1, /) == 0)))
   {
-lIndex += 2;
+if ((lTrimmedURI.compare(lIndex, 2, //) == 0)) {
+  lIndex += 2;
+}
 if (lIndex = lTrimmedURILength)
 {
   throw XQUERY_EXCEPTION(

-- 
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 925816] Re: URI resolver doesn't support Java URI format

2012-02-02 Thread Rodolfo Ochoa
** Branch linked: lp:~zorba-coders/zorba/bug925816

-- 
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/925816

Title:
  URI resolver doesn't support Java URI format

Status in Zorba - The XQuery Processor:
  New

Bug description:
  URI resolver doesn't support Java URI format, 
  Java URI format is valid without Authority for files:
  file:/C:/file.

To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/925816/+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