Merge lp:~zorba-coders/zorba/bug-867376 into lp:zorba

[Luis Rodriguez Gonzalez]

Added URI processing module.

- Fix for Bug 867376 URI processing module

[Matthias Brantner (matthias-brantner)]

- Why is there a schema imported in uri.xq? I don't think it's needed anymore.
- The documentation should say what types of errors the function can raise.
- It would be nice to have constants for the names of the fields in the objects (e.g. scheme, opaque-part)
- Why does the change comment out all language bindings in swig/CMakeLists.txt and test/rbkt/modules/CMakeLists.txt?

review: Needs Fixing

[Chris Hillery (ceejatec)]

I think actually there are some error conditions that we're not catching currently. For instance, the following input in serialize-direct-uri.xq:

{ "scheme" : "file", "path" : "d:/a/b/c" }

is a non-opaque URI because it has a path, rather than an opaque-part. But it produces the output:

file:d:/a/b/c

which is an opaque URI. I believe that the input is illegal, because a non-opaque URI with a scheme MUST have a path section that begins with a / character. So the above input should actually raise an error.

review: Needs Fixing

[Chris Hillery (ceejatec)]

Also, currently serialize-direct-uri.xq fails because the expected output file serialize-direct-uri.xml.res is missing a couple results, namely the opaque URI tests at the end. Did you forget to commit that file?

[Luis Rodriguez Gonzalez (kuraru)]

> Also, currently serialize-direct-uri.xq fails because the expected output file
> serialize-direct-uri.xml.res is missing a couple results, namely the opaque
> URI tests at the end. Did you forget to commit that file?
I checked the expected results in my code and it does have the opaque test case results, I don't know why it failed for you. Anyway, I'm updating the code in this branch with some minor fixes for some of Matthias' comments.

[Chris Hillery (ceejatec)]

Hmmm.... weird. Yep, those results are there after all. I'm not sure where they went when I looked at this the first time. Ok then.

[Chris Hillery (ceejatec)]

As for the error condition, I've been thinking about it more, and I'm pretty sure that uri:serialize() needs to enforce at least the following rules:

1. You can specify opaque-part, OR some subset of host/port/path/user-info/query. Not both. (Put another way: If opaque-part is specified, then only scheme and fragment may be additionally be specified.)

2. If you specify opaque-part, scheme is required.

3. If you specify a scheme and a path, then the path MUST start with a / character.

I would suggest introducing a zerr:ZURI0001 "malformed URI components" error message for uri:serialize() which is thrown if any of the above rules are broken, as well as some new test cases for each of them. It might be nice to have separate errors for each, I guess - ZURI0001 "cannot specify opaque-part in conjunction with host/port/path/user-info/query", ZURI0002 "scheme required when specifying opaque-part", and ZURI0003 "path component of absolute URI (ie, one with a scheme) must begin with /".

[Chris Hillery (ceejatec)]

Also - the header comment for uri.xq is wrong:

(:~
 : This module provides string related functions.
 :
 : @author Matthias Brantner
 : @project XDM/atomic
 :
 :)

[Luis Rodriguez Gonzalez (kuraru)]

> As for the error condition, I've been thinking about it more, and I'm pretty
> sure that uri:serialize() needs to enforce at least the following rules:
>
> 1. You can specify opaque-part, OR some subset of host/port/path/user-
> info/query. Not both. (Put another way: If opaque-part is specified, then only
> scheme and fragment may be additionally be specified.)
>
> 2. If you specify opaque-part, scheme is required.
>
> 3. If you specify a scheme and a path, then the path MUST start with a /
> character.
>
> I would suggest introducing a zerr:ZURI0001 "malformed URI components" error
> message for uri:serialize() which is thrown if any of the above rules are
> broken, as well as some new test cases for each of them. It might be nice to
> have separate errors for each, I guess - ZURI0001 "cannot specify opaque-part
> in conjunction with host/port/path/user-info/query", ZURI0002 "scheme required
> when specifying opaque-part", and ZURI0003 "path component of absolute URI
> (ie, one with a scheme) must begin with /".

I will include the 3 different errors for uri:serialize(), Should I leave uri:parse() without any error code?
I see that in the previous function in the same module they use some predefined XQueryErrorCode inside diagnostic_list.h, Should I include my own codes there?

[Chris Hillery (ceejatec)]

> I will include the 3 different errors for uri:serialize(), Should I leave
> uri:parse() without any error code?

I'm sure there are some reasonable errors for uri:parse(), but I'm not totally sure what they might be. It's possible that URI.cpp will already throw some exceptions if you try to parse a bogus URI, and that might well be good enough.

Matthias, can you think of any specific error cases that we should test out?

[Chris Hillery (ceejatec)]

There are still some test failures. serialize-direct-uris now throws ZURI errors, which is good, but the test needs to be adapted for that (split the failing cases into separate tests with a .spec file containing the Error: you expect).

More worrying, FOTS/fn-resolve-uri is failing. I'm looking into that one a bit.

review: Needs Fixing

[Luis Rodriguez Gonzalez (kuraru)]

> > I will include the 3 different errors for uri:serialize(), Should I leave
> > uri:parse() without any error code?
>
> I'm sure there are some reasonable errors for uri:parse(), but I'm not totally
> sure what they might be. It's possible that URI.cpp will already throw some
> exceptions if you try to parse a bogus URI, and that might well be good
> enough.
>
> Matthias, can you think of any specific error cases that we should test out?
Actually you are right, the current underlying library throws some exceptions already.

[Luis Rodriguez Gonzalez (kuraru)]

> There are still some test failures. serialize-direct-uris now throws ZURI
> errors, which is good, but the test needs to be adapted for that (split the
> failing cases into separate tests with a .spec file containing the Error: you
> expect).
>
> More worrying, FOTS/fn-resolve-uri is failing. I'm looking into that one a
> bit.
All failing (as expected) cases were moved to individual test cases. Added also a couple of more to test the other 2 errors (ZURI0001 and ZURI0002).

[Chris Hillery (ceejatec)]

I believe Luis has addressed all concerns, and I have done some touch-ups as well.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867376-2013-05-02T09-13-03.471Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-867376 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-867376-2013-05-02T09-13-03.471Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Matthias Brantner (matthias-brantner)]

- Could you give an example in the documentation of uri:parse and show a resulting URI object?
- The names of the variables are all upper-case. I know that we don't have any coding conventions for it but the names in the full-text module are all lower-case. Should we be consistent here?
- uri:parse("foo:bar?") returns "[err:XQST0046]: "bar?": invalid URI literal: "63": invalid character code-point"
  1. why?
  2. the function documentation doesn't mention that this could be raised
- uri:parse("http://foo.com/bc?") returns { "scheme" : "http", "host" : "foo.com", "path" : "/bc" }. Should it return the query part as empty in the JSON object?
- one test doesn't seem to succeed in the queue

review: Needs Fixing

[Luis Rodriguez Gonzalez (kuraru)]

> - Could you give an example in the documentation of uri:parse and show a
> resulting URI object?
Done
> - The names of the variables are all upper-case. I know that we don't have any
> coding conventions for it but the names in the full-text module are all lower-
> case. Should we be consistent here?
Done
> - uri:parse("foo:bar?") returns "[err:XQST0046]: "bar?": invalid URI literal:
> "63": invalid character code-point"
> 1. why?
> 2. the function documentation doesn't mention that this could be raised
> - uri:parse("http://foo.com/bc?") returns { "scheme" : "http", "host" :
> "foo.com", "path" : "/bc" }. Should it return the query part as empty in the
> JSON object?
Done. I had to change some inner parts of URI class from protected to public.
> - one test doesn't seem to succeed in the queue
I can't figure out what test case went wrong. In the log it only says that something produced a segment fault, but I don't recognize the code that produced it. How can I find the exact test case name and error?

[Chris Hillery (ceejatec)]

I believe all outstanding comments have been addressed; Matthias, one more pass, please?

[Matthias Brantner (matthias-brantner)]

I have pushed some final documentation improvements.

review: Approve

[Matthias Brantner (matthias-brantner)]

One of the FOTS tests crashes

Please see: http://zorbatest.lambda.nu:8080/cdash/testDetails.php?test=71145736&build=31952
On May 2, 2013, at 5:55 PM, Chris Hillery <email address hidden> wrote:

> I believe all outstanding comments have been addressed; Matthias, one more pass, please?
> --
> https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233
> You are reviewing the proposed merge of lp:~zorba-coders/zorba/bug-867376 into lp:zorba.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867376-2013-05-03T03-13-20.382Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-867376 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-867376-2013-05-03T03-13-20.382Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Chris Hillery (ceejatec)]

> One of the FOTS tests crashes

We already pushed a fix for that one before asking for your re-review (it was an infinite loop eventually causing OOM).

[Chris Hillery (ceejatec)]

The last failing test is because Luis changed the constants back to all lower-case, but forgot to change the corresponding usage of those constants in a test case. However, as I just sent to zorba-dev, I personally believe all-caps is a better approach anyway, so I would like to change the module back rather than changing the test. I will wait to see if anyone has any opinions from my email.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867376-2013-05-03T15-12-05.295Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-867376 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-867376-2013-05-03T15-12-05.295Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/bug-867376]

11299. By Chris Hillery on 2013-05-03

Constants back to all-CAPS, and with explicit type.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867376-2013-05-03T23-23-03.988Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-867376-2013-05-03T23-23-03.988Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-01 03:58:31 +0000
+++ ChangeLog	2013-05-03 23:21:27 +0000
@@ -104,6 +104,7 @@
   * Fixed bug #1023362 (xsi:type attribute ignored during validation)
   * Fixed bug #1025564 (Deprecate -f argument to zorbacmd)
   * Fixed bug #1082740 (support for INF and -INF values in fn:subsequence function).  
+  * Fixed bug #867376  (uri:parse() and uri:serialize())
 
 
 version 2.8
 
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2013-05-02 10:19:11 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2013-05-03 23:21:27 +0000
@@ -882,6 +882,12 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0008_BAD_VALUE;
 
+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 {
 
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2013-03-06 00:18:36 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2013-05-03 23:21:27 +0000
@@ -977,4 +977,19 @@
 
 (:~
 :)
-declare variable $zerr:ZJSE0008 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0008");
 \ No newline at end of file
+declare variable $zerr:ZJSE0008 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0008");
+
+(:~
+ :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
 
=== modified file 'modules/com/zorba-xquery/www/modules/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq	2013-02-07 17:24:36 +0000
+++ modules/com/zorba-xquery/www/modules/uri.xq	2013-05-03 23:21:27 +0000
@@ -1,4 +1,4 @@
-xquery version "1.0";
+xquery version "3.0";
 
 (:
  : Copyright 2006-2012 The FLWOR Foundation.
@@ -17,20 +17,71 @@
 :)
 
 (:~
- : This module provides string related functions.
+ : This module provides functions for processing URIs and URLs.
  :
- : @author Matthias Brantner
+ : @author Matthias Brantner, Luis Rodriguez Gonzalez
  : @project XDM/atomic
  :
  :)
 module namespace uri = "http://www.zorba-xquery.com/modules/uri";
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";
-
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";
 
 (:~
+ : Constant for the "scheme" part of a URI object.
+ :)
+declare variable $uri:SCHEME as xs:string := "scheme";
+
+(:~
+ : Constant for the "authority" part of a URI object.
+ :)
+declare variable $uri:AUTHORITY as xs:string := "authority";
+
+(:~
+ : Constant for the "user-info" part of a URI object.
+ :)
+declare variable $uri:USER-INFO as xs:string := "user-info";
+
+(:~
+ : Constant for the "host" part of a URI object.
+ :)
+declare variable $uri:HOST as xs:string := "host";
+
+(:~
+ : Constant for the "port" part of a URI object.
+ :)
+declare variable $uri:PORT as xs:string := "port";
+
+(:~
+ : Constant for the "path" part of a URI object.
+ :)
+declare variable $uri:PATH as xs:string := "path";
+
+(:~
+ : Constant for the "query" part of a URI object.
+ :)
+declare variable $uri:QUERY as xs:string := "query";
+
+(:~
+ : Constant for the "fragment" part of a URI object.
+ :)
+declare variable $uri:FRAGMENT as xs:string := "fragment";
+
+(:~
+ : Constant for the "opaque-part" part of a URI object.
+ :
+ : If this is set in a URI object, then none of $uri:PATH, $uri:HOST,
+ : $uri:PORT, $uri:USER-INFO, or : $uri:QUERY may be specified.
+ :
+ : If this is set in a URI object, $uri:SCHEME must also be specified
+ : (ie, it must be an absolute URI).
+ :)
+declare variable $uri:OPAQUE-PART as xs:string := "opaque-part";
+
+
+(:~
  : Percent-decodes (aka URL decoding) the given string.
  :
  : All percent encoded octets will be translated into their
@@ -106,3 +157,47 @@
   $s as xs:string,
   $decode-plus as xs:boolean,
   $charset as xs:string) as xs:string external;
+  
+(:~
+ : Parses the URI passed as string. The returned object 
+ : contains only members with field names declared as constants in
+ : this module.
+ :
+ : For example,
+ : <code>
+ : let my-uri := "http://www.my.project.com/a/b/c?user=john;pass=1234#profile"
+ : return uri:parse(my-uri)
+ : </code>
+ :
+ : returns
+ : <code>
+ : { "squeme" : "http", "host" : "www.my.project.com", "path" : "/a/b/c",
+ :   "query" : "user=john;pass=123", "fragment" : "profile" }
+ : </code>
+ : 
+ : @param $uri the URI to parse
+ :
+ : @return the JSON object
+ :
+ : @error err:XQST0046 if the URI is textually invalid
+ :)
+declare function uri:parse(
+  $uri as xs:string) as object() external;
+  
+(:~
+ : Serialize the URI passed as object into a string.
+ :
+ : @param $uri the object representing the URI
+ :
+ : @return the URI as string
+ :
+ : @error zerr:ZURI0001 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 zerr:ZURI0003 if a path component for an absolute URI
+ : doesn't start with "/".
+ :)
+declare function uri:serialize(
+  $uri as object()) as xs:string external;
 
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-05-02 10:19:11 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-05-03 23:21:27 +0000
@@ -3123,6 +3123,23 @@
     <diagnostic code="ZJSE0008" name="BAD_VALUE">
       <value>"$1": illegal value for JSON type "$2"</value>
     </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>
 
 
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2013-05-02 10:19:11 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2013-05-03 23:21:27 +0000
@@ -1301,6 +1301,15 @@
 ZorbaErrorCode ZJSE0008_BAD_VALUE( "ZJSE0008" );
 
 
+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 {
 
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-05-02 10:19:11 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-05-03 23:21:27 +0000
@@ -488,6 +488,9 @@
   { "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/qname.cpp'
--- src/diagnostics/qname.cpp	2013-02-07 17:24:36 +0000
+++ src/diagnostics/qname.cpp	2013-05-03 23:21:27 +0000
@@ -125,6 +125,7 @@
     case 'O': return ZORBA_OS;
     case 'S': return ZORBA_STORE;
     case 'X': return ZORBA_XQP;
+    case 'U': return ZORBA_CORE_MODULE;
 
     default : ZORBA_ASSERT( false );
   }
 
=== modified file 'src/functions/pregenerated/func_uris.cpp'
--- src/functions/pregenerated/func_uris.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_uris.cpp	2013-05-03 23:21:27 +0000
@@ -41,6 +41,26 @@
   return new DecodeURIIterator(sctx, loc, argv);
 }
 
+PlanIter_t fn_zorba_uri_parse::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new ParseURIIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_zorba_uri_serialize::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new SerializeURIIterator(sctx, loc, argv);
+}
+
 void populate_context_uris(static_context* sctx)
 {
 
@@ -56,6 +76,30 @@
 
   }
 
+
+
+
+      {
+    DECL_WITH_KIND(sctx, fn_zorba_uri_parse,
+        (createQName("http://www.zorba-xquery.com/modules/uri","","parse"), 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
+        FunctionConsts::FN_ZORBA_URI_PARSE_1);
+
+  }
+
+
+
+
+      {
+    DECL_WITH_KIND(sctx, fn_zorba_uri_serialize,
+        (createQName("http://www.zorba-xquery.com/modules/uri","","serialize"), 
+        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_ZORBA_URI_SERIALIZE_1);
+
+  }
+
 }
 
 
 
=== modified file 'src/functions/pregenerated/func_uris.h'
--- src/functions/pregenerated/func_uris.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_uris.h	2013-05-03 23:21:27 +0000
@@ -53,6 +53,36 @@
 };
 
 
+//fn-zorba-uri:parse
+class fn_zorba_uri_parse : public function
+{
+public:
+  fn_zorba_uri_parse(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
+//fn-zorba-uri:serialize
+class fn_zorba_uri_serialize : public function
+{
+public:
+  fn_zorba_uri_serialize(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
 } //namespace zorba
 
 
 
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2013-04-10 21:01:35 +0000
+++ src/functions/pregenerated/function_enum.h	2013-05-03 23:21:27 +0000
@@ -496,6 +496,8 @@
   FN_ZORBA_STRING_IS_STREAMABLE_1,
   FN_ZORBA_STRING_SPLIT_2,
   FN_ZORBA_URI_DECODE_3,
+  FN_ZORBA_URI_PARSE_1,
+  FN_ZORBA_URI_SERIALIZE_1,
   FN_ZORBA_XQDOC_XQDOC_CONTENT_IMPL_2,
   FN_ZORBA_XQDOC_XQDOC_CONTENT_OPTIONS_IMPL_3,
 
 
=== modified file 'src/runtime/pregenerated/iterator_enum.h'
--- src/runtime/pregenerated/iterator_enum.h	2013-03-15 08:22:41 +0000
+++ src/runtime/pregenerated/iterator_enum.h	2013-05-03 23:21:27 +0000
@@ -369,6 +369,8 @@
   TYPE_StringIsStreamableIterator,
   TYPE_StringSplitIterator,
   TYPE_DecodeURIIterator,
+  TYPE_ParseURIIterator,
+  TYPE_SerializeURIIterator,
   TYPE_XQDocContentIterator,
 
 
 
=== modified file 'src/runtime/spec/uris/uris.xml'
--- src/runtime/spec/uris/uris.xml	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/uris/uris.xml	2013-05-03 23:21:27 +0000
@@ -37,4 +37,32 @@
   </zorba:function>
 </zorba:iterator>
 
+<zorba:iterator  name="ParseURIIterator">
+
+  <zorba:description author="Zorba Team">
+    uri:parse
+  </zorba:description>
+
+  <zorba:function>
+    <zorba:signature localname="parse" prefix="fn-zorba-uri">
+      <zorba:param>xs:string</zorba:param>
+      <zorba:output>object()</zorba:output>
+    </zorba:signature>
+  </zorba:function>
+</zorba:iterator>
+
+<zorba:iterator  name="SerializeURIIterator">
+
+  <zorba:description author="Zorba Team">
+    uri:serialize
+  </zorba:description>
+
+  <zorba:function>
+    <zorba:signature localname="serialize" prefix="fn-zorba-uri">
+      <zorba:param>object()</zorba:param>
+      <zorba:output>xs:string</zorba:output>
+    </zorba:signature>
+  </zorba:function>
+</zorba:iterator>
+
 </zorba:iterators>
 
=== modified file 'src/runtime/uris/pregenerated/uris.cpp'
--- src/runtime/uris/pregenerated/uris.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/uris/pregenerated/uris.cpp	2013-05-03 23:21:27 +0000
@@ -60,6 +60,62 @@
 // </DecodeURIIterator>
 
 
+// <ParseURIIterator>
+SERIALIZABLE_CLASS_VERSIONS(ParseURIIterator)
+
+void ParseURIIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+  serialize_baseclass(ar,
+  (NaryBaseIterator<ParseURIIterator, PlanIteratorState>*)this);
+}
+
+
+void ParseURIIterator::accept(PlanIterVisitor& v) const
+{
+  v.beginVisit(*this);
+
+  std::vector<PlanIter_t>::const_iterator lIter = theChildren.begin();
+  std::vector<PlanIter_t>::const_iterator lEnd = theChildren.end();
+  for ( ; lIter != lEnd; ++lIter ){
+    (*lIter)->accept(v);
+  }
+
+  v.endVisit(*this);
+}
+
+ParseURIIterator::~ParseURIIterator() {}
+
+// </ParseURIIterator>
+
+
+// <SerializeURIIterator>
+SERIALIZABLE_CLASS_VERSIONS(SerializeURIIterator)
+
+void SerializeURIIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+  serialize_baseclass(ar,
+  (NaryBaseIterator<SerializeURIIterator, PlanIteratorState>*)this);
+}
+
+
+void SerializeURIIterator::accept(PlanIterVisitor& v) const
+{
+  v.beginVisit(*this);
+
+  std::vector<PlanIter_t>::const_iterator lIter = theChildren.begin();
+  std::vector<PlanIter_t>::const_iterator lEnd = theChildren.end();
+  for ( ; lIter != lEnd; ++lIter ){
+    (*lIter)->accept(v);
+  }
+
+  v.endVisit(*this);
+}
+
+SerializeURIIterator::~SerializeURIIterator() {}
+
+// </SerializeURIIterator>
+
+
 
 }
 
 
=== modified file 'src/runtime/uris/pregenerated/uris.h'
--- src/runtime/uris/pregenerated/uris.h	2013-03-05 23:11:50 +0000
+++ src/runtime/uris/pregenerated/uris.h	2013-05-03 23:21:27 +0000
@@ -67,6 +67,70 @@
 };
 
 
+/**
+ * 
+ *    uri:parse
+ *  
+ * Author: Zorba Team
+ */
+class ParseURIIterator : public NaryBaseIterator<ParseURIIterator, PlanIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(ParseURIIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(ParseURIIterator,
+    NaryBaseIterator<ParseURIIterator, PlanIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar);
+
+  ParseURIIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& children)
+    : 
+    NaryBaseIterator<ParseURIIterator, PlanIteratorState>(sctx, loc, children)
+  {}
+
+  virtual ~ParseURIIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+
+/**
+ * 
+ *    uri:serialize
+ *  
+ * Author: Zorba Team
+ */
+class SerializeURIIterator : public NaryBaseIterator<SerializeURIIterator, PlanIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(SerializeURIIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(SerializeURIIterator,
+    NaryBaseIterator<SerializeURIIterator, PlanIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar);
+
+  SerializeURIIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& children)
+    : 
+    NaryBaseIterator<SerializeURIIterator, PlanIteratorState>(sctx, loc, children)
+  {}
+
+  virtual ~SerializeURIIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+
 }
 #endif
 /*
 
=== modified file 'src/runtime/uris/uris_impl.cpp'
--- src/runtime/uris/uris_impl.cpp	2013-04-16 21:12:12 +0000
+++ src/runtime/uris/uris_impl.cpp	2013-05-03 23:21:27 +0000
@@ -32,6 +32,18 @@
 
 #include "util/uri_util.h"
 
+#include "zorbatypes/URI.h"
+
+#define SCHEME_NAME      "scheme"
+#define OPAQUE_PART_NAME "opaque-part"
+#define AUTHORITY_NAME   "authority"
+#define USER_INFO_NAME   "user-info"
+#define HOST_NAME        "host"
+#define PORT_NAME        "port"
+#define PATH_NAME        "path"
+#define QUERY_NAME       "query"
+#define FRAGMENT_NAME    "fragment"
+
 using namespace std;
 
 namespace zorba {
@@ -101,5 +113,209 @@
 
   STACK_END (state);
 }
+
+/******************************************************************************
+*******************************************************************************/
+bool
+ParseURIIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+{
+  store::Item_t              lItemURI, lName, lValue;
+  std::vector<store::Item_t> lNames;
+  std::vector<store::Item_t> lValues;
+  zorba::zstring             lStrURI, lZKey, lZVal;
+  PlanIteratorState* state;
+  URI uri;
+  
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+  consumeNext(lItemURI, theChildren[0].getp(), planState);
+  lItemURI->getStringValue2(lStrURI);
+  uri = URI(lStrURI);
+
+  lZVal = uri.get_scheme();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(SCHEME_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+
+  lZVal = uri.get_opaque_part();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(OPAQUE_PART_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+
+  lZVal = uri.get_encoded_reg_based_authority();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(AUTHORITY_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+
+  lZVal = uri.get_encoded_user_info();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(USER_INFO_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+  
+  lZVal = uri.get_host();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(HOST_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+  
+  if(uri.get_port() != 0)
+  {
+    lZKey = zorba::zstring(PORT_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createInt(lValue, uri.get_port());
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+  
+  lZVal = uri.get_encoded_path();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(PATH_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+  
+  lZVal = uri.get_encoded_query();
+  if(uri.is_set(URI::QueryString))
+  {
+    lZKey = zorba::zstring(QUERY_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+  
+  lZVal = uri.get_encoded_fragment();
+  if(!lZVal.empty())
+  {
+    lZKey = zorba::zstring(FRAGMENT_NAME);
+    GENV_ITEMFACTORY->createString(lName, lZKey);
+    GENV_ITEMFACTORY->createString(lValue, lZVal);
+    lNames.push_back(lName);
+    lValues.push_back(lValue);
+  }
+
+  GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues);
+
+  STACK_PUSH(result, state );
+
+  STACK_END (state);
+}
+
+/******************************************************************************
+*******************************************************************************/
+bool
+SerializeURIIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+{
+  store::Item_t     lItemURI, lItemKey;
+  zorba::zstring    lStrValue, lStrKey, lStrRes;
+  store::Iterator_t lKeys;
+  URI               uri = URI();
+  int               lIntPort = 0;
+  bool              lHasSchemeField, lHasOpaqueField, lHasNotOpaqueField;
+
+  PlanIteratorState* state;
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+  consumeNext(lItemURI, theChildren[0].getp(), planState);
+
+  lHasSchemeField = lHasOpaqueField = lHasNotOpaqueField = false;
+  if(lItemURI->isJSONObject()) {
+    lKeys = lItemURI->getObjectKeys();
+    if(!lKeys.isNull()){
+      lKeys->open();
+      while(lKeys->next(lItemKey)){
+        lStrKey = lItemKey->getStringValue();
+        lStrValue = lItemURI->getObjectValue(lItemKey)->getStringValue();
+        if(lStrKey == SCHEME_NAME && !lStrValue.empty()){
+          uri.set_scheme(lStrValue);
+          lHasSchemeField = true;
+        } else if(lStrKey == OPAQUE_PART_NAME && !lStrValue.empty()){
+          uri.set_opaque_part(lStrValue);
+          lHasOpaqueField = true;
+        } else if(lStrKey == AUTHORITY_NAME && !lStrValue.empty()){
+          uri.set_reg_based_authority(lStrValue);
+          lHasNotOpaqueField = true;
+        } else if(lStrKey == USER_INFO_NAME && !lStrValue.empty()){
+          uri.set_user_info(lStrValue);
+          lHasNotOpaqueField = true;
+        } else if(lStrKey == HOST_NAME && !lStrValue.empty()){
+          uri.set_host(lStrValue);
+          lHasNotOpaqueField = true;
+        } else if(lStrKey == PORT_NAME){
+          sscanf(lStrValue.str().c_str(), "%d", &lIntPort);
+          if(lIntPort != 0){
+            uri.set_port(lIntPort);
+            lHasNotOpaqueField = true;
+          }
+        } else if(lStrKey == PATH_NAME && !lStrValue.empty()){
+          uri.set_path(lStrValue);
+          lHasNotOpaqueField = true;
+        } else if(lStrKey == QUERY_NAME){
+          uri.set_query(lStrValue);
+          lHasNotOpaqueField = true;
+        } else if(lStrKey == FRAGMENT_NAME){
+          uri.set_fragment(lStrValue);
+        }
+      }
+      lKeys->close();
+    }
+  }
+
+  // check for errors
+  if(lHasOpaqueField && lHasNotOpaqueField)
+  {
+    throw XQUERY_EXCEPTION(
+      zerr::ZURI0001_OPAQUE_WITH_OTHERS,
+      ERROR_LOC( loc )
+    );
+  }
+  if(lHasOpaqueField && !lHasSchemeField)
+  {
+    throw XQUERY_EXCEPTION(
+      zerr::ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE,
+      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,
+      ERROR_LOC( loc )
+    );
+  }
+  
+  lStrRes = zorba::zstring(uri.toString());
+  STACK_PUSH(GENV_ITEMFACTORY->createString(result, lStrRes), state );
+
+  STACK_END (state);
+}
+
 } // namespace zorba
 /* vim:set et sw=2 ts=2: */
 
=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2013-03-15 08:22:41 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2013-05-03 23:21:27 +0000
@@ -766,6 +766,10 @@
 
     class DecodeURIIterator;
 
+    class ParseURIIterator;
+
+    class SerializeURIIterator;
+
     class XQDocContentIterator;
 
 
@@ -1863,6 +1867,12 @@
     virtual void beginVisit ( const DecodeURIIterator& ) = 0;
     virtual void endVisit   ( const DecodeURIIterator& ) = 0;
 
+    virtual void beginVisit ( const ParseURIIterator& ) = 0;
+    virtual void endVisit   ( const ParseURIIterator& ) = 0;
+
+    virtual void beginVisit ( const SerializeURIIterator& ) = 0;
+    virtual void endVisit   ( const SerializeURIIterator& ) = 0;
+
     virtual void beginVisit ( const XQDocContentIterator& ) = 0;
     virtual void endVisit   ( const XQDocContentIterator& ) = 0;
 
 
=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-03-27 00:44:34 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-05-03 23:21:27 +0000
@@ -4905,6 +4905,34 @@
 // </DecodeURIIterator>
 
 
+// <ParseURIIterator>
+void PrinterVisitor::beginVisit ( const ParseURIIterator& a) {
+  thePrinter.startBeginVisit("ParseURIIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const ParseURIIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </ParseURIIterator>
+
+
+// <SerializeURIIterator>
+void PrinterVisitor::beginVisit ( const SerializeURIIterator& a) {
+  thePrinter.startBeginVisit("SerializeURIIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const SerializeURIIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </SerializeURIIterator>
+
+
 // <XQDocContentIterator>
 void PrinterVisitor::beginVisit ( const XQDocContentIterator& a) {
   thePrinter.startBeginVisit("XQDocContentIterator", ++theId);
 
=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2013-03-15 08:22:41 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2013-05-03 23:21:27 +0000
@@ -1170,6 +1170,12 @@
     void beginVisit( const DecodeURIIterator& );
     void endVisit  ( const DecodeURIIterator& );
 
+    void beginVisit( const ParseURIIterator& );
+    void endVisit  ( const ParseURIIterator& );
+
+    void beginVisit( const SerializeURIIterator& );
+    void endVisit  ( const SerializeURIIterator& );
+
     void beginVisit( const XQDocContentIterator& );
     void endVisit  ( const XQDocContentIterator& );
 
 
=== modified file 'src/unit_tests/test_uri.cpp'
--- src/unit_tests/test_uri.cpp	2013-02-07 17:24:36 +0000
+++ src/unit_tests/test_uri.cpp	2013-05-03 23:21:27 +0000
@@ -40,6 +40,7 @@
   zorba::zstring userinfo;
   zorba::zstring query;
   zorba::zstring path_notation;
+  zorba::zstring opaque_part;
 };
 
 
@@ -66,7 +67,8 @@
       "/",
       "",
       "",
-      "/" // path notation
+      "/", // path notation
+      ""
     },
     {
       "",
@@ -80,7 +82,8 @@
       "/",
       "",
       "",
-      "com/zorba-xquery/www/" // path notation
+      "com/zorba-xquery/www/", // path notation
+      ""
     },
     {
       "",
@@ -94,7 +97,8 @@
       "/",
       "",
       "abc=true",
-      "com/zorba-xquery/www/" // path notation
+      "com/zorba-xquery/www/", // path notation
+      ""
     },
     {
       "",
@@ -108,7 +112,8 @@
       "/",
       "",
       "abc=true",
-      "com/zorba-xquery/www/" // path notation
+      "com/zorba-xquery/www/", // path notation
+      ""
     },
     {
       "",
@@ -122,7 +127,8 @@
       "/",
       "user",
       "abc=true",
-      "com/zorba-xquery/www/" // path notation
+      "com/zorba-xquery/www/", // path notation
+      ""
     },
     {
       "",
@@ -136,7 +142,8 @@
       "/path1/path2",
       "user",
       "abc=true",
-      "com/zorba-xquery/www/path1/path2" // path notation
+      "com/zorba-xquery/www/path1/path2", // path notation
+      ""
     },
     {
       "",
@@ -150,7 +157,8 @@
       "/path1/path2",
       "user",
       "abc=true&bcd=false",
-      "com/zorba-xquery/www/path1/path2" // path notation
+      "com/zorba-xquery/www/path1/path2", // path notation
+      ""
     },
     {
       "",
@@ -164,7 +172,8 @@
       "/rfc/rfc1808.txt",
       "",
       "",
-      "za/co/is/ftp/rfc/rfc1808.txt" // path notation
+      "za/co/is/ftp/rfc/rfc1808.txt", // path notation
+      ""
     },
     {
       "",
@@ -178,7 +187,8 @@
       "/test",
       "thomas",
       "",
-      "[2001:6f8:9000:876:cccc:bbbb::]/test" // path notation
+      "[2001:6f8:9000:876:cccc:bbbb::]/test", // path notation
+      ""
     },
     // uri resolver tests
     {
@@ -193,7 +203,8 @@
       "/b/c/g",
       "",
       "",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -207,7 +218,8 @@
       "/b/c/g",
       "",
       "",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -221,7 +233,8 @@
       "/b/c/g/",
       "",
       "",
-      "a/b/c/g/" // path notation
+      "a/b/c/g/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -235,7 +248,8 @@
       "/g",
       "",
       "",
-      "a/g" // path notation
+      "a/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -249,7 +263,8 @@
       "/b/c/",
       "",
       "y",
-      "a/b/c/" // path notation
+      "a/b/c/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -263,7 +278,8 @@
       "/b/c/g",
       "",
       "y",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     } //,
   //{
   //  "http://a/b/c/d;p?q",
@@ -276,6 +292,7 @@
   //  "",
   //  "/b/c/g",
   //  "",
+  //  "".
   //  ""
   //}
     ,
@@ -291,7 +308,8 @@
       "/b/c/g",
       "",
       "",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -305,7 +323,8 @@
       "/b/c/g",
       "",
       "y",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -319,7 +338,8 @@
       "/b/c/;x",
       "",
       "",
-      "a/b/c/;x" // path notation
+      "a/b/c/;x", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -333,7 +353,8 @@
       "/b/c/g;x",
       "",
       "",
-      "a/b/c/g;x" // path notation
+      "a/b/c/g;x", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -347,7 +368,8 @@
       "/b/c/g;x",
       "",
       "y",
-      "a/b/c/g;x" // path notation
+      "a/b/c/g;x", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -361,7 +383,8 @@
       "/b/c/",
       "",
       "",
-      "a/b/c/" // path notation
+      "a/b/c/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -375,7 +398,8 @@
       "/b/c/",
       "",
       "",
-      "a/b/c/" // path notation
+      "a/b/c/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -389,7 +413,8 @@
       "/b/",
       "",
       "",
-      "a/b/" // path notation
+      "a/b/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -403,7 +428,8 @@
       "/b/",
       "",
       "",
-      "a/b/" // path notation
+      "a/b/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -417,7 +443,8 @@
       "/b/g",
       "",
       "",
-      "a/b/g" // path notation
+      "a/b/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -431,7 +458,8 @@
       "/",
       "",
       "",
-      "a/" // path notation
+      "a/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -445,7 +473,8 @@
       "/",
       "",
       "",
-      "a/" // path notation
+      "a/", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -459,7 +488,8 @@
       "/g",
       "",
       "",
-      "a/g" // path notation
+      "a/g", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -473,7 +503,8 @@
       "/b/c/g;x=1/y",
       "",
       "",
-      "a/b/c/g;x=1/y" // path notation
+      "a/b/c/g;x=1/y", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -487,7 +518,8 @@
       "/b/c/y",
       "",
       "",
-      "a/b/c/y" // path notation
+      "a/b/c/y", // path notation
+      ""
     },
     {
       "http://a/b/c/d;p?q",
@@ -501,7 +533,8 @@
       "/b/c/g",
       "",
       "",
-      "a/b/c/g" // path notation
+      "a/b/c/g", // path notation
+      ""
     },
     {
       "http://www.example.com/",
@@ -515,7 +548,8 @@
       "/",
       "",
       "",
-      "example.com" // path notation
+      "example.com", // path notation
+      ""
     },
     {
       "http://www.example.com/",
@@ -529,7 +563,8 @@
       "/dir/file",
       "",
       "",
-      "example.com" // path notation
+      "example.com", // path notation
+      ""
     },
     {
       "",
@@ -543,7 +578,8 @@
       "",
       "",
       "",
-      "de/msb/www" // path notation
+      "de/msb/www", // path notation
+      ""
     },
     {
       "http://www.msb.de/",
@@ -557,7 +593,8 @@
       "/lib/helpers",
       "",
       "",
-      "de/msb/www/lib/helpers" // path notation
+      "de/msb/www/lib/helpers", // path notation
+      ""
     },
     {
       "",
@@ -575,7 +612,8 @@
 #endif      
       "",
       "",
-      "/d:/a/b/c" // path notation
+      "/d:/a/b/c", // path notation
+      ""
       },
     {
       "",
@@ -593,7 +631,8 @@
 #endif
       "",
       "",
-      "localhost/d:/a/b/c" // path notation
+      "localhost/d:/a/b/c", // path notation
+      ""
     },
     {
       "file://localhost",
@@ -607,7 +646,83 @@
       "/Ångström/b/c",
       "",
       "",
-      "localhost/Ångström/b/c" // path notation
+      "localhost/Ångström/b/c", // path notation
+      ""
+    },
+    {
+      "",
+      "opaq:opaque-uri-part#frag",
+      "opaq:opaque-uri-part#frag",
+      "opaq",
+      0,
+      "frag",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "opaque-uri-part",
+      "opaque-uri-part"
+    },
+    {
+      "opaq:opaque-uri-part",
+      "#frag",
+      "opaq:opaque-uri-part#frag",
+      "opaq",
+      0,
+      "frag",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "opaque-uri-part",
+      "opaque-uri-part"
+    },
+    {
+      "",
+      "opaq:text-file.txt",
+      "opaq:text-file.txt",
+      "opaq",
+      0,
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "text-file.txt",
+      "text-file.txt"
+    },
+    {
+      "",
+      "ftp:///a/b/c/file.txt",
+      "ftp:///a/b/c/file.txt",
+      "ftp",
+      0,
+      "",
+      "",
+      "",
+      "/a/b/c/file.txt",
+      "",
+      "",
+      "/a/b/c/file.txt",
+      ""
+    },
+    {
+      "",
+      "gopher:///base_dir/file.txt",
+      "gopher:///base_dir/file.txt",
+      "gopher",
+      0,
+      "",
+      "",
+      "",
+      "/base_dir/file.txt",
+      "",
+      "",
+      "/base_dir/file.txt",
+      ""
     }
   }; // URITestEntry tests[]
 
 
=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp	2013-02-07 17:24:36 +0000
+++ src/zorbatypes/URI.cpp	2013-05-03 23:21:27 +0000
@@ -474,7 +474,7 @@
   : 
   theState(0),
   thePort(0),
-  valid(validate)
+  theValidate(validate)
 {
   initialize(uri);
 
@@ -489,7 +489,7 @@
   :
   theState(0),
   thePort(0),
-  valid(validate)
+  theValidate(validate)
 {
   initialize(uri, true);
   resolve(&base_uri);
@@ -503,7 +503,7 @@
    :
   theState(0),
   thePort(0),
-  valid(false)
+  theValidate(false)
 {
   initialize(full_uri.toString(), false);
   relativize(&base_uri);
@@ -526,7 +526,7 @@
   :
   theState(0),
   thePort(0),
-  valid(true)
+  theValidate(true)
 {
 }
 
@@ -553,7 +553,7 @@
   thePath              = to_copy.thePath;
   theQueryString       = to_copy.theQueryString;
   theFragment          = to_copy.theFragment;
-  valid                = to_copy.valid;
+  theValidate          = to_copy.theValidate;
 }
 
 
@@ -572,6 +572,7 @@
   thePath.clear();
   theQueryString.clear();
   theFragment.clear();
+  theOpaquePart.clear();
 
   // first, we need to normalize the spaces in the uri
   // and only work with the normalized version from this point on
@@ -615,7 +616,7 @@
       (lColonIdx > lFragmentIdx && lFragmentIdx != zstring::npos)) 
   {
     // A standalone base is a valid URI
-    if (valid &&
+    if (theValidate &&
         (lColonIdx == 0 || (!have_base && lFragmentIdx != zstring::npos)) &&
         lTrimmedURILength > 0)
     {
@@ -631,11 +632,17 @@
     lIndex = (ulong)theScheme.size() + 1;
   }
 
+  if(is_set(Scheme) && (lTrimmedURI.compare(lIndex, 1, "/") != 0))
+  {
+    // This is an opaque URI. Set that state here; initializePath() will
+    // actually set the value.
+    set_state(OpaquePart);
+  }
   /**
    * Authority
    * two slashes means generic URI syntax, so we get the authority
    */
-  if ( (lTrimmedURI.compare(lIndex, 2, "//") == 0) ||
+  else if ( (lTrimmedURI.compare(lIndex, 2, "//") == 0) ||
         // allow JAVA FILE constructs without authority, i.e.: file:/D:/myFile 
        (ZSTREQ(theScheme, "file") && (lTrimmedURI.compare(lIndex, 1, "/") == 0)))
   {
@@ -692,19 +699,16 @@
         set_host(zstring());
       }
     }
-    // do not allow constructs like: file:D:/myFile or http:myFile
   }
-  else if (ZSTREQ(theScheme, "file") ||
-           ZSTREQ(theScheme, "http") ||
-           ZSTREQ(theScheme, "https")) 
+  // do not allow constructs like: file:D:/myFile or http:myFile
+  else if (theValidate && (ZSTREQ(theScheme, "file") ||
+                           ZSTREQ(theScheme, "http") ||
+                           ZSTREQ(theScheme, "https") ) )
   {
-    if (valid)
-    {
-      throw XQUERY_EXCEPTION(
-        err::XQST0046,
-        ERROR_PARAMS( lTrimmedURI, ZED( BadURISyntaxForScheme_3 ), theScheme )
-      );
-     }
+    throw XQUERY_EXCEPTION(
+          err::XQST0046,
+          ERROR_PARAMS( lTrimmedURI, ZED( BadURISyntaxForScheme_3 ), theScheme )
+          );
   }
 
   // stop, if we're done here
@@ -727,7 +731,7 @@
 {
   zstring::size_type lSchemeSeparatorIdx = uri.find_first_of(":/?#", 0,4 );
   
-  if ( valid && lSchemeSeparatorIdx == zstring::npos ) 
+  if ( theValidate && lSchemeSeparatorIdx == zstring::npos )
   {
     throw XQUERY_EXCEPTION(
       err::XQST0046, ERROR_PARAMS( uri, ZED( NoURIScheme ) )
@@ -919,18 +923,12 @@
   ulong lEnd = (ulong)lCodepoints.size();
   uint32_t lCp = 0;
 
-  if (uri.empty())
-  {
-    thePath = uri;
-    set_state(Path);
-    return;
-  }
+  bool lIsOpaque = is_set(OpaquePart);
 
-  // path - everything up to query string or fragment
+  // path - everything up to query string (if not opaque) or fragment
   if ( lStart < lEnd )
   {
-    // RFC 2732 only allows '[' and ']' to appear in the opaque part.
-    if ( ! is_set(Scheme) || lCodepoints[lStart] == '/')
+    if ( ! is_set(Scheme) || lIsOpaque || lCodepoints[lStart] == '/')
     {
       // Scan path.
       // abs_path = "/"  path_segments
@@ -938,11 +936,20 @@
       while ( lIndex < lEnd )
       {
         lCp = lCodepoints[lIndex];
-        if ( lCp == '?' || lCp == '#' )
+        if (lCp == '?') {
+          if ( ! lIsOpaque) {
+            // Query string starting if not opaque
+            break;
+          }
+          // If it is an opaque URI, ? is fine
+        }
+        else if (lCp == '#' ) {
+          // Fragment starting
           break;
-
-        if ( lCp == '%' )
+        }
+        else if ( lCp == '%' )
         {
+          // Percent-decoding check
           if ( lIndex + 2 >= lEnd )
           {
             throw XQUERY_EXCEPTION(err::XQST0046,
@@ -965,7 +972,7 @@
             ERROR_PARAMS(uri, ZED(XQST0046_BadHexDigit_3), lHex2));
           }
         }
-        else if (!is_unreserved_char(lCp) && !is_path_character(lCp) && valid)
+        else if (theValidate && !is_unreserved_char(lCp) && !is_path_character(lCp))
         {
           throw XQUERY_EXCEPTION(err::XQST0046,
           ERROR_PARAMS(uri, ZED(BadUnicodeChar_3), lCp));
@@ -992,7 +999,7 @@
         {
           // TODO check errors
         }
-        else if (!is_reservered_or_unreserved_char(lCp) && valid)
+        else if (!is_reservered_or_unreserved_char(lCp) && theValidate)
         {
           throw XQUERY_EXCEPTION(
             err::XQST0046, ERROR_PARAMS( uri, ZED( BadUnicodeChar_3 ), lCp )
@@ -1005,15 +1012,23 @@
   } // lStart < lEnd
 
 
-  thePath.clear();
-  utf8::append_codepoints(lCodepoints.begin() + lStart,
-                          lCodepoints.begin() + lIndex,
-                          &thePath);
-
-  set_state(Path);
+  // lCodepoints now contains all the processed stuff; put it in the right place
+  if (lIsOpaque) {
+    theOpaquePart.clear();
+    utf8::append_codepoints(lCodepoints.begin() + lStart,
+                            lCodepoints.begin() + lIndex,
+                            &theOpaquePart);
+  }
+  else {
+    thePath.clear();
+    utf8::append_codepoints(lCodepoints.begin() + lStart,
+                            lCodepoints.begin() + lIndex,
+                            &thePath);
+    set_state(Path);
+  }
 
   // query - starts with ? and up to fragment or end
-  if ( lCp == '?' )
+  if ( ( ! lIsOpaque) && (lCp == '?') )
   {
     ++lIndex;
     lStart = lIndex;
@@ -1159,6 +1174,28 @@
   }
 }
 
+/*******************************************************************************
+
+********************************************************************************/
+void URI::set_query(const zstring& new_query)
+{
+  theQueryString = new_query;
+  set_state(QueryString);
+}
+
+void URI::set_opaque_part(const zstring& new_scheme_specific)
+{
+  if (new_scheme_specific.empty())
+  {
+    theOpaquePart = new_scheme_specific;
+    unset_state(OpaquePart);
+  }
+  else
+  {
+    theOpaquePart = new_scheme_specific;
+    set_state(OpaquePart);
+  }
+}
 
 /*******************************************************************************
 
@@ -1287,7 +1324,7 @@
       set_state(Path);
     }
 
-    if ( (! is_set(QueryString)) ) 
+    if ( base_uri->is_set(QueryString) && !is_set(QueryString) )
     {
         base_uri->get_query(theQueryString);
 
@@ -1584,6 +1621,13 @@
   std::ostringstream lPathNotation;
 
   std::string lToTokenize;
+
+  if(is_set(OpaquePart))
+  {
+    thePathNotation = theOpaquePart.str();
+    return;
+  }
+
   if (is_set(Host)) 
   {
     lToTokenize = theHost.str();
@@ -1593,7 +1637,7 @@
     lToTokenize = theRegBasedAuthority.str();
   }
 
-  std::string::size_type lastPos = 
+  std::string::size_type lastPos =
       lToTokenize.find_last_not_of(".", lToTokenize.length());
 
   std::string::size_type pos = lToTokenize.find_last_of(".", lastPos);
@@ -1637,37 +1681,45 @@
   if ( is_set(Scheme) )
     lURI << theScheme << ":";
 
-  // Authority
-  if ( is_set(Host) || is_set(RegBasedAuthority) ) 
-  {
-    lURI << "//";
-    if ( is_set(Host) ) 
-    {
-      if ( is_set(UserInfo) )
-        lURI << theUserInfo << "@";
-
-      lURI << theHost;
-
-      if ( is_set(Port) )
-        lURI << ":" << thePort;
-    }
-    else
-    {
-      lURI << theRegBasedAuthority;
-    }
-  }
-
-  if ( is_set(Path) )
-  {
-  #ifdef WIN32
-    if(ZSTREQ(theScheme, "file") && !thePath.empty() && (thePath[0] != '/'))
-        lURI << "/";
-  #endif
-    lURI << thePath;
-  }
-
-  if ( is_set(QueryString) )
-    lURI << "?" << theQueryString;
+  if(is_set(OpaquePart))
+  {
+    // opaque URL
+    lURI << theOpaquePart;
+  }
+  else
+  {
+    // Authority
+    if ( is_set(Host) || is_set(RegBasedAuthority) )
+    {
+      lURI << "//";
+      if ( is_set(Host) )
+      {
+        if ( is_set(UserInfo) )
+          lURI << theUserInfo << "@";
+
+        lURI << theHost;
+
+        if ( is_set(Port) )
+          lURI << ":" << thePort;
+      }
+      else
+      {
+        lURI << theRegBasedAuthority;
+      }
+    }
+
+    if ( is_set(Path) )
+    {
+    #ifdef WIN32
+      if(ZSTREQ(theScheme, "file") && !thePath.empty() && (thePath[0] != '/'))
+          lURI << "/";
+    #endif
+      lURI << thePath;
+    }
+
+    if ( is_set(QueryString) )
+      lURI << "?" << theQueryString;
+  }
 
   if ( is_set(Fragment) )
     lURI << "#" << theFragment;
@@ -1687,38 +1739,46 @@
   if ( is_set(Scheme) )
     lURI << theScheme << ":";
 
-  // Authority
-  if ( is_set(Host) || is_set(RegBasedAuthority) ) 
-  {
-    lURI << "//";
-    
-    if ( is_set(Host) ) 
-    {
-      if ( is_set(UserInfo) )
-        lURI << theUserInfo << "@";
-
-      lURI << theHost;
-
-      if ( is_set(Port) )
-        lURI << ":" << thePort;
-    }
-    else 
-    {
-      lURI << theRegBasedAuthority;
-    }
-  }
-
-  if ( is_set(Path) )
-  {
-  #ifdef WIN32
-    if(ZSTREQ(theScheme, "file") && !thePath.empty() && (thePath[0] != '/'))
-        lURI << "/";
-  #endif
-    lURI << thePath;
-  }
-
-  if ( is_set(QueryString) )
-    lURI << "?" << theQueryString;
+  if (is_set(OpaquePart))
+  {
+    // opaque uri
+    lURI << theOpaquePart;
+  }
+  else
+  {
+    // Authority
+    if ( is_set(Host) || is_set(RegBasedAuthority) )
+    {
+      lURI << "//";
+
+      if ( is_set(Host) )
+      {
+        if ( is_set(UserInfo) )
+          lURI << theUserInfo << "@";
+
+        lURI << theHost;
+
+        if ( is_set(Port) )
+          lURI << ":" << thePort;
+      }
+      else
+      {
+        lURI << theRegBasedAuthority;
+      }
+    }
+
+    if ( is_set(Path) )
+    {
+    #ifdef WIN32
+      if(ZSTREQ(theScheme, "file") && !thePath.empty() && (thePath[0] != '/'))
+          lURI << "/";
+    #endif
+      lURI << thePath;
+    }
+
+    if ( is_set(QueryString) )
+      lURI << "?" << theQueryString;
+  }
 
   if ( is_set(Fragment) )
     lURI << "#" << theFragment;
 
=== modified file 'src/zorbatypes/URI.h'
--- src/zorbatypes/URI.h	2013-02-07 17:24:36 +0000
+++ src/zorbatypes/URI.h	2013-05-03 23:21:27 +0000
@@ -49,19 +49,20 @@
 
   static long scanHexSequence(const char* addr, long idx, long end, long& counter);
 
-protected:
   enum States 
   {
-    Scheme            = 1,
-    UserInfo          = 2,
-    Host              = 4,
-    Port              = 8,
-    RegBasedAuthority = 16,
-    Path              = 32,
-    QueryString       = 64,
-    Fragment          = 128
+    Scheme             = 1,
+    UserInfo           = 2,
+    Host               = 4,
+    Port               = 8,
+    RegBasedAuthority  = 16,
+    Path               = 32,
+    QueryString        = 64,
+    Fragment           = 128,
+    OpaquePart         = 256
   };
 
+protected:
   // keep track whether particular components of a uri are defined or undefined
   mutable uint32_t theState;
 
@@ -81,9 +82,10 @@
   zstring          thePath;
   zstring          theQueryString;
   zstring          theFragment;
+  zstring          theOpaquePart;
 
   // true if the constructed URI is valid
-  bool             valid;
+  bool             theValidate;
 
 public:
   URI(const zstring& uri, bool validate = true);
@@ -154,6 +156,14 @@
 
   void clear_fragment();
 
+  void set_opaque_part(const zstring& new_opaque_part);
+
+  const zstring& get_opaque_part() const;
+
+  void clear_opaque_part();
+
+  bool is_set(uint32_t s) const { return ((theState & s) > 0); }
+
 protected:
   void build_full_text() const;
 
@@ -185,8 +195,6 @@
 
   void set_state(uint32_t s) const { theState |= s; }
 
-  bool is_set(uint32_t s) const { return ((theState & s) > 0); }
-
   void unset_state(uint32_t s) const { theState &= ~s; }
 
   void invalidate_text() const;
@@ -195,7 +203,9 @@
 
 inline bool URI::is_valid() const
 {
-  return valid;
+  // If we requested validation originally, and successfully passed the
+  // initialize step - we're valid!
+  return theValidate;
 }
 
 
@@ -246,9 +256,15 @@
   return theFragment;
 }
 
+inline const zstring& URI::get_opaque_part() const
+{
+  return theOpaquePart;
+}
+
 inline void URI::set_fragment(const zstring &new_fragment)
 {
   theFragment = new_fragment;
+  set_state(Fragment);
   invalidate_text();
 }
 
@@ -259,6 +275,13 @@
   invalidate_text();
 }
 
+inline void URI::clear_opaque_part()
+{
+  theOpaquePart.clear();
+  unset_state(OpaquePart);
+  invalidate_text();
+}
+
 inline void URI::invalidate_text() const
 {
   theASCIIURIText.clear();
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-05-03 07:40:27 +0000
+++ test/fots/CMakeLists.txt	2013-05-03 23:21:27 +0000
@@ -303,7 +303,6 @@
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-12 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 0)
-EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-19 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
 
=== added file 'test/rbkt/ExpQueryResults/zorba/uris/parse-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/parse-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/parse-uri.xml.res	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+{ "scheme" : "http", "path" : "/" }{ "scheme" : "http", "host" : "www.zorba-xquery.com", "path" : "/" }{ "scheme" : "http", "host" : "www.zorba-xquery.com", "path" : "/", "query" : "abc=true" }{ "scheme" : "http", "host" : "www.zorba-xquery.com", "port" : 8080, "path" : "/", "query" : "abc=true" }{ "scheme" : "http", "user-info" : "user", "host" : "www.zorba-xquery.com", "port" : 8080, "path" : "/", "query" : "abc=true" }{ "scheme" : "http", "user-info" : "user", "host" : "www.zorba-xquery.com", "port" : 8080, "path" : "/path1/path2", "query" : "abc=true" }{ "scheme" : "http", "user-info" : "user", "host" : "www.zorba-xquery.com", "port" : 8080, "path" : "/path1/path2", "query" : "abc=true&bcd=false", "fragment" : "fragment" }{ "scheme" : "ftp", "host" : "ftp.is.co.za", "path" : "/rfc/rfc1808.txt" }{ "scheme" : "http", "user-info" : "thomas", "host" : "[2001:6f8:9000:876:cccc:bbbb::]", "port" : 123, "path" : "/test" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g/" }{ "scheme" : "http", "host" : "a", "path" : "/g" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/", "query" : "y" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g", "query" : "y" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g", "fragment" : "s" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g", "query" : "y", "fragment" : "s" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/;x" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g;x" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g;x", "query" : "y", "fragment" : "s" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/" }{ "scheme" : "http", "host" : "a", "path" : "/b/" }{ "scheme" : "http", "host" : "a", "path" : "/b/" }{ "scheme" : "http", "host" : "a", "path" : "/b/g" }{ "scheme" : "http", "host" : "a", "path" : "/" }{ "scheme" : "http", "host" : "a", "path" : "/" }{ "scheme" : "http", "host" : "a", "path" : "/g" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g;x=1/y" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/y" }{ "scheme" : "http", "host" : "a", "path" : "/b/c/g", "fragment" : "s/../x" }{ "scheme" : "http", "host" : "www.example.com", "path" : "/" }{ "scheme" : "http", "host" : "www.example.com", "path" : "/dir/file" }{ "scheme" : "http", "host" : "www.msb.de" }{ "scheme" : "http", "host" : "www.msb.de", "path" : "/lib/helpers" }{ "scheme" : "file", "path" : "/d:/a/b/c" }{ "scheme" : "file", "host" : "localhost", "path" : "/d:/a/b/c" }{ "scheme" : "file", "host" : "localhost", "path" : "/Ångström/b/c" }{ "scheme" : "file", "opaque-part" : "opaque-uri-part", "fragment" : "frag" }{ "scheme" : "file", "opaque-part" : "text-file.txt" }{ "scheme" : "file", "opaque-part" : "bar?" }{ "scheme" : "file", "opaque-part" : "bar?", "fragment" : "frag" }{ "scheme" : "http", "host" : "foo.com", "path" : "/bc", "query" : "" }
 \ No newline at end of file
 
=== added file 'test/rbkt/ExpQueryResults/zorba/uris/serialize-direct-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/serialize-direct-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/serialize-direct-uri.xml.res	2013-05-03 23:21:27 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+http:/ 
+ http://www.zorba-xquery.com/ 
+ http://www.zorba-xquery.com/?abc=true 
+ http://www.zorba-xquery.com:8080/?abc=true 
+ http://[e-mail]:8080/?abc=true 
+ http://[e-mail]:8080/path1/path2?abc=true 
+ http://[e-mail]:8080/path1/path2?abc=true&amp;bcd=false 
+ ftp://ftp.is.co.za/rfc/rfc1808.txt 
+ http://thomas@[2001:6f8:9000:876:cccc:bbbb::]:123/test 
+ http://a/b/c/g 
+ http://a/b/c/g/ 
+ http://a/g 
+ http://a/b/c/?y 
+ http://a/b/c/g?y 
+ http://a/b/c/g#s 
+ http://a/b/c/g?y#s 
+ http://a/b/c/;x 
+ http://a/b/c/g;x 
+ http://a/b/c/g;x?y#s 
+ http://a/b/c 
+ http://a/b/c/ 
+ http://a/b 
+ http://a/b/ 
+ http://a/b/g 
+ http://a/ 
+ http://a/g 
+ http://a/b/c/g;x=1/y 
+ http://a/b/c/y 
+ http://a/b/c/g#s/../x 
+ http://www.example.com/ 
+ http://www.example.com/dir/file 
+ http://www.msb.de 
+ http://www.msb.de/lib/helpers 
+ file://localhost/Ångström/b/c 
+ file:opaque-uri-part#frag 
+ file:text-file.txt 
 
=== added file 'test/rbkt/ExpQueryResults/zorba/uris/serialize-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/serialize-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/serialize-uri.xml.res	2013-05-03 23:21:27 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+http:/
+ http://www.zorba-xquery.com/
+ http://www.zorba-xquery.com/?abc=true
+ http://www.zorba-xquery.com:8080/?abc=true
+ http://[e-mail]:8080/?abc=true
+ http://[e-mail]:8080/path1/path2?abc=true
+ http://[e-mail]:8080/path1/path2?abc=true&amp;bcd=false#fragment
+ ftp://ftp.is.co.za/rfc/rfc1808.txt
+ http://thomas@[2001:6f8:9000:876:cccc:bbbb::]:123/test
+ http://a/b/c/g
+ http://a/b/c/g
+ http://a/b/c/g/
+ http://a/g
+ http://a/b/c/?y
+ http://a/b/c/g?y
+ http://a/b/c/g#s
+ http://a/b/c/g?y#s
+ http://a/b/c/;x
+ http://a/b/c/g;x
+ http://a/b/c/g;x?y#s
+ http://a/b/c/
+ http://a/b/c/
+ http://a/b/
+ http://a/b/
+ http://a/b/g
+ http://a/
+ http://a/
+ http://a/g
+ http://a/b/c/g;x=1/y
+ http://a/b/c/y
+ http://a/b/c/g#s/../x
+ http://www.example.com/
+ http://www.example.com/dir/file
+ http://www.msb.de
+ http://www.msb.de/lib/helpers
+ file:/d:/a/b/c
+ file://localhost/d:/a/b/c
+ file://localhost/Ångström/b/c
+ file:opaque-uri-part#frag
+ file:text-file.txt
+ file:bar?
+ file:bar?#frag
+ http://foo.com/bc?
 \ No newline at end of file
 
=== added file 'test/rbkt/Queries/zorba/uris/parse-invalid.spec'
--- test/rbkt/Queries/zorba/uris/parse-invalid.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/parse-invalid.spec	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XQST0046
 
=== added file 'test/rbkt/Queries/zorba/uris/parse-invalid.xq'
--- test/rbkt/Queries/zorba/uris/parse-invalid.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/parse-invalid.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,3 @@
+import module namespace uri="http://www.zorba-xquery.com/modules/uri";
+
+uri:parse("foo:bar%%")
 
=== added file 'test/rbkt/Queries/zorba/uris/parse-uri.xq'
--- test/rbkt/Queries/zorba/uris/parse-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/parse-uri.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,6 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $xml-uri-test := fn:doc("uri-source.xml")//uri-element/text()
+
+for $uri in $xml-uri-test
+return uri:parse($uri)
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq'
--- test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-direct-uri.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,211 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $xml-uri-test := { "uri-test" : 
+ [
+   { 
+     $uri:SCHEME : "http",
+     $uri:PATH : "/"
+   },
+   { 
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/",
+     $uri:QUERY : "abc=true"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:PORT : 8080,
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/",
+     $uri:QUERY : "abc=true"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:PORT : 8080,
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/",
+     $uri:USER-INFO : "user",
+     $uri:QUERY : "abc=true"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:PORT : 8080,
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/path1/path2",
+     $uri:USER-INFO : "user",
+     $uri:QUERY : "abc=true"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:PORT : 8080,
+     $uri:HOST : "www.zorba-xquery.com",
+     $uri:PATH : "/path1/path2",
+     $uri:USER-INFO : "user",
+     $uri:QUERY : "abc=true&amp;bcd=false"
+   },
+   {
+     $uri:SCHEME : "ftp",
+     $uri:HOST : "ftp.is.co.za",
+     $uri:PATH : "/rfc/rfc1808.txt"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:PORT : 123,
+     $uri:HOST : "[2001:6f8:9000:876:cccc:bbbb::]",
+     $uri:PATH : "/test",
+     $uri:USER-INFO : "thomas"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/",
+     $uri:QUERY : "y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g",
+     $uri:QUERY : "y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:FRAGMENT : "s",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:FRAGMENT : "s",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g",
+     $uri:QUERY : "y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/;x"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g;x"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:FRAGMENT : "s",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g;x",
+     $uri:QUERY : "y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g;x=1/y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/y"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:FRAGMENT : "s/../x",
+     $uri:HOST : "a",
+     $uri:PATH : "/b/c/g"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.example.com",
+     $uri:PATH : "/"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.example.com",
+     $uri:PATH : "/dir/file"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.msb.de"
+   },
+   {
+     $uri:SCHEME : "http",
+     $uri:HOST : "www.msb.de",
+     $uri:PATH : "/lib/helpers"
+   },
+   {
+     $uri:SCHEME : "file",
+     $uri:HOST : "localhost",
+     $uri:PATH : "/Ångström/b/c"
+   },
+   {
+     $uri:SCHEME : "file",
+     $uri:OPAQUE-PART : "opaque-uri-part",
+     $uri:FRAGMENT : "frag"
+   },
+   {
+     $uri:SCHEME : "file",
+     $uri:OPAQUE-PART : "text-file.txt"
+   }
+ ]
+}
+
+for $index in 1 to jn:size($xml-uri-test("uri-test"))
+let $uri := $xml-uri-test("uri-test")($index)
+return ( uri:serialize($uri), "
+")
+
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-uri.xq'
--- test/rbkt/Queries/zorba/uris/serialize-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-uri.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,9 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $xml-uri-test := fn:doc("uri-source.xml")//uri-element
+
+for $uri in $xml-uri-test
+let $parsed-uri := uri:parse($uri)
+return concat(uri:serialize($parsed-uri), "
+")
+
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZURI0002
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,8 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $wrong-opaque-noscheme-json := 
+   {
+     "opaque-part" : "myfile.xml"
+   }
+
+return uri:serialize($wrong-opaque-noscheme-json)
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZURI0001
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,10 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $wrong-opaque-json := 
+   {
+     "scheme" : "http",
+     "opaque-part" : "myfile.xml",
+     "path" : "d:/a/b/c"
+   }
+
+return uri:serialize($wrong-opaque-json)
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZURI0003
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path1.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,9 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $wrong-path-json := 
+   {
+     "scheme" : "file",
+     "path" : "d:/a/b/c"
+   }
+
+return uri:serialize($wrong-path-json)
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec	2013-05-03 23:21:27 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZURI0003
 
=== added file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path2.xq	2013-05-03 23:21:27 +0000
@@ -0,0 +1,10 @@
+import module namespace uri = "http://www.zorba-xquery.com/modules/uri";
+
+let $wrong-path-json := 
+   {
+     "scheme" : "file",
+     "host" : "localhost",
+     "path" : "d:/a/b/c"
+   }
+
+return uri:serialize($wrong-path-json)
 
=== added file 'test/rbkt/Queries/zorba/uris/uri-source.xml'
--- test/rbkt/Queries/zorba/uris/uri-source.xml	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/uri-source.xml	2013-05-03 23:21:27 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uri-test>
+  <uri-element>http:///</uri-element>
+  <uri-element>http://www.zorba-xquery.com/</uri-element>
+  <uri-element>http://www.zorba-xquery.com/?abc=true</uri-element>
+  <uri-element>http://www.zorba-xquery.com:8080/?abc=true</uri-element>
+  <uri-element>http://[e-mail]:8080/?abc=true</uri-element>
+  <uri-element>http://[e-mail]:8080/path1/path2?abc=true</uri-element>
+  <uri-element>http://[e-mail]:8080/path1/path2?abc=true&amp;bcd=false#fragment</uri-element>
+  <uri-element>ftp://ftp.is.co.za/rfc/rfc1808.txt</uri-element>
+  <uri-element>http://thomas@[2001:6f8:9000:876:cccc:bbbb::]:123/test</uri-element>
+  <uri-element>http://a/b/c/g</uri-element>
+  <uri-element>http://a/b/c/g</uri-element>
+  <uri-element>http://a/b/c/g/</uri-element>
+  <uri-element>http://a/g</uri-element>
+  <uri-element>http://a/b/c/?y</uri-element>
+  <uri-element>http://a/b/c/g?y</uri-element>
+  <uri-element>http://a/b/c/g#s</uri-element>
+  <uri-element>http://a/b/c/g?y#s</uri-element>
+  <uri-element>http://a/b/c/;x</uri-element>
+  <uri-element>http://a/b/c/g;x</uri-element>
+  <uri-element>http://a/b/c/g;x?y#s</uri-element>
+  <uri-element>http://a/b/c/</uri-element>
+  <uri-element>http://a/b/c/</uri-element>
+  <uri-element>http://a/b/</uri-element>
+  <uri-element>http://a/b/</uri-element>
+  <uri-element>http://a/b/g</uri-element>
+  <uri-element>http://a/</uri-element>
+  <uri-element>http://a/</uri-element>
+  <uri-element>http://a/g</uri-element>
+  <uri-element>http://a/b/c/g;x=1/y</uri-element>
+  <uri-element>http://a/b/c/y</uri-element>
+  <uri-element>http://a/b/c/g#s/../x</uri-element>
+  <uri-element>http://www.example.com/</uri-element>
+  <uri-element>http://www.example.com/dir/file</uri-element>
+  <uri-element>http://www.msb.de</uri-element>
+  <uri-element>http://www.msb.de/lib/helpers</uri-element>
+  <uri-element>file:///d:/a/b/c</uri-element>
+  <uri-element>file://localhost/d:/a/b/c</uri-element>
+  <uri-element>file://localhost/Ångström/b/c</uri-element>
+  <uri-element>file:opaque-uri-part#frag</uri-element>
+  <uri-element>file:text-file.txt</uri-element>
+  <uri-element>file:bar?</uri-element>
+  <uri-element>file:bar?#frag</uri-element>
+  <uri-element>http://foo.com/bc?</uri-element>
+</uri-test>