zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-901520 into lp:zorba.

Requested reviews:
  Paul J. Lucas (paul-lucas)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #901520 in Zorba: "Build fails with ZORBA_NO_FULL_TEXT=ON"
  https://bugs.launchpad.net/zorba/+bug/901520

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-901520/+merge/84884

Fixed build.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-901520/+merge/84884
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/api/uri_resolver_wrappers.cpp'
--- src/api/uri_resolver_wrappers.cpp	2011-10-24 23:26:11 +0000
+++ src/api/uri_resolver_wrappers.cpp	2011-12-08 04:02:28 +0000
@@ -28,7 +28,11 @@
   // external mappers/resolvers. This can serve as a plain EntityData or
   // a ThesaurusEntityData. However, when there's another EntityData subclass
   // in future, this won't work as EntityData becomes an ambiguous base class...
+#ifndef ZORBA_NO_FULL_TEXT
   class EntityDataWrapper : public ThesaurusEntityData
+#else
+  class EntityDataWrapper : public EntityData
+#endif /* ZORBA_NO_FULL_TEXT */
   {
   public:
     static EntityDataWrapper const* create(internal::EntityData const* aData) {
@@ -39,6 +43,7 @@
         return new EntityDataWrapper(EntityData::MODULE);
       case internal::EntityData::SCHEMA:
         return new EntityDataWrapper(EntityData::SCHEMA);
+#ifndef ZORBA_NO_FULL_TEXT
       case internal::EntityData::THESAURUS:
       {
         EntityDataWrapper* retval = new EntityDataWrapper(EntityData::THESAURUS);
@@ -48,6 +53,7 @@
       }
       case internal::EntityData::STOP_WORDS:
         return new EntityDataWrapper(EntityData::STOP_WORDS);
+#endif /* ZORBA_NO_FULL_TEXT */
       case internal::EntityData::COLLECTION:
         return new EntityDataWrapper(EntityData::COLLECTION);
       case internal::EntityData::DOCUMENT:
@@ -61,9 +67,11 @@
       return theKind;
     }
 
+#ifndef ZORBA_NO_FULL_TEXT
     virtual zorba::locale::iso639_1::type getLanguage() const {
       return theThesaurusLang;
     }
+#endif /* ZORBA_NO_FULL_TEXT */
 
   private:
     EntityDataWrapper(EntityData::Kind aKind)
@@ -71,7 +79,9 @@
     {}
 
     EntityData::Kind const theKind;
+#ifndef ZORBA_NO_FULL_TEXT
     zorba::locale::iso639_1::type theThesaurusLang;
+#endif /* ZORBA_NO_FULL_TEXT */
   };
 
   URIMapperWrapper::URIMapperWrapper(zorba::URIMapper& aUserMapper)
@@ -157,6 +167,7 @@
                                            lUserStream->getStreamReleaser());
         lUserStream->setStreamReleaser(nullptr);
       }
+#ifndef ZORBA_NO_FULL_TEXT
       else {
         Thesaurus* lUserThesaurus = dynamic_cast<Thesaurus*>(lUserPtr.get());
         if (lUserThesaurus != NULL) {
@@ -170,6 +181,7 @@
           assert(false);
         }
       }
+#endif /* ZORBA_NO_FULL_TEXT */
     }
     return lRetval;
   }

=== modified file 'src/context/uri_resolver.cpp'
--- src/context/uri_resolver.cpp	2011-10-12 08:45:07 +0000
+++ src/context/uri_resolver.cpp	2011-12-08 04:02:28 +0000
@@ -117,6 +117,7 @@
   {
   }
 
+#ifndef ZORBA_NO_FULL_TEXT
   ThesaurusEntityData::ThesaurusEntityData(locale::iso639_1::type aLang)
     : EntityData(EntityData::THESAURUS),
       theLang(aLang)
@@ -127,6 +128,7 @@
   {
     return theLang;
   }
+#endif /* ZORBA_NO_FULL_TEXT */
 
 /*************
  * URIMapper is an abstract class, but we have to define its vtbl and

=== modified file 'src/context/uri_resolver.h'
--- src/context/uri_resolver.h	2011-10-12 08:45:07 +0000
+++ src/context/uri_resolver.h	2011-12-08 04:02:28 +0000
@@ -171,8 +171,10 @@
   enum Kind {
     SCHEMA,
     MODULE,
+#ifndef ZORBA_NO_FULL_TEXT
     THESAURUS,
     STOP_WORDS,
+#endif /* ZORBA_NO_FULL_TEXT */
     COLLECTION,
     DOCUMENT,
     SOME_CONTENT
@@ -191,6 +193,7 @@
   Kind const theKind;
 };
 
+#ifndef ZORBA_NO_FULL_TEXT
 /**
  * @brief The class containing additional data for URIMappers and URLResolvers
  * when mapping/resolving a Thesaurus URI.
@@ -207,6 +210,7 @@
 private:
   locale::iso639_1::type const theLang;
 };
+#endif /* ZORBA_NO_FULL_TEXT */
 
 /**
  * @brief Interface for URL resolving.

=== modified file 'src/runtime/fetch/fetch_impl.cpp'
--- src/runtime/fetch/fetch_impl.cpp	2011-10-12 08:45:07 +0000
+++ src/runtime/fetch/fetch_impl.cpp	2011-12-08 04:02:28 +0000
@@ -66,12 +66,14 @@
   else if ( ! lKindStr.compare("MODULE")) {
     lKind = internal::EntityData::MODULE;
   }
+#ifndef ZORBA_NO_FULL_TEXT
   else if ( ! lKindStr.compare("THESAURUS")) {
     lKind = internal::EntityData::THESAURUS;
   }
   else if ( ! lKindStr.compare("STOP_WORDS")) {
     lKind = internal::EntityData::STOP_WORDS;
   }
+#endif /* ZORBA_NO_FULL_TEXT */
   else {
     throw XQUERY_EXCEPTION(
           zerr::ZXQP0026_INVALID_ENUM_VALUE,

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-06 03:28:20 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-08 04:02:28 +0000
@@ -294,4 +294,6 @@
 
 EXPECTED_FAILURE(test/rbkt/zorba/reference/reference_5 868640)
 
-EXPECTED_FAILURE(test/rbkt/zorba/fulltext/ft-same-sentence-true-4 900552)
+IF (NOT ZORBA_NO_FULL_TEXT)
+  EXPECTED_FAILURE(test/rbkt/zorba/fulltext/ft-same-sentence-true-4 900552)
+ENDIF (NOT ZORBA_NO_FULL_TEXT)