Merge lp:~paul-lucas/zorba/bug-888242 into lp:zorba

[Paul J. Lucas]

Moved URI resolution for the thesaurus into the translator.

Moved URI resolution for the thesaurus into the translator.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-888242-2012-07-02T23-16-05.946Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-888242-2012-07-03T00-03-01.855Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-888242-2012-07-03T00-03-01.855Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-888242-2012-07-09T17-18-00.226Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-888242-2012-07-09T17-18-00.226Z is finished. The
  final status was:

  2 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/bug-888242-2012-07-09T18-11-57.967Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-888242-2012-07-09T18-11-57.967Z is finished. The
  final status was:

  2 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/bug-888242-2012-07-09T22-37-31.106Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-888242-2012-07-09T22-37-31.106Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-06-29 21:53:55 +0000
+++ src/compiler/translator/translator.cpp	2012-07-02 23:14:21 +0000
@@ -13795,6 +13795,16 @@
 void end_visit (const FTThesaurusID& v, void* /*visit_state*/) {
   TRACE_VISIT_OUT ();
 #ifndef ZORBA_NO_FULL_TEXT
+  zstring const &uri = v.get_uri();
+  zstring error_msg;
+  std::auto_ptr<internal::Resource> rsrc(
+    theSctx->resolve_uri( uri, internal::EntityData::THESAURUS, error_msg )
+  );
+  if ( !rsrc.get() )
+    throw XQUERY_EXCEPTION(
+      err::FTST0018, ERROR_PARAMS( uri ), ERROR_LOC( loc )
+    );
+
   ftrange *levels;
   if ( v.get_levels() ) {
     levels = dynamic_cast<ftrange*>( pop_ftstack() );
@@ -13802,9 +13812,8 @@
   } else
     levels = nullptr;
 
-  ftthesaurus_id *const tid = new ftthesaurus_id(
-    loc, v.get_uri(), v.get_relationship(), levels
-  );
+  ftthesaurus_id *const tid =
+    new ftthesaurus_id( loc, uri, v.get_relationship(), levels );
   push_ftstack( tid );
 #endif /* ZORBA_NO_FULL_TEXT */
 }
 
=== modified file 'src/runtime/full_text/apply.cpp'
--- src/runtime/full_text/apply.cpp	2012-06-28 04:14:03 +0000
+++ src/runtime/full_text/apply.cpp	2012-07-02 23:14:21 +0000
@@ -1224,8 +1224,7 @@
   auto_ptr<internal::Resource> rsrc = static_ctx_.resolve_uri(
     uri, internal::EntityData::THESAURUS, error_msg
   );
-  if ( !rsrc.get() )
-    throw XQUERY_EXCEPTION( err::FTST0018, ERROR_PARAMS( uri ) );
+  ZORBA_ASSERT( rsrc.get() );
 
   internal::ThesaurusProvider const *const t_provider =
     dynamic_cast<internal::ThesaurusProvider const*>( rsrc.get() );
 
=== modified file 'src/runtime/full_text/thesaurus.cpp'
--- src/runtime/full_text/thesaurus.cpp	2012-06-28 04:14:03 +0000
+++ src/runtime/full_text/thesaurus.cpp	2012-07-02 23:14:21 +0000
@@ -104,8 +104,9 @@
     return nullptr;
 
   switch ( thesaurus_impl::find( scheme_name ) ) {
-    case thesaurus_impl::xqftts: {
-      //
+    case thesaurus_impl::xqftts:
+#   ifdef ZORBA_WITH_FILE_ACCESS
+    {
       // Currently, we presume that an "xqftts:" URL should be used exactly
       // like a "file:" URL.
       //
@@ -114,9 +115,10 @@
       zstring const t_path( fs::get_normalized_path( t_uri ) );
       return new xqftts::provider( t_path );
     }
+#   endif /* ZORBA_WITH_FILE_ACCESS */
+    case thesaurus_impl::wordnet:
 #   ifdef ZORBA_WITH_FILE_ACCESS
-    case thesaurus_impl::wordnet: {
-      //
+    {
       // Wordnet, on the other hand, needs to find its data file in Zorba's
       // library path using the mangled form of the original URI.  So, mangle
       // here for convenience.
@@ -126,6 +128,9 @@
       return new wordnet::provider( t_path );
     }
 #   endif /* ZORBA_WITH_FILE_ACCESS */
+#   ifndef ZORBA_WITH_FILE_ACCESS
+      throw XQUERY_EXCEPTION( zerr::ZXQP0017_FILE_ACCESS_DISABLED );
+#   endif /* ZORBA_WITH_FILE_ACCESS */
     default:
       throw XQUERY_EXCEPTION( err::FTST0018, ERROR_PARAMS( url ) );
   }