Merge lp:~zorba-coders/zorba/bug925816 into lp:zorba

[Rodolfo Ochoa]

Added recognition for URIs without authority, this is a JAVA URI case.

Added recognition for URIs without authority, this is a JAVA URI case.

[Cezar Andrei (cezar-andrei)]

I think the URI code should allow even more broad constructs than this. Approving to get this going.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug925816-2012-02-04T01-51-57.631Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug925816-2012-02-04T01-51-57.631Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

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

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug925816-2012-02-05T04-03-52.902Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug925816-2012-02-05T04-03-52.902Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug925816-2012-02-06T00-10-55.72Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug925816-2012-02-06T00-10-55.72Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp	2011-12-21 14:40:33 +0000
+++ src/zorbatypes/URI.cpp	2012-02-03 01:31:20 +0000
@@ -99,6 +99,18 @@
     zstring tmp(uri.c_str() + 8);
     uri::decode(tmp, &filepath);
   }
+  else if (uri.compare(0, 6, "file:/") == 0 && //JAVA Exception for File URIs without Authority
+          ((uri.compare(7, 1, ":") == 0) || (uri.compare(7, 4, "%3A/") == 0))) 
+  {
+    zstring tmp(uri.c_str() + 6);
+    uri::decode(tmp, &filepath);
+  }
+  else if (uri.compare(0, 17, "file://localhost/") == 0 && 
+      ((uri.compare(18, 1, ":") == 0) || (uri.compare(18, 4, "%3A/") == 0))) 
+  {
+    zstring tmp(uri.c_str() + 17);
+    uri::decode(tmp, &filepath);
+  }
   else
 #endif
     if (uri.compare(0, 8, "file:///") == 0) 
@@ -621,9 +633,13 @@
    * Authority
    * two slashes means generic URI syntax, so we get the authority
    */
-  if (lTrimmedURI.compare(lIndex, 2, "//") == 0) 
+  if ( (lTrimmedURI.compare(lIndex, 2, "//") == 0) ||
+        // allow JAVA FILE constructs without authority, i.e.: file:/D:/myFile 
+       (ZSTREQ(theScheme, "file") && (lTrimmedURI.compare(lIndex, 1, "/") == 0)))
   {
-    lIndex += 2;
+    if ((lTrimmedURI.compare(lIndex, 2, "//") == 0)) {
+      lIndex += 2;
+    }
     if (lIndex >= lTrimmedURILength)
     {
       throw XQUERY_EXCEPTION(