Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189806 into lp:zorba.
Commit message: Changes for Zorba 3.0 for URI module Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-10-09 02:52:32 +0000 +++ doc/zorba/xqdoc/images/modules.svg 2013-10-15 23:34:42 +0000 @@ -2041,7 +2041,7 @@ </g> <!-- 10 --> <g id="node202" class="node"><title>10</title> -<a xlink:href="../www.zorba-xquery.com_modules_uri.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/uri";> +<a xlink:href="../www.zorba-xquery.com_modules_uri.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/uri";> <ellipse fill="white" stroke="white" cx="2034" cy="-385" rx="27" ry="18"/> <text text-anchor="middle" x="2034" y="-381.3" font-family="Times,serif" font-size="14.00" fill="red">uri</text> </a> === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 20:04:59 +0000 +++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 23:34:42 +0000 @@ -2054,7 +2054,7 @@ </g> <!-- 7 --> <g id="node204" class="node"><title>7</title> -<a xlink:href="../www.zorba-xquery.com_modules_uri.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/uri";> +<a xlink:href="../www.zorba-xquery.com_modules_uri.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/uri";> <ellipse fill="white" stroke="white" cx="3775" cy="-407" rx="27" ry="18.3848"/> <text text-anchor="middle" x="3775" y="-403.4" font-family="Times Roman,serif" font-size="14.00" fill="red">uri</text> </a> === modified file 'include/zorba/internal/pregenerated/qnames.h' --- include/zorba/internal/pregenerated/qnames.h 2013-09-25 22:18:33 +0000 +++ include/zorba/internal/pregenerated/qnames.h 2013-10-15 23:34:42 +0000 @@ -92,6 +92,17 @@ zorba::diagnostic::kind kind() const; }; +class ZORBA_DLL_PUBLIC ZorbaURIErrorQName : + public FixedQName<ZorbaURIErrorQName,char const*> +{ + typedef FixedQName<ZorbaURIErrorQName,char const*> base_type; +public: + static char const NAMESPACE[]; + static char const PREFIX[]; + ZorbaURIErrorQName( char const *localname ) : base_type( localname ) { } + zorba::diagnostic::kind kind() const; +}; + } // namespace internal typedef internal::SystemDiagnostic<internal::XQueryErrorQName> XQueryErrorCode; @@ -100,6 +111,7 @@ typedef internal::SystemDiagnostic<internal::ZorbaWarningQName> ZorbaWarningCode; typedef internal::SystemDiagnostic<internal::ZorbaCSVErrorQName> ZorbaCSVErrorCode; typedef internal::SystemDiagnostic<internal::ZorbaDateTimeErrorQName> ZorbaDateTimeErrorCode; +typedef internal::SystemDiagnostic<internal::ZorbaURIErrorQName> ZorbaURIErrorCode; } // namespace zorba #endif /* ZORBA_INTERNAL_QNAMES_H */ === modified file 'include/zorba/pregenerated/diagnostic_list.h' --- include/zorba/pregenerated/diagnostic_list.h 2013-09-25 22:18:33 +0000 +++ include/zorba/pregenerated/diagnostic_list.h 2013-10-15 23:34:42 +0000 @@ -879,12 +879,6 @@ extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJ2X0001_JSONML_ARRAY_BAD_JSON; -extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0001_OPAQUE_WITH_OTHERS; - -extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE; - -extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0003_SLASH_NEEDED_FOR_ABSOLUTE_URI; - } // namespace zerr namespace jerr { @@ -986,6 +980,20 @@ extern ZORBA_DLL_PUBLIC ZorbaDateTimeErrorCode UNSUPPORTED_LOCALE; } // namespace dt + +namespace zuri { + +extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode CHARSET_UNKNOWN; + +extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_COMB_NOT_VALID; + +extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_WITHOUT_SCHEME; + +extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode INVALID_ABSOLUTE_PATH; + +extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode URI_UNRESOLVED_OR_NOSTREAM; + +} // namespace zuri } // namespace zorba #endif /* ZORBA_DIAGNOSTIC_LIST_API_H */ /* === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-14 22:29:56 +0000 +++ modules/CMakeLists.txt 2013-10-15 23:34:42 +0000 @@ -27,6 +27,7 @@ ADD_SUBDIRECTORY(sequence) ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(structured-items) +ADD_SUBDIRECTORY(uri) ADD_SUBDIRECTORY(w3c) ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(zorba-query) === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-14 22:29:56 +0000 +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-15 23:34:42 +0000 @@ -17,8 +17,6 @@ URI "http://www.zorba-xquery.com/modules/fetch";) DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0 URI "http://www.zorba-xquery.com/modules/reflection";) -DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 - URI "http://www.zorba-xquery.com/modules/uri";) DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 URI "http://www.zorba-xquery.com/modules/xqdoc";) DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd === modified file 'modules/pregenerated/zorba-errors.xq' --- modules/pregenerated/zorba-errors.xq 2013-10-12 01:10:05 +0000 +++ modules/pregenerated/zorba-errors.xq 2013-10-15 23:34:42 +0000 @@ -970,19 +970,4 @@ (:~ :) -declare variable $zerr:ZJ2X0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJ2X0001"); - -(:~ - :If the opaque-part section of the URI was specified in conjuction with other non-opaque parts. -:) -declare variable $zerr:ZURI0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZURI0001"); - -(:~ - :If an opaque-part section was specified without a scheme section. -:) -declare variable $zerr:ZURI0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZURI0002"); - -(:~ - :If an absolute URI is specified with a path that does not start with slash ("/"). -:) -declare variable $zerr:ZURI0003 as xs:QName := fn:QName($zerr:NS, "zerr:ZURI0003"); \ No newline at end of file +declare variable $zerr:ZJ2X0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJ2X0001"); \ No newline at end of file === added directory 'modules/uri' === added file 'modules/uri/CMakeLists.txt' --- modules/uri/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ modules/uri/CMakeLists.txt 2013-10-15 23:34:42 +0000 @@ -0,0 +1,16 @@ +# Copyright 2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 + URI "http://zorba.io/modules/uri";) === renamed file 'modules/com/zorba-xquery/www/modules/uri.xq' => 'modules/uri/uri.xq' --- modules/com/zorba-xquery/www/modules/uri.xq 2013-09-26 23:15:11 +0000 +++ modules/uri/uri.xq 2013-10-15 23:34:42 +0000 @@ -23,7 +23,7 @@ : @project Zorba/XML and JSON Data Model/Atomic/URI : :) -module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +module namespace uri = "http://zorba.io/modules/uri";; declare namespace zerr = "http://zorba.io/errors";; declare namespace ver = "http://zorba.io/options/versioning";; @@ -149,7 +149,7 @@ : : @return the percent decoded string : - : @error zerr:ZXQP0006 if the given charset is unknown or not supported + : @error uri:CHARSET_UNKNOWN if the given charset is unknown or not supported : : @error zerr:ZOSE0006 if there is an error transcoding the string :) @@ -191,12 +191,12 @@ : : @return the URI as string : - : @error zerr:ZURI0001 if opaque part is specified in conjunction with + : @error uri:OPAQUE_COMB_NOT_VALID if opaque part is specified in conjunction with : host/port/path/user-info/query. : - : @error zerr:ZURI0002 if opaque part is present but no scheme is present. + : @error uri:OPAQUE_WITHOUT_SCHEME if opaque part is present but no scheme is present. : - : @error zerr:ZURI0003 if a path component for an absolute URI + : @error uri:INVALID_ABSOLUTE_PATH if a path component for an absolute URI : doesn't start with "/". :) declare function uri:serialize( === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2013-10-09 02:52:32 +0000 +++ src/context/static_context.cpp 2013-10-15 23:34:42 +0000 @@ -460,7 +460,7 @@ const char* static_context::ZORBA_URI_FN_NS = -"http://www.zorba-xquery.com/modules/uri";; +"http://zorba.io/modules/uri";; const char* static_context::ZORBA_FETCH_FN_NS = === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2013-09-25 22:18:33 +0000 +++ src/diagnostics/diagnostic_en.xml 2013-10-15 23:34:42 +0000 @@ -3275,23 +3275,6 @@ </entry> </diagnostic> - <!-- /////////// URI procesing errors ///////////////////////////////// --> - - <diagnostic code="ZURI0001" name="OPAQUE_WITH_OTHERS"> - <comment>If the opaque-part section of the URI was specified in conjuction with other non-opaque parts.</comment> - <value>cannot specify opaque-part in conjunction with host/port/path/user-info/query</value> - </diagnostic> - - <diagnostic code="ZURI0002" name="SCHEME_REQUIRED_FOR_OPAQUE"> - <comment>If an opaque-part section was specified without a scheme section.</comment> - <value>scheme required when specifying opaque-part</value> - </diagnostic> - - <diagnostic code="ZURI0003" name="SLASH_NEEDED_FOR_ABSOLUTE_URI"> - <comment>If an absolute URI is specified with a path that does not start with slash ("/").</comment> - <value>path component of absolute URI must begin with /</value> - </diagnostic> - </namespace> <namespace prefix="jerr"> @@ -3687,6 +3670,37 @@ <value>"$1": unsupported locale</value> </diagnostic> </namespace> + + <!-- /////////// URI procesing errors ///////////////////////////////// --> + + <namespace prefix="zuri"> + + <diagnostic code="CHARSET_UNKNOWN"> + <comment>The character set provided is unknown or invalid.</comment> + <value>"$1": unknown or invalid character set</value> + </diagnostic> + + <diagnostic code="OPAQUE_COMB_NOT_VALID"> + <comment>If the opaque-part section of the URI was specified in conjuction with other non-opaque parts.</comment> + <value>cannot specify opaque-part in conjunction with host/port/path/user-info/query</value> + </diagnostic> + + <diagnostic code="OPAQUE_WITHOUT_SCHEME"> + <comment>If an opaque-part section was specified without a scheme section.</comment> + <value>scheme required when specifying opaque-part</value> + </diagnostic> + + <diagnostic code="INVALID_ABSOLUTE_PATH"> + <comment>If an absolute URI is specified with a path that does not start with slash ("/").</comment> + <value>path component of absolute URI must begin with /</value> + </diagnostic> + + <diagnostic code="URI_UNRESOLVED_OR_NOSTREAM"> + <comment>If the stream is unresolved or is not an stream.</comment> + <value>the stream is unresolved or it is not a stream</value> + </diagnostic> + + </namespace> <!--////////// Subvalues /////////////////////////////////////////////////--> === modified file 'src/diagnostics/diagnostic_namespaces.xml' --- src/diagnostics/diagnostic_namespaces.xml 2013-09-25 22:18:33 +0000 +++ src/diagnostics/diagnostic_namespaces.xml 2013-10-15 23:34:42 +0000 @@ -66,6 +66,9 @@ <namespace prefix="dt" uri="http://zorba.io/modules/datetime"; class-prefix="ZorbaDateTimeError" kind-function="unknown"/> + + <namespace prefix="zuri" uri="http://zorba.io/modules/uri"; + class-prefix="ZorbaURIError" kind-function="unknown"/> </diagnostic-namespaces> <!-- vim:set et sw=2 ts=2: --> === modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp' --- src/diagnostics/pregenerated/diagnostic_list.cpp 2013-09-25 22:18:33 +0000 +++ src/diagnostics/pregenerated/diagnostic_list.cpp 2013-10-15 23:34:42 +0000 @@ -1298,15 +1298,6 @@ ZorbaErrorCode ZJ2X0001_JSONML_ARRAY_BAD_JSON( "ZJ2X0001" ); -ZorbaErrorCode ZURI0001_OPAQUE_WITH_OTHERS( "ZURI0001" ); - - -ZorbaErrorCode ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE( "ZURI0002" ); - - -ZorbaErrorCode ZURI0003_SLASH_NEEDED_FOR_ABSOLUTE_URI( "ZURI0003" ); - - } // namespace zerr namespace jerr { @@ -1451,6 +1442,25 @@ } // namespace dt +namespace zuri { + +ZorbaURIErrorCode CHARSET_UNKNOWN( "CHARSET_UNKNOWN" ); + + +ZorbaURIErrorCode OPAQUE_COMB_NOT_VALID( "OPAQUE_COMB_NOT_VALID" ); + + +ZorbaURIErrorCode OPAQUE_WITHOUT_SCHEME( "OPAQUE_WITHOUT_SCHEME" ); + + +ZorbaURIErrorCode INVALID_ABSOLUTE_PATH( "INVALID_ABSOLUTE_PATH" ); + + +ZorbaURIErrorCode URI_UNRESOLVED_OR_NOSTREAM( "URI_UNRESOLVED_OR_NOSTREAM" ); + + +} // namespace zuri + } // namespace zorba /* * Local variables: === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2013-09-25 22:18:33 +0000 +++ src/diagnostics/pregenerated/dict_en.cpp 2013-10-15 23:34:42 +0000 @@ -28,6 +28,7 @@ namespace dict { extern entry const dict_en[] = { + { "CHARSET_UNKNOWN", "\"$1\": unknown or invalid character set" }, { "EXTRA_VALUE", "\"$1\": extra value detected on line $2" }, { "FOAR0001", "division by zero" }, { "FOAR0002", "numeric operation overflow/underflow${: 1}" }, @@ -102,6 +103,7 @@ #endif { "INCOMPLETE_DATE_OR_TIME", "'$1': incomplete date, time, or dateTime format" }, { "INSUFFICIENT_BUFFER", "\"$1\": insufficient value to parse for \"$2\"" }, + { "INVALID_ABSOLUTE_PATH", "path component of absolute URI must begin with /" }, { "INVALID_LOCALE", "\"$1\": invalid locale" }, { "INVALID_OPTION", "${\"1\": }invalid value for \"$2\" option${; 3}" }, { "INVALID_SPECIFICATION", "'$1': invalid % conversion specification" }, @@ -131,6 +133,8 @@ { "JNUP0019", "\"$1\": invalid type (content of insert expression must evaluate to a sequence of objects)" }, { "LITERAL_MISMATCH", "'$1': literal character mismatched '$2'" }, { "MISSING_VALUE", "$1" }, + { "OPAQUE_COMB_NOT_VALID", "cannot specify opaque-part in conjunction with host/port/path/user-info/query" }, + { "OPAQUE_WITHOUT_SCHEME", "scheme required when specifying opaque-part" }, { "SENR0001", "\"$1\": can not serialize $2" }, { "SEPM0004", "doctype-system parameter, or standalone parameter with a value other than \"omit\", specified" }, { "SEPM0009", "omit-xml-declaration parameter is \"yes\" and $1" }, @@ -148,6 +152,7 @@ { "SESU0013", "\"$1\": unsupported $2 version; supported versions are: $3" }, { "UNKNOWN_LOCALE", "\"$1\": unknown locale" }, { "UNSUPPORTED_LOCALE", "\"$1\": unsupported locale" }, + { "URI_UNRESOLVED_OR_NOSTREAM", "the stream is unresolved or it is not a stream" }, { "XPDY0002", "$1" }, { "XPDY0050", "\"$1\" cannot be treated as type $2" }, { "XPST0001", "${\"1\": }undefined value${: 2}" }, @@ -452,9 +457,6 @@ { "ZSTR0060", "\"$1\": value out of range${ 2}" }, { "ZSTR0065", "Zorba did not close properly, objects may still in memory.\\n$1 referenced URI(s) remain in the string pool.\\nFor help avoiding this message please refer to http://www.zorba-xquery.com/html/documentation in section General Architecture -> Memory Leaks." }, { "ZSTR0066", "$1: does not reference a node in collection $2" }, - { "ZURI0001", "cannot specify opaque-part in conjunction with host/port/path/user-info/query" }, - { "ZURI0002", "scheme required when specifying opaque-part" }, - { "ZURI0003", "path component of absolute URI must begin with /" }, { "ZWST0002", "\"$1\": unknown or unsupported annotation" }, { "ZWST0003", "\"$1\": function declared sequential, but has non-sequential body" }, { "ZWST0004", "sequential FLWOR expr may not have the semantics you expect" }, === modified file 'src/diagnostics/pregenerated/qnames.cpp' --- src/diagnostics/pregenerated/qnames.cpp 2013-09-25 22:18:33 +0000 +++ src/diagnostics/pregenerated/qnames.cpp 2013-10-15 23:34:42 +0000 @@ -68,6 +68,13 @@ return zorba::diagnostic::UNKNOWN_KIND; } +char const ZorbaURIErrorQName::NAMESPACE[] = "http://zorba.io/modules/uri";; +char const ZorbaURIErrorQName::PREFIX[] = "zuri"; + +zorba::diagnostic::kind ZorbaURIErrorQName::kind() const { + return zorba::diagnostic::UNKNOWN_KIND; +} + } // namespace internal } // namespace zorba /* === modified file 'src/functions/pregenerated/func_uris.cpp' --- src/functions/pregenerated/func_uris.cpp 2013-04-12 21:25:35 +0000 +++ src/functions/pregenerated/func_uris.cpp 2013-10-15 23:34:42 +0000 @@ -67,7 +67,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_uri_decode, - (createQName("http://www.zorba-xquery.com/modules/uri","","decode";), + (createQName("http://zorba.io/modules/uri","","decode";), GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE, @@ -81,7 +81,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_uri_parse, - (createQName("http://www.zorba-xquery.com/modules/uri","","parse";), + (createQName("http://zorba.io/modules/uri","","parse";), GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE), FunctionConsts::FN_ZORBA_URI_PARSE_1); @@ -93,7 +93,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_uri_serialize, - (createQName("http://www.zorba-xquery.com/modules/uri","","serialize";), + (createQName("http://zorba.io/modules/uri","","serialize";), GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE), FunctionConsts::FN_ZORBA_URI_SERIALIZE_1); === modified file 'src/runtime/spec/mappings.xml' --- src/runtime/spec/mappings.xml 2013-10-09 02:52:32 +0000 +++ src/runtime/spec/mappings.xml 2013-10-15 23:34:42 +0000 @@ -110,7 +110,7 @@ define="ZORBA_STRING_FN_NS" prefix="fn-zorba-string"/> - <zorba:namespace uri="http://www.zorba-xquery.com/modules/uri"; + <zorba:namespace uri="http://zorba.io/modules/uri"; define="ZORBA_URI_FN_NS" prefix="fn-zorba-uri"/> === modified file 'src/runtime/uris/uris_impl.cpp' --- src/runtime/uris/uris_impl.cpp 2013-06-11 23:38:49 +0000 +++ src/runtime/uris/uris_impl.cpp 2013-10-15 23:34:42 +0000 @@ -18,6 +18,7 @@ #include <algorithm> #include <zorba/util/transcode_stream.h> +#include <zorba/diagnostic_list.h> #include "common/common.h" @@ -78,7 +79,7 @@ if (!transcode::is_supported(lCharset.c_str())) { throw XQUERY_EXCEPTION( - zerr::ZXQP0006_UNKNOWN_ENCODING, + zuri::CHARSET_UNKNOWN, ERROR_PARAMS( lCharset ), ERROR_LOC( loc ) ); @@ -292,21 +293,21 @@ if(lHasOpaqueField && lHasNotOpaqueField) { throw XQUERY_EXCEPTION( - zerr::ZURI0001_OPAQUE_WITH_OTHERS, + zuri::OPAQUE_COMB_NOT_VALID, ERROR_LOC( loc ) ); } if(lHasOpaqueField && !lHasSchemeField) { throw XQUERY_EXCEPTION( - zerr::ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE, + zuri::OPAQUE_WITHOUT_SCHEME, ERROR_LOC( loc ) ); } if(lHasSchemeField && !uri.get_encoded_path().empty() && (uri.get_encoded_path().substr(0,1) != "/")) { throw XQUERY_EXCEPTION( - zerr::ZURI0003_SLASH_NEEDED_FOR_ABSOLUTE_URI, + zuri::INVALID_ABSOLUTE_PATH, ERROR_LOC( loc ) ); } === modified file 'test/rbkt/Queries/zorba/uris/decode_01.xq' --- test/rbkt/Queries/zorba/uris/decode_01.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/uris/decode_01.xq 2013-10-15 23:34:42 +0000 @@ -1,3 +1,3 @@ -import module namespace u = "http://www.zorba-xquery.com/modules/uri";; +import module namespace u = "http://zorba.io/modules/uri";; u:decode("foo=%E4%A5F%C5%F5", fn:false(), "ISO-8859-1") === modified file 'test/rbkt/Queries/zorba/uris/decode_02.spec' --- test/rbkt/Queries/zorba/uris/decode_02.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/uris/decode_02.spec 2013-10-15 23:34:42 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZXQP0006 +Error: http://zorba.io/modules/uri:CHARSET_UNKNOWN === modified file 'test/rbkt/Queries/zorba/uris/decode_02.xq' --- test/rbkt/Queries/zorba/uris/decode_02.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/uris/decode_02.xq 2013-10-15 23:34:42 +0000 @@ -1,3 +1,3 @@ -import module namespace u = "http://www.zorba-xquery.com/modules/uri";; +import module namespace u = "http://zorba.io/modules/uri";; u:decode("foo=%E4%A5F%C5%F5", fn:false(), "foo") === modified file 'test/rbkt/Queries/zorba/uris/decode_03.xq' --- test/rbkt/Queries/zorba/uris/decode_03.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/uris/decode_03.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace u = "http://www.zorba-xquery.com/modules/uri";; +import module namespace u = "http://zorba.io/modules/uri";; u:decode("%C3%A4%C2%A8bc%C3%B6", fn:false()) === modified file 'test/rbkt/Queries/zorba/uris/decode_04.xq' --- test/rbkt/Queries/zorba/uris/decode_04.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/uris/decode_04.xq 2013-10-15 23:34:42 +0000 @@ -1,3 +1,3 @@ -import module namespace u = "http://www.zorba-xquery.com/modules/uri";; +import module namespace u = "http://zorba.io/modules/uri";; u:decode("%C3%A4%C3%B6+%C3%BC", fn:true()) === modified file 'test/rbkt/Queries/zorba/uris/parse-invalid.xq' --- test/rbkt/Queries/zorba/uris/parse-invalid.xq 2013-05-03 00:41:58 +0000 +++ test/rbkt/Queries/zorba/uris/parse-invalid.xq 2013-10-15 23:34:42 +0000 @@ -1,3 +1,3 @@ -import module namespace uri="http://www.zorba-xquery.com/modules/uri";; +import module namespace uri="http://zorba.io/modules/uri";; uri:parse("foo:bar%%") === modified file 'test/rbkt/Queries/zorba/uris/parse-uri.xq' --- test/rbkt/Queries/zorba/uris/parse-uri.xq 2013-05-03 00:36:09 +0000 +++ test/rbkt/Queries/zorba/uris/parse-uri.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $xml-uri-test := fn:doc("uri-source.xml")//uri-element/text() === modified file 'test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq' --- test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq 2013-05-02 08:28:20 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $xml-uri-test := { "uri-test" : [ === modified file 'test/rbkt/Queries/zorba/uris/serialize-uri.xq' --- test/rbkt/Queries/zorba/uris/serialize-uri.xq 2013-05-03 00:36:09 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-uri.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $xml-uri-test := fn:doc("uri-source.xml")//uri-element === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec' --- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec 2013-10-15 23:34:42 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZURI0002 +Error: http://zorba.io/modules/uri:OPAQUE_WITHOUT_SCHEME === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq' --- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq 2013-05-01 17:14:49 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $wrong-opaque-noscheme-json := { === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec' --- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec 2013-10-15 23:34:42 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZURI0001 +Error: http://zorba.io/modules/uri:OPAQUE_COMB_NOT_VALID === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq' --- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq 2013-05-01 17:14:49 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $wrong-opaque-json := { === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec' --- test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec 2013-10-15 23:34:42 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZURI0003 +Error: http://zorba.io/modules/uri:INVALID_ABSOLUTE_PATH === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq' --- test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq 2013-05-01 17:14:49 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $wrong-path-json := { === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec' --- test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec 2013-10-15 23:34:42 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZURI0003 +Error: http://zorba.io/modules/uri:INVALID_ABSOLUTE_PATH === modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq' --- test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq 2013-05-01 17:14:49 +0000 +++ test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq 2013-10-15 23:34:42 +0000 @@ -1,4 +1,4 @@ -import module namespace uri = "http://www.zorba-xquery.com/modules/uri";; +import module namespace uri = "http://zorba.io/modules/uri";; let $wrong-path-json := {
-- Mailing list: https://launchpad.net/~zorba-coders Post to : [email protected] Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
