zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1134008 into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)
Related bugs:
  Bug #1134008 in Zorba: "base-uri of parsed documents should be the retrieval URL"
  https://bugs.launchpad.net/zorba/+bug/1134008

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

=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-04-30 23:57:10 +0000
+++ src/runtime/sequences/sequences_impl.cpp	2013-05-02 00:08:38 +0000
@@ -1895,6 +1895,7 @@
   store::LoadProperties lLoadProperties;
   lLoadProperties.setStoreDocument(true);
   lLoadProperties.setDTDValidate( aSctx->is_feature_set( feature::dtd ) );
+  lLoadProperties.setBaseUri(lNormUri);
 
   // Resolve URI to a stream
   zstring lErrorMessage;
@@ -1927,8 +1928,7 @@
   try
   {
     store::Store& lStore = GENV.getStore();
-    zstring lBaseUri = aSctx->get_base_uri();
-    oResult = lStore.loadDocument(lBaseUri, lNormUri, *lStream, lLoadProperties);
+    oResult = lStore.loadDocument(lNormUri, lNormUri, *lStream, lLoadProperties);
     fillTime(t0, t0user, aPlanState);
   }
   catch (ZorbaException& e)

=== added file 'test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res	2013-05-02 00:08:38 +0000
@@ -0,0 +1,1 @@
+true

=== added file 'test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res	2013-05-02 00:08:38 +0000
@@ -0,0 +1,1 @@
+true

=== added file 'test/rbkt/Queries/zorba/uris/doc-base-uri.xq'
--- test/rbkt/Queries/zorba/uris/doc-base-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/doc-base-uri.xq	2013-05-02 00:08:38 +0000
@@ -0,0 +1,4 @@
+(: The base-uri of a document node should be the retrieval URI. :)
+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
+let $doc := fn:doc($uri)
+return (fn:base-uri($doc) eq $uri)

=== added file 'test/rbkt/Queries/zorba/uris/file-base-uri.xq'
--- test/rbkt/Queries/zorba/uris/file-base-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/file-base-uri.xq	2013-05-02 00:08:38 +0000
@@ -0,0 +1,9 @@
+import module namespace file="http://expath.org/ns/file";;
+import module namespace x="http://www.zorba-xquery.com/modules/xml";;
+import schema namespace opt="http://www.zorba-xquery.com/modules/xml-options";;
+
+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
+let $content := file:read-text($uri)
+let $doc := x:parse($content,
+     <opt:options><opt:base-uri opt:value="{$uri}"/></opt:options>)
+return (fn:base-uri($doc) eq $uri)

=== added file 'test/rbkt/Queries/zorba/uris/input.xml'
--- test/rbkt/Queries/zorba/uris/input.xml	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/input.xml	2013-05-02 00:08:38 +0000
@@ -0,0 +1,1 @@
+<a/>