[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 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
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/126378 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 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
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-26T10-51-04.296Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 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/expath_http_doc into lp:zorba/http-client-module
William Candillon has proposed merging lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module. Commit message: Minor improvements in the EXPath HTTP module. Notably, the @project tag has been updated to fit in the overal project documentation. Requested reviews: William Candillon (wcandillon) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Minor improvements in the EXPath HTTP module. Notably, the @project tag has been updated to fit in the overal project documentation. -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. === modified file 'src/org/expath/ns/http-client.xq' --- src/org/expath/ns/http-client.xq 2012-05-16 22:30:55 + +++ src/org/expath/ns/http-client.xq 2012-09-26 11:12:28 + @@ -30,18 +30,22 @@ : p : In general, both functions take a description of the HTTP request to make : as parameter, execute the request, and return a representation of the HTTP - : response. + : response. For instance, in the following code snippet, we fetch the blog feed from Zorba: : /p + : pre class=ace-static ace-mode=xquery![CDATA[import module namespace http = http://expath.org/ns/http-client;; + : + : http:send-request( + : http:request href=http://www.zorba-xquery.com/blog/feed; method=get / + : ) + : ]]/pre + : pYou can try this example a href=http://www.zorba-xquery.com/html/demo#GKnscDSYqVadJ+CQftvnRw+LUd0=;live/a./p : : p : The codehttp:send-request()/code functions are declared as sequential. : Sequential functions are allowed to have side effects. For example, most probably, : an HTTP POST request is a request that has side effects because it adds/changes : a remote resource. Sequential functions are specified in the - : a href=http://www.w3.org/TR/xquery-sx-10/;XQuery Scripting Extension/a, - : which is an extension of XQuery. - : Sequential functions are only allowed to be invoked in certain places (e.g. - : only from functions which are declared as sequential themselves). + : a href=http://www.zorba-xquery.com/html/documentation/2.6.0/zorba/scripting_tutorial;XQuery Scripting Extension/a. : In contrast, the http:read() functions are not declared as sequential - : they are declared as nondeterministic though, which : means that several calls may return different results. @@ -96,7 +100,7 @@ : @author Markus Pilman : @see a href=http://www.w3.org/TR/xquery-3/#FunctionDeclns;XQuery 3.0: Function Declaration/a : @library a href=http://curl.haxx.se/;cURL Library/a - : @project expath.org + : @project EXPath/HTTP Client : :) module namespace http = http://expath.org/ns/http-client;; -- 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/expath_http_doc into lp:zorba/http-client-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-26T10-51-04.296Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 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/expath_http_doc into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module has been updated. Commit Message changed to: Minor improvements in the EXPath HTTP module. Notably, the @project tag has been updated to fit in the overal project documentation. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
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/126378 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 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/expath_http_doc into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/expath_http_doc into lp:zorba/http-client-module has been updated. Description changed to: Minor improvements in the EXPath HTTP module. Notably, the @project tag has been updated to fit in the overal project documentation. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug923686 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-26T12-32-20.223Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/expath_geo_doc into lp:zorba/geo-module
William Candillon has proposed merging lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module. Commit message: Improve documentation of the EXPath Geo module. Requested reviews: William Candillon (wcandillon) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Improve documentation of the EXPath Geo module. -- https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. === modified file 'src/org/expath/ns/geo.xq' --- src/org/expath/ns/geo.xq 2011-08-13 00:08:28 + +++ src/org/expath/ns/geo.xq 2012-09-26 13:14:31 + @@ -27,75 +27,69 @@ : Possible GMLSF geometric structures are: : dl : dtbPoint/b/dt - : pre class=brush: xml;lt;gml:Point [srsDimension='2|3']?gt; - :#160;#160;lt;gml:pos [srsDimension='2|3']?gt;double_x double_y lt;/gml:posgt; - : lt;/gml:Pointgt;/pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:Point [srsDimension='2|3']? + :gml:pos [srsDimension='2|3']?double_x double_y /gml:pos + : /gml:Point]]/pre : dtbLineString/b/dt - : pre class=brush: xml;lt;gml:LineString [srsDimension='2|3']?gt; - :#160;#160;lt;gml:posList [srsDimension='2|3']?gt; double_x1 double_y1 double_x2 double_y2 ... lt;/gml:posListgt; - :lt;/gml:LineStringgt;/pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:LineString [srsDimension='2|3']? + :gml:posList [srsDimension='2|3']? double_x1 double_y1 double_x2 double_y2 ... /gml:posList + : /gml:LineString]]/pre : dtbCurve/b/dt - : pre class=brush: xml;lt;gml:Curve [srsDimension='2|3']?gt; - :lt;gml:segmentsgt; - :[lt;gml:LineStringSegment interpolation=linear [srsDimension='2|3']?gt; - : #160;#160;lt;gml:posList [srsDimension='2|3']?gt; double_x1 double_y1 double_x2 double_y2 ... lt;/gml:posListgt; - : lt;gml:LineStringSegmentgt;]* - :lt;/gml:segmentsgt; - :lt;/gml:Curvegt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:Curve [srsDimension='2|3']? + :gml:segments + :[gml:LineStringSegment interpolation=linear [srsDimension='2|3']? + : gml:posList [srsDimension='2|3']? double_x1 double_y1 double_x2 double_y2 ... /gml:posList; + : gml:LineStringSegment]* + :/gml:segments + : /gml:Curve]]/pre : dtbLinearRing/b/dt - : pre class=brush: xml;lt;gml:LinearRing [srsDimension='2|3']?gt; - : #160;#160;lt;gml:posList [srsDimension='2|3']?gt; double_x1 double_y1 double_x2 double_y2 ... lt;/gml:posListgt; - : lt;/gml:LinearRinggt;/pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:LinearRing [srsDimension='2|3']? + :gml:posList [srsDimension='2|3']? double_x1 double_y1 double_x2 double_y2 ... /gml:posList + : /gml:LinearRing]]/pre : dtbSurface/b/dt - : pre class=brush: xml;lt;gml:Surface [srsDimension='2|3']?gt; - :lt;gml:patchesgt; - :[lt;gml:PolygonPatch [srsDimension='2|3']?gt; - : #160;#160;lt;gml:exteriorgt; - : #160;#160;#160;#160;lt;gml:LinearRinggt; ... lt;/gml:LinearRinggt; - : #160;#160;lt;/gml:exteriorgt; - : #160;#160;[lt;gml:interiorgt; - : #160;#160;#160;#160;lt;gml:LinearRinggt; ... lt;/gml:LinearRinggt; - : #160;#160;lt;/gml:interiorgt;]* - : lt;/gml:PolygonPatchgt;]* - :lt;/gml:patchesgt; - :lt;/gml:Surfacegt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:Surface [srsDimension='2|3']? + :gml:patches + :[gml:PolygonPatch [srsDimension='2|3']? + : gml:exterior + : gml:LinearRing ... /gml:LinearRing + : /gml:exterior + : gml:interior + : gml:LinearRing ... /gml:LinearRing + : /gml:interior]* + : /gml:PolygonPatch]* + :/gml:patches + : /gml:Surface]]/pre : dtbPolygon/b/dt - : pre class=brush: xml;lt;gml:Polygon [srsDimension='2|3']?gt; - : #160;#160;lt;gml:exteriorgt; - : #160;#160;#160;#160;lt;gml:LinearRinggt; ... lt;/gml:LinearRinggt; - : #160;#160;lt;/gml:exteriorgt; - : #160;#160;[lt;gml:interiorgt; - : #160;#160;#160;#160;lt;gml:LinearRinggt; ... lt;/gml:LinearRinggt; - : #160;#160;lt;/gml:interiorgt;]* - :lt;/gml:Polygongt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:Polygon [srsDimension='2|3']? + :gml:exterior + : gml:LinearRing ... /gml:LinearRing + :/gml:exterior + :[gml:interior + : gml:LinearRing ... /gml:LinearRing + : /gml:interior]* + : /gml:Polygon]]/pre : dtbMultiPoint/b/dt - : pre class=brush: xml;lt;gml:MultiPoint [srsDimension='2|3']?gt; - : #160;#160;[lt;gml:Pointgt; ... lt;/gml:Pointgt;]* - :lt;/gml:MultiPointgt; - : /pre + : pre class=ace-static ace-mode=xquery![CDATA[gml:MultiPoint [srsDimension='2|3']? + :[gml:Point ... /gml:Point]* + : /gml:MultiPoint]]/pre : dtbMultiCurve/b/dt - : pre class=brush: xml;lt;gml:MultiCurve [srsDimension='2|3']?gt; - : #160;#160;[lt;gml:LineStringgt; ...
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module
The proposal to merge lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module has been updated. Commit Message changed to: Improve documentation of the EXPath Geo module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 -- https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-26T13-39-01.533Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
Validation queue job bug923686-2012-09-26T13-39-01.533Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/bug923686 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug923686 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 -- https://code.launchpad.net/~zorba-coders/zorba/bug923686/+merge/124531 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/1039576 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/1039576 into lp:zorba/archive-module has been updated. Commit Message changed to: - Added ability to create directories in archives - Added testcases For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 -- https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/1039576 into lp:zorba/archive-module
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/1039576 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/1039576 into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 -- https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba
Hi Till, Thanks! Perhaps a test on non-valid JSON would be nice? -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Thanks! Perhaps a test on non-valid JSON would be nice? Yes, they're in now. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-error-code-fixes-2012-09-26T15-21-45.457Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Review: Approve Thanks! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Validation queue job jsoniq-error-code-fixes-2012-09-26T15-21-45.457Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/createUntypedAtomic-2012-09-26T17-23-40.907Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/xqdoc-extensions into lp:zorba
- The options schema uses a different modeling approach than all the others. It's not that all the others are consistent but this one seems to be introducing yet another way to model options, i.e. all as attributes of one element. Maybe we should make it consistent with at least one of the other option schemas. I took this one because it's very compact. So, how should it be done. With Jsoniq :-)? Or XML module style: opt:options opt:enable component=function / opt:enable component=index / /opt:options I would do it the way the schema-tools-options or archive schemas do it (e.g. opt:functiontrue/opt:function). Alternatively, it could be done similar to the serialization options (e.g. opt:function value=true/). done -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/createUntypedAtomic into lp:zorba
Validation queue job createUntypedAtomic-2012-09-26T17-23-40.907Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/xqdoc-extensions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba.
Commit message:
fix memory leak for test/rbkt/zorba/flwor/flwor18 by adding a virtual
destructor to the flwor_clause.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539
--
https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp 2012-09-19 18:18:02 +
+++ src/compiler/expression/flwor_expr.cpp 2012-09-26 20:24:22 +
@@ -38,8 +38,15 @@
namespace zorba
{
+/***
+
+/
DEF_EXPR_ACCEPT (flwor_expr)
+flwor_clause::~flwor_clause()
+{
+}
+
/***
=== modified file 'src/compiler/expression/flwor_expr.h'
--- src/compiler/expression/flwor_expr.h 2012-09-19 18:18:02 +
+++ src/compiler/expression/flwor_expr.h 2012-09-26 20:24:22 +
@@ -89,6 +89,8 @@
}
public:
+ virtual ~flwor_clause();
+
const QueryLoc get_loc() const { return theLocation; }
ClauseKind get_kind() const { return theKind; }
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 -- https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-leak_flwor_clause-2012-09-26T20-25-40.972Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 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/fix-leak_flwor_clause into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-leak_flwor_clause into lp:zorba
Validation queue job fix-leak_flwor_clause-2012-09-26T20-25-40.972Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix-leak_flwor_clause/+merge/126539 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
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
fixed implementation of xqdoc functions
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549
fixed implementation of xqdoc functions
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-26 17:09:11 +
+++ ChangeLog 2012-09-26 21:04:24 +
@@ -45,6 +45,7 @@
variables)
* Fixed bug #899366 (enforce the type declaration of a window variable)
* Now using native UUID libraries.
+ * Fixed bug in implementation of xqdoc functions
* Fixed bug #1034942 (improper variable inlining inside general flwor expr)
* Fixed bug #1024892 (index declaration references udf declared after the index)
* Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp 2012-09-19 18:18:02 +
+++ src/compiler/expression/var_expr.cpp 2012-09-26 21:04:24 +
@@ -126,6 +126,7 @@
if (theVarInfo)
{
assert(theVarKind == prolog_var);
+assert(theVarInfo-getName() != NULL);
theVarInfo-clearVar();
}
}
=== modified file 'src/runtime/xqdoc/xqdoc_impl.cpp'
--- src/runtime/xqdoc/xqdoc_impl.cpp 2012-09-17 00:36:37 +
+++ src/runtime/xqdoc/xqdoc_impl.cpp 2012-09-26 21:04:24 +
@@ -27,6 +27,7 @@
#include system/globalenv.h
#include zorbatypes/URI.h
#include diagnostics/dict.h
+#include diagnostics/util_macros.h
#include context/static_context.h
#include context/uri_resolver.h
@@ -57,13 +58,6 @@
std::istream* lFile;
zstring lErrorMessage;
- // setup a new CompilerCB and a new XQueryCompiler
- CompilerCB lCompilerCB(*planState.theCompilerCB);
- lCompilerCB.theRootSctx = GENV.getRootStaticContext().create_child_context();
- (planState.theCompilerCB-theSctxMap)[1] = lCompilerCB.theRootSctx;
-
- XQueryCompiler lCompiler(lCompilerCB);
-
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -76,18 +70,17 @@
// resolve the uri in the surrounding static context and use
// the URI resolver to retrieve the module
lSctx = theSctx;
+
lItem-getStringValue2(strval);
lURI = lSctx-resolve_relative_uri(strval);
lResource = lSctx-resolve_uri(lURI, internal::EntityData::MODULE, lErrorMessage);
+
lStream = static_castinternal::StreamResource*(lResource.get());
if ( ! lStream )
{
-throw XQUERY_EXCEPTION(
- err::XQST0046,
- ERROR_PARAMS( lURI, ZED( ModuleNotFound ) ),
- ERROR_LOC( loc )
-);
+RAISE_ERROR(err::XQST0046, loc, ERROR_PARAMS(lURI, ZED(ModuleNotFound)));
}
+
lFile = lStream-getStream();
// now, do the real work
@@ -95,6 +88,11 @@
{
try
{
+ // setup a new CompilerCB and a new XQueryCompiler
+ CompilerCB lCompilerCB(*planState.theCompilerCB);
+
+ XQueryCompiler lCompiler(lCompilerCB);
+
// retrieve the xqdoc elements
lCompiler.xqdoc(*lFile,
lFileName,
@@ -111,11 +109,7 @@
}
else
{
-throw XQUERY_EXCEPTION(
- err::XQST0046,
- ERROR_PARAMS( lURI, ZED( ModuleNotFound ) ),
- ERROR_LOC( loc )
-);
+RAISE_ERROR(err::XQST0046, loc, ERROR_PARAMS(lURI, ZED(ModuleNotFound)));
}
STACK_END(state);
@@ -131,15 +125,6 @@
store::Item_t lItem;
zstring lFileName;
- // setup a new CompilerCB and a new XQueryCompiler
- CompilerCB lCompilerCB(*planState.theCompilerCB);
- lCompilerCB.theRootSctx = GENV.getRootStaticContext().create_child_context();
- (planState.theCompilerCB-theSctxMap)[1] = lCompilerCB.theRootSctx;
-
- // the XQueryCompiler's constructor destroys the existing type manager
- // in the static context. Hence, we create a new one
- XQueryCompiler lCompiler(lCompilerCB);
-
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -150,6 +135,13 @@
{
std::istringstream is(lItem-getStringValue().c_str());
+// setup a new CompilerCB and a new XQueryCompiler
+CompilerCB lCompilerCB(*planState.theCompilerCB);
+
+// the XQueryCompiler's constructor destroys the existing type manager
+// in the static context. Hence, we create a new one
+XQueryCompiler lCompiler(lCompilerCB);
+
// retrieve the xqdoc elements
lCompiler.xqdoc(is,
lFileName,
--
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
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 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
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/126549 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 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
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-26T21-05-48.177Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 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
Validation queue job markos-scratch-2012-09-26T21-05-48.177Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 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
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/126549 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 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/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 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/fread-pdf-trunk into lp:zorba
Review: Approve I added texts for all functions. -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 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/fread-pdf-trunk into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/125858 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/fread-pdf-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/fread-pdf-trunk into
lp:zorba.
Commit message:
Changes to trunk for read-pdf module.
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method
Requested reviews:
Cezar Andrei (cezar-andrei)
Juan Zacarias (juan457)
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #1012417 in Zorba: PDF to XML data convertor
https://bugs.launchpad.net/zorba/+bug/1012417
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568
Make doc comments for createBaser64Binary more explicit on what parameters they
expect and what they do.
Change, return value to xs_int for getIntValue() method.
--
https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-26 21:29:08 +
+++ ChangeLog 2012-09-26 23:04:41 +
@@ -17,7 +17,8 @@
* Implemented semantics of null for comparison and arithmetics operations.
* Positional pagination support for index probes
* Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
- * Added createUntypedAtomic to API's ItemFactory.
+ * Added createUntypedAtomic to API's ItemFactory.
+ * Adding new external module read-pdf, it converts PDF documents to text or rendered images.
Optimizations:
* New memory management for compiler expressions (no more ref counting)
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/ZorbaModule.cmake 2012-09-26 23:04:41 +
@@ -114,9 +114,20 @@
# relative to CMAKE_CURRENT_SOURCE_DIR)
# LINK_LIBRARIES - (optional) List of libraries to link external
# function library against
+# CONFIG_FILES - (optional) List of files to configure with package
+# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
#
+# CONFIG_FILES - any files specific here will be copied to
+# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
+# the following @VARIABLES@ which will be substituted:
+# ZORBA_MODULE_RELATIVE_DIR - directory portion of mangled URI
+# ZORBA_MODULE_LIBFILE_WE - filename (without extension) portion of
+# mangled URI
+# The input files should have a .in extension. The resulting file in
+# the build directory will have the .in removed.
+#
# QQQ this currently doesn't support modules with multiple component
# .xq files. (Neither does Zorba's automatic loading mechanism, so
# this probably isn't a huge deal, but worth thinking about.)
@@ -125,7 +136,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES
+ PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
URI;FILE;VERSION TEST_ONLY ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -353,6 +364,20 @@
${version_infix} 1 ${MODULE_TEST_ONLY})
ENDFOREACH (version_infix)
+ # Configure any module-specified config files.
+ SET (ZORBA_MODULE_RELATIVE_DIR ${module_path})
+ SET (ZORBA_MODULE_LIBFILE_WE ${module_filewe})
+ FOREACH (_config_file ${MODULE_CONFIG_FILES})
+# Strip off .in - can't use GET_FILENAME_COMPONENT as it always removes
+# the longest possible extension
+STRING (REGEX REPLACE \\.in$ _config_filename_we ${_config_file})
+IF (NOT IS_ABSOLUTE ${_config_file})
+ SET (_config_file ${CMAKE_CURRENT_SOURCE_DIR}/${_config_file})
+ENDIF (NOT IS_ABSOLUTE ${_config_file})
+CONFIGURE_FILE (${_config_file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_config_filename_we} @ONLY)
+ ENDFOREACH (_config_file)
+
# Last but not least, whip up a test case that ensures the module
# can at least be compiled. Don't bother for test-only modules
# (presumably they're there to be tested!).
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-26 17:09:11 +
+++ include/zorba/item_factory.h 2012-09-26 23:04:41 +
@@ -123,8 +123,8 @@
/** \brief Creates a Base64Binary Item
* see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
*
- * @param aBinData a pointer to the base6c4 binary data.
- * @param aLength the length of the base64 binary data.
+ * @param aBinData a pointer to the base64 encoded data. The data is copied from aBinData.
+ * @param aLength the length of the base64 encoded data.
* @return The Base64Binary Item.
*/
virtual Item
@@ -133,7 +133,7 @@
/** \brief Creates a Base64Binary Item
* see
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Commit Message changed to: Changes to trunk for read-pdf module. Make doc comments for createBaser64Binary more explicit on what parameters they expect and what they do. Change, return value to xs_int for getIntValue() method For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fread-pdf-trunk-2012-09-26T23-05-52.544Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fread-pdf-trunk 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 fread-pdf-trunk-2012-09-26T23-05-52.544Z is finished. The final status was: 13 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/expath_http_doc into lp:zorba/http-client-module
Review: Approve I don't think it's good practice to hard-code a version number in the link referring to a documentation. This link will probably never get updated and refer to old documentation. It's a minor issue and I will approve anyway. It's up to you whether you want to fix this. -- https://code.launchpad.net/~zorba-coders/zorba/expath_http_doc/+merge/126429 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/expath_geo_doc/+merge/126447 Your team Zorba Coders is subscribed to branch lp:zorba/geo-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug867693 into
lp:zorba/image-module.
Commit message:
test fixed
Requested reviews:
Juan Zacarias (juan457)
Related bugs:
Bug #867693 in Zorba: ImageMagick (6.6.9) segfaults on Windows
https://bugs.launchpad.net/zorba/+bug/867693
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578
test fixed
--
https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.
=== modified file 'src/com/zorba-xquery/www/modules/image/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/image/CMakeLists.txt 2012-07-20 20:26:02 +
+++ src/com/zorba-xquery/www/modules/image/CMakeLists.txt 2012-09-27 00:29:24 +
@@ -48,12 +48,10 @@
EXTRA_SOURCES image_commons
LINK_LIBRARIES ${ImageMagick_LIBRARIES})
+# this could crash because of the ImageMagick version
+# must be compiled in debug mode
SET (KNOWN_CRASHES)
IF (WIN32)
- LIST (APPEND KNOWN_CRASHES
-zorba_image_module/image/basic_svg.xq 867693
- )
-
IF (CMAKE_BUILD_TYPE STREQUAL Debug)
LIST (APPEND KNOWN_CRASHES
zorba_image_module/image/basic.xq 867693
=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp 2012-08-15 21:26:45 +
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp 2012-09-27 00:29:24 +
@@ -55,9 +55,7 @@
// constuct error QName
String lNamespace = http://www.zorba-xquery.com/modules/image/error;;
String lLocalname = IM001;
- Item lQName;
- Iterator_t lDummyIterator;
- aDynamicContext-getVariable(lNamespace, lLocalname, lQName, lDummyIterator);
+ Item lQName = ImageModule::getItemFactory()-createQName(lNamespace, image, lLocalname);
// if we have zero length image, then tell the user so
if (std::string(aMessage).find(zero-length) != std::string::npos) {
lErrorMessage The passed xs:base64Binary seems to be empty.;
@@ -71,9 +69,7 @@
void
ImageFunction::throwErrorWithQName (const DynamicContext* aDynamicContext, const String aLocalName, const String aMessage) {
String lNamespace = http://www.zorba-xquery.com/modules/image/error;;
- Item lQName;
- Iterator_t lDummyIterator;
- aDynamicContext-getVariable(lNamespace, aLocalName, lQName, lDummyIterator);
+ Item lQName = ImageModule::getItemFactory()-createQName(lNamespace, image, aLocalName);
USER_EXCEPTION(lQName, aMessage);
}
--
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/bug867693 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module has been updated. Commit Message changed to: test fixed For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867693-2012-09-27T00-32-40.523Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
Validation queue job bug867693-2012-09-27T00-32-40.523Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fread-pdf-trunk-2012-09-27T01-51-44.419Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fread-pdf-trunk 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 fread-pdf-trunk-2012-09-27T01-51-44.419Z is finished. The final status was: 7 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/fread-pdf-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fread-pdf-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 -- https://code.launchpad.net/~zorba-coders/zorba/fread-pdf-trunk/+merge/126568 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Till Westmann has proposed merging
lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba.
Commit message:
use XDM node kinds in encode-for-roundtrip
Requested reviews:
Matthias Brantner (matthias-brantner)
Ghislain Fourny (gislenius)
Related bugs:
Bug #1055608 in Zorba: use XDM node kinds in encode-for-roundtrip
https://bugs.launchpad.net/zorba/+bug/1055608
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590
use XDM node kinds in encode-for-roundtrip
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp 2012-09-24 17:11:12 +
+++ src/runtime/json/jsoniq_functions_impl.cpp 2012-09-27 02:16:25 +
@@ -67,6 +67,72 @@
const char * OPTIONS_KEY_PREFIX = prefix;
const char * OPTIONS_KEY_SER_PARAMS = serialization-parameters;
+const char * SEQTYPE_ANYNODE = node();
+const char * SEQTYPE_COMMENT = comment();
+const char * SEQTYPE_DOCUMENT = document-node();
+const char * SEQTYPE_ELEMENT = element();
+const char * SEQTYPE_PROCINST = processing-instruction();
+const char * SEQTYPE_TEXT = text();
+
+const char * kind2str(const store::NodeKind aKind)
+{
+ // we do not support attibutes and namespaces as they cannot be serialized
+ switch (aKind)
+ {
+ case store::StoreConsts::anyNode: return SEQTYPE_ANYNODE;
+ case store::StoreConsts::commentNode: return SEQTYPE_COMMENT;
+ case store::StoreConsts::documentNode: return SEQTYPE_DOCUMENT;
+ case store::StoreConsts::elementNode: return SEQTYPE_ELEMENT;
+ case store::StoreConsts::piNode: return SEQTYPE_PROCINST;
+ case store::StoreConsts::textNode: return SEQTYPE_TEXT;
+ default: return ;
+ }
+}
+
+bool str2kind(const zstring aString, store::NodeKind aKind)
+{
+ switch(aString.at(0))
+ {
+ case 'c':
+if (aString == SEQTYPE_COMMENT)
+{
+ aKind = store::StoreConsts::commentNode;
+ return true;
+}
+break;
+ case 'd':
+if (aString == SEQTYPE_DOCUMENT)
+{
+ aKind = store::StoreConsts::documentNode;
+ return true;
+}
+break;
+ case 'e':
+ case 'n': // node() maps to element for backwards compatibility
+if (aString == SEQTYPE_ELEMENT || aString == SEQTYPE_ANYNODE)
+{
+ aKind = store::StoreConsts::elementNode;
+ return true;
+}
+break;
+ case 'p':
+if (aString == SEQTYPE_PROCINST)
+{
+ aKind = store::StoreConsts::piNode;
+ return true;
+}
+break;
+ case 't':
+if (aString == SEQTYPE_TEXT)
+{
+ aKind = store::StoreConsts::textNode;
+ return true;
+}
+break;
+ }
+ return false;
+}
+
/***
json:decode-from-roundtrip($items as json-item()*,
$options as object()) as structured-item()*
@@ -125,32 +191,75 @@
zstring lTypeNameString;
lTypeValueItem-getStringValue2(lTypeNameString);
- if (lTypeNameString == node())
+ store::NodeKind lNodeKind;
+ if (str2kind(lTypeNameString, lNodeKind))
{
store::LoadProperties lProperties;
lProperties.setStoreDocument(false);
store::Item_t lDoc;
-if (lValueValueItem-isStreamable())
-{
- lDoc = GENV.getStore().loadDocument(
-, , lValueValueItem-getStream(), lProperties);
+zstring lXmlString;
+switch (lNodeKind)
+{
+case store::StoreConsts::commentNode:
+case store::StoreConsts::piNode:
+case store::StoreConsts::textNode:
+ {
+// we have to wrap these 3 node kinds, so we cannot care about streams
+lValueValueItem-getStringValue2(lXmlString);
+lXmlString = a + lXmlString + /a;
+std::istringstream lStream(lXmlString.c_str());
+lDoc = GENV.getStore().loadDocument(, , lStream, lProperties);
+ }
+ break;
+default:
+ if (lValueValueItem-isStreamable())
+ {
+lDoc = GENV.getStore().loadDocument(
+ , , lValueValueItem-getStream(), lProperties);
+ }
+ else
+ {
+lValueValueItem-getStringValue2(lXmlString);
+std::istringstream lStream(lXmlString.c_str());
+lDoc = GENV.getStore().loadDocument(, , lStream, lProperties);
+ }
+ break;
+}
+if (lNodeKind == store::StoreConsts::documentNode)
+{
+ aResult = lDoc;
}
else
{
- zstring lXmlString;
- lValueValueItem-getStringValue2(lXmlString);
- std::istringstream lStream(lXmlString.c_str());
- lDoc = GENV.getStore().loadDocument(, , lStream, lProperties);
-}
-store::Iterator_t lIt = lDoc-getChildren();
-bool lFound = false;
-lIt-open();
-while (! lFound lIt-next(aResult))
-{
- lFound = aResult-getNodeKind() ==
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1055608-node-kinds-for-roundtrip-2012-09-27T02-17-43.713Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip 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 bug-1055608-node-kinds-for-roundtrip-2012-09-27T02-17-43.713Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1055608-node-kinds-for-roundtrip-2012-09-27T03-36-39.765Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Validation queue job bug-1055608-node-kinds-for-roundtrip-2012-09-27T03-36-39.765Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/bug-1055608-node-kinds-for-roundtrip into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1055608-node-kinds-for-roundtrip-2012-09-27T05-41-43.261Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1055608-node-kinds-for-roundtrip/+merge/126590 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/xqdoc-extensions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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
