zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #23836
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1189790 into lp:zorba.
Commit message:
Converted module to zorba.io.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1189790 in Zorba: "Update core module "full-text""
https://bugs.launchpad.net/zorba/+bug/1189790
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189790/+merge/171696
Converted module to zorba.io.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189790/+merge/171696
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-06-24 19:46:35 +0000
+++ ChangeLog 2013-06-26 23:57:27 +0000
@@ -50,6 +50,7 @@
* Fixed bug #1188095 (do correct normalization for fn:string-length()))
* jn:keys function takes item()* as aparameter (instead of item())
* Fixed bug #1189996 (Relocate some public API headers to util)
+ * Fixed bug #1189790 (Update core module "full-text")
* Object/array navigation allows item()* as the type of the input sequence
(doing implicit iteration over the input sequence and skipping items
that are not objects/arrays).
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2013-02-07 17:24:36 +0000
+++ modules/CMakeLists.txt 2013-06-26 23:57:27 +0000
@@ -17,6 +17,7 @@
ADD_SUBDIRECTORY(functx)
ADD_SUBDIRECTORY(xqxq)
ADD_SUBDIRECTORY(w3c)
+ADD_SUBDIRECTORY(full-text)
# Add external module projects - any subdirectories of a directory
# named "zorba_modules" as a sibling to the main Zorba source
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-15 16:20:18 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-26 23:57:27 +0000
@@ -87,13 +87,6 @@
DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd
URI "http://www.zorba-xquery.com/modules/xqdoc-options";)
-IF(NOT ZORBA_NO_FULL_TEXT)
- DECLARE_ZORBA_MODULE(FILE full-text.xq VERSION 2.0
- URI "http://www.zorba-xquery.com/modules/full-text";)
- DECLARE_ZORBA_SCHEMA(FILE full-text.xsd
- URI "http://www.zorba-xquery.com/modules/full-text";)
-ENDIF(NOT ZORBA_NO_FULL_TEXT)
-
# Subdirectories
DECLARE_ZORBA_MODULE(FILE converters/base64.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/converters/base64";)
=== added directory 'modules/full-text'
=== added file 'modules/full-text/CMakeLists.txt'
--- modules/full-text/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ modules/full-text/CMakeLists.txt 2013-06-26 23:57:27 +0000
@@ -0,0 +1,22 @@
+# Copyright 2006-2012 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+IF (NOT ZORBA_NO_FULL_TEXT)
+ DECLARE_ZORBA_MODULE(FILE full-text.xq VERSION 1.0
+ URI "http://zorba.io/modules/full-text";)
+ DECLARE_ZORBA_SCHEMA(FILE full-text.xsd
+ URI "http://zorba.io/modules/full-text";)
+ENDIF (NOT ZORBA_NO_FULL_TEXT)
+
+# vim:set et sw=2 ts=2:
=== renamed file 'modules/com/zorba-xquery/www/modules/full-text.xq' => 'modules/full-text/full-text.xq'
--- modules/com/zorba-xquery/www/modules/full-text.xq 2013-06-15 16:20:18 +0000
+++ modules/full-text/full-text.xq 2013-06-26 23:57:27 +0000
@@ -20,20 +20,20 @@
(:~
: This module provides an XQuery API to full-text functions.
- : For general information about Zorba's implementation of the
+ : For general information about this implementation of the
: <a href="http://www.w3.org/TR/xpath-full-text-10/";>XQuery and XPath Full Text 1.0 specification</a>
: as well as instructions for building an installing a thesaurus,
: see the <a href="http://www.zorba-xquery.com/html/documentation/latest/zorba/ft_thesaurus";>Full Text Thesaurus documentation</a>.
: <h2>Notes on languages</h2>
- : To refer to paricular human languages,
- : Zorba uses both the
+ : To refer to particular human languages,
+ : uses either the
: <a href="http://en.wikipedia.org/wiki/ISO_639-1";>ISO 639-1</a>
- : and
+ : or
: <a href="http://en.wikipedia.org/wiki/ISO_639-2";>ISO 639-2</a>
: languages codes.
- : Note that Zorba supports only a subset of the
+ : Note that only a subset of the
: <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes";>complete list of language codes</a>
- : and not every function supports the same subset.
+ : are supported and not every function supports the same subset.
: <p/>
: Most functions in this module take a language as a parameter
: using the
@@ -43,8 +43,7 @@
: The <code>stem()</code> functions return the
: <a href="http://en.wikipedia.org/wiki/Word_stem";>stem</a>
: of a word.
- : In Zorba,
- : the stem of a word itself, however, is not guaranteed to be a word.
+ : The stem of a word itself, however, is not guaranteed to be a word.
: It is best to consider a stem as an opaque byte sequence.
: All that is guaranteed about a stem is that,
: for a given word,
@@ -64,7 +63,7 @@
: The <code>thesaurus-lookup()</code> functions have "levels"
: and "relationship" parameters.
: The values for these are implementation-defined.
- : Zorba's default implementation uses the
+ : The default implementation uses the
: <a href="http://wordnet.princeton.edu/";>WordNet lexical database</a>,
: version 3.0.
: <p/>
@@ -76,13 +75,13 @@
: (carary > finch > oscine > passerine > bird > vertebrate).
: <p/>
: When using the WordNet implementation,
- : Zorba supports all of the relationships (and their abbreviations)
+ : all of the relationships (and their abbreviations)
: specified by
: <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=7776";>ISO 2788</a>
: and
: <a href="http://www.niso.org/kst/reports/standards?step=2&gid=&project_key=7cc9b583cb5a62e8c15d3099e0bb46bbae9cf38a";>ANSI/NISO Z39.19-2005</a>
: with the exceptions of "HN" (history note)
- : and "X SN" (see scope note for).
+ : and "X SN" (see scope note for) are supported.
: These relationships are:
: <table>
: <tr>
@@ -166,7 +165,7 @@
: and
: <a href="http://www.niso.org/kst/reports/standards?step=2&gid=&project_key=7cc9b583cb5a62e8c15d3099e0bb46bbae9cf38a";>ANSI/NISO Z39.19-2005</a>
: relationships,
- : Zorba also supports all of the relationships offered by WordNet.
+ : All of the relationships offered by WordNet are also supported.
: These relationships are:
: <table class="ft_rels">
: <tr>
@@ -327,22 +326,20 @@
: </tr>
: </table>
: <h2>Notes on tokenization</h2>
- : For general information about Zorba's implementation of tokenization,
+ : For general information about the implementation of tokenization,
: including what constitutes a token,
: see the <a href="http://www.zorba-xquery.com/html/documentation/latest/zorba/ft_tokenizer";>Full Text Tokenizer</a> documentation.
: @author Paul J. Lucas
: @project Zorba/Full-Text
:)
-module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace ft-schema =
- "http://www.zorba-xquery.com/modules/full-text";;
+module namespace ft = "http://zorba.io/modules/full-text";;
declare namespace err = "http://www.w3.org/2005/xqt-errors";;
declare namespace zerr = "http://www.zorba-xquery.com/errors";;
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "2.0";
+declare option ver:module-version "1.0";
(:===========================================================================:)
@@ -350,91 +347,91 @@
: Predeclared constant for the Danish
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-da as xs:language := xs:language("da");
+declare variable $ft:LANG-DA as xs:language := xs:language("da");
(:~
: Predeclared constant for the German
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-de as xs:language := xs:language("de");
+declare variable $ft:LANG-DE as xs:language := xs:language("de");
(:~
: Predeclared constant for the English
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-en as xs:language := xs:language("en");
+declare variable $ft:LANG-EN as xs:language := xs:language("en");
(:~
: Predeclared constant for the Spanish
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-es as xs:language := xs:language("es");
+declare variable $ft:LANG-ES as xs:language := xs:language("es");
(:~
: Predeclared constant for the Finnish
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-fi as xs:language := xs:language("fi");
+declare variable $ft:LANG-FI as xs:language := xs:language("fi");
(:~
: Predeclared constant for the French
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-fr as xs:language := xs:language("fr");
+declare variable $ft:LANG-FR as xs:language := xs:language("fr");
(:~
: Predeclared constant for the Hungarian
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-hu as xs:language := xs:language("hu");
+declare variable $ft:LANG-HU as xs:language := xs:language("hu");
(:~
: Predeclared constant for the Italian
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-it as xs:language := xs:language("it");
+declare variable $ft:LANG-IT as xs:language := xs:language("it");
(:~
: Predeclared constant for the Dutch
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-nl as xs:language := xs:language("nl");
+declare variable $ft:LANG-NL as xs:language := xs:language("nl");
(:~
: Predeclared constant for the Norwegian
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-no as xs:language := xs:language("no");
+declare variable $ft:LANG-NO as xs:language := xs:language("no");
(:~
: Predeclared constant for the Portuguese
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-pt as xs:language := xs:language("pt");
+declare variable $ft:LANG-PT as xs:language := xs:language("pt");
(:~
: Predeclared constant for the Romanian
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-ro as xs:language := xs:language("ro");
+declare variable $ft:LANG-RO as xs:language := xs:language("ro");
(:~
: Predeclared constant for the Russian
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-ru as xs:language := xs:language("ru");
+declare variable $ft:LANG-RU as xs:language := xs:language("ru");
(:~
: Predeclared constant for the Swedish
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-sv as xs:language := xs:language("sv");
+declare variable $ft:LANG-SV as xs:language := xs:language("sv");
(:~
: Predeclared constant for the Turkish
: <a href="http://www.w3.org/TR/xmlschema-2/#language";><code>xs:language</code></a>.
:)
-declare variable $ft:lang-tr as xs:language := xs:language("tr");
+declare variable $ft:LANG-TR as xs:language := xs:language("tr");
(:===========================================================================:)
@@ -446,7 +443,7 @@
: @example test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq
:)
declare function ft:current-compare-options()
- as element(ft-schema:compare-options) external;
+ as object() external;
(:~
: Gets the current
@@ -466,7 +463,7 @@
(:~
: Gets the host's current
: <a href="http://www.w3.org/TR/xmlschema-2/#language";>language</a>.
- : The "host" is the computer on which Zorba is running.
+ : The "host" is the computer on which the software is running.
: The host's current language is obtained as follows:
: <ul>
: <li>
@@ -641,9 +638,9 @@
: thesaurus or the empty sequence if not.
: @error err:FTST0009 if <code>ft:current-lang()</code> is not supported.
: @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
- : by the currently running version of Zorba.
+ : by the currently running version of the software.
: @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
- : that of the CPU on which Zorba is currently running.
+ : that of the CPU on which the software is currently running.
: @error zerr:ZXQP8403 if there was an error reading the thesaurus data.
: @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq
:)
@@ -666,9 +663,9 @@
: @error zerr:ZOSE0001 if the thesaurus data file could not be found.
: @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
: @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
- : by the currently running version of Zorba.
+ : by the currently running version of the software.
: @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
- : that of the CPU on which Zorba is currently running.
+ : that of the CPU on which the software is currently running.
: @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
: @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq
:)
@@ -692,9 +689,9 @@
: @error zerr:ZOSE0001 if the thesaurus data file could not be found.
: @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
: @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
- : by the currently running version of Zorba.
+ : by the currently running version of the software.
: @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
- : that of the CPU on which Zorba is currently running.
+ : that of the CPU on which the software is currently running.
: @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
: @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq
:)
@@ -719,9 +716,9 @@
: @error zerr:ZOSE0001 if the thesaurus data file could not be found.
: @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
: @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
- : by the currently running version of Zorba.
+ : by the currently running version of the software.
: @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
- : that of the CPU on which Zorba is currently running.
+ : that of the CPU on which the software is currently running.
: @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
: @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq
:)
@@ -754,9 +751,9 @@
: @error zerr:ZOSE0001 if the thesaurus data file could not be found.
: @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
: @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
- : by the currently running version of Zorba.
+ : by the currently running version of the software.
: @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
- : that of the CPU on which Zorba is currently running.
+ : that of the CPU on which the software is currently running.
: @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
: @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq
:)
@@ -779,7 +776,7 @@
: @example test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq
:)
declare function ft:tokenize-node( $node as node(), $lang as xs:language )
- as element(ft-schema:token)* external;
+ as object()* external;
(:~
: Tokenizes the given node and all of its descendants.
@@ -795,7 +792,7 @@
: @example test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq
:)
declare function ft:tokenize-node( $node as node() )
- as element(ft-schema:token)* external;
+ as object()* external;
(:~
: Tokenizes the set of nodes comprising <code>$includes</code> (and all of its
@@ -813,7 +810,7 @@
:)
declare function ft:tokenize-nodes( $includes as node()+,
$excludes as node()* )
- as element(ft-schema:token)* external;
+ as object()* external;
(:~
: Tokenizes the set of nodes comprising <code>$includes</code> (and all of its
@@ -832,7 +829,7 @@
declare function ft:tokenize-nodes( $includes as node()+,
$excludes as node()*,
$lang as xs:language )
- as element(ft-schema:token)* external;
+ as object()* external;
(:~
: Tokenizes the given string.
@@ -873,7 +870,7 @@
: tokenization specifically.
:)
declare function ft:tokenizer-properties( $lang as xs:language )
- as element(ft-schema:tokenizer-properties) external;
+ as object() external;
(:~
: Gets properties of the tokenizer for the
@@ -884,7 +881,7 @@
: @error err:FTST0009 if <code>ft:current-lang()</code> is not supported.
:)
declare function ft:tokenizer-properties()
- as element(ft-schema:tokenizer-properties) external;
+ as object() external;
(:===========================================================================:)
=== renamed file 'modules/com/zorba-xquery/www/modules/full-text.xsd' => 'modules/full-text/full-text.xsd'
--- modules/com/zorba-xquery/www/modules/full-text.xsd 2013-02-07 17:24:36 +0000
+++ modules/full-text/full-text.xsd 2013-06-26 23:57:27 +0000
@@ -16,8 +16,8 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- targetNamespace="http://www.zorba-xquery.com/modules/full-text";
- xmlns="http://www.zorba-xquery.com/modules/full-text";
+ targetNamespace="http://zorba.io/modules/full-text";
+ xmlns="http://zorba.io/modules/full-text";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-06-26 01:57:13 +0000
+++ src/context/static_context.cpp 2013-06-26 23:57:27 +0000
@@ -472,7 +472,7 @@
#ifndef ZORBA_NO_FULL_TEXT
const char*
static_context::ZORBA_FULL_TEXT_FN_NS =
-"http://www.zorba-xquery.com/modules/full-text";;
+"http://zorba.io/modules/full-text";;
#endif /* ZORBA_NO_FULL_TEXT */
const char*
=== modified file 'src/functions/func_ft_module_impl.cpp'
--- src/functions/func_ft_module_impl.cpp 2013-02-07 17:24:36 +0000
+++ src/functions/func_ft_module_impl.cpp 2013-06-26 23:57:27 +0000
@@ -18,13 +18,14 @@
#include "runtime/full_text/ft_module.h"
-#define FT_MODULE_NS "http://www.zorba-xquery.com/modules/full-text";
+#define FT_MODULE_NS "http://zorba.io/modules/full-text";
namespace zorba
{
#ifndef ZORBA_NO_FULL_TEXT
+#if 0
PlanIter_t full_text_tokenize_node::codegen(
CompilerCB*,
static_context* sctx,
@@ -67,6 +68,7 @@
{
return new CurrentCompareOptionsIterator(sctx, loc, argv);
}
+#endif
#endif // ZORBA_NO_FULL_TEXT
@@ -76,6 +78,7 @@
{
#ifndef ZORBA_NO_FULL_TEXT
+#if 0
xqtref_t current_compare_options_return_type =
GENV_TYPESYSTEM.create_node_type(store::StoreConsts::elementNode,
createQName(FT_MODULE_NS, "", "compare-options"),
@@ -157,6 +160,7 @@
tokenizer_properties_return_type),
FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_1);
}
+#endif
#endif /* ZORBA_NO_FULL_TEXT */
}
=== modified file 'src/functions/func_ft_module_impl.h'
--- src/functions/func_ft_module_impl.h 2013-02-07 17:24:36 +0000
+++ src/functions/func_ft_module_impl.h 2013-06-26 23:57:27 +0000
@@ -29,6 +29,7 @@
///////////////////////////////////////////////////////////////////////////////
+#if 0
//full-text:tokenize
class full_text_tokenize_node : public function
{
@@ -95,7 +96,6 @@
CODEGEN_DECL();
};
-
//full-text:current-compare-options
class full_text_current_compare_options : public function
{
@@ -110,6 +110,7 @@
CODEGEN_DECL();
};
+#endif
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/functions/function_consts.h'
--- src/functions/function_consts.h 2013-06-15 02:57:08 +0000
+++ src/functions/function_consts.h 2013-06-26 23:57:27 +0000
@@ -237,16 +237,6 @@
JN_OBJECT_1,
-#ifndef ZORBA_NO_FULL_TEXT
- FULL_TEXT_CURRENT_COMPARE_OPTIONS_0,
- FULL_TEXT_TOKENIZER_PROPERTIES_1,
- FULL_TEXT_TOKENIZER_PROPERTIES_0,
- FULL_TEXT_TOKENIZE_NODE_2,
- FULL_TEXT_TOKENIZE_NODE_1,
- FULL_TEXT_TOKENIZE_NODES_3,
- FULL_TEXT_TOKENIZE_NODES_2,
-#endif /* ZORBA_NO_FULL_TEXT */
-
#include "functions/function_enum.h"
FN_MAX_FUNC
=== modified file 'src/functions/pregenerated/func_ft_module.cpp'
--- src/functions/pregenerated/func_ft_module.cpp 2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_ft_module.cpp 2013-06-26 23:57:27 +0000
@@ -31,6 +31,18 @@
#ifndef ZORBA_NO_FULL_TEXT
+PlanIter_t full_text_current_compare_options::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector<PlanIter_t>& argv,
+ expr& ann) const
+{
+ return new CurrentCompareOptionsIterator(sctx, loc, argv);
+}
+
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
PlanIter_t full_text_current_lang::codegen(
CompilerCB*,
static_context* sctx,
@@ -151,6 +163,42 @@
#endif
#ifndef ZORBA_NO_FULL_TEXT
+PlanIter_t full_text_tokenize_node::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector<PlanIter_t>& argv,
+ expr& ann) const
+{
+ return new TokenizeNodeIterator(sctx, loc, argv);
+}
+
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+PlanIter_t full_text_tokenize_nodes::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector<PlanIter_t>& argv,
+ expr& ann) const
+{
+ return new TokenizeNodesIterator(sctx, loc, argv);
+}
+
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+PlanIter_t full_text_tokenizer_properties::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector<PlanIter_t>& argv,
+ expr& ann) const
+{
+ return new TokenizerPropertiesIterator(sctx, loc, argv);
+}
+
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
PlanIter_t full_text_tokenize_string::codegen(
CompilerCB*,
static_context* sctx,
@@ -170,8 +218,23 @@
{
+ DECL_WITH_KIND(sctx, full_text_current_compare_options,
+ (createQName("http://zorba.io/modules/full-text","","current-compare-options";),
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
+ FunctionConsts::FULL_TEXT_CURRENT_COMPARE_OPTIONS_0);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
DECL_WITH_KIND(sctx, full_text_current_lang,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","current-lang";),
+ (createQName("http://zorba.io/modules/full-text","","current-lang";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE),
FunctionConsts::FULL_TEXT_CURRENT_LANG_0);
@@ -186,7 +249,7 @@
{
DECL_WITH_KIND(sctx, full_text_host_lang,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","host-lang";),
+ (createQName("http://zorba.io/modules/full-text","","host-lang";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE),
FunctionConsts::FULL_TEXT_HOST_LANG_0);
@@ -201,7 +264,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_stem_lang_supported,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stem-lang-supported";),
+ (createQName("http://zorba.io/modules/full-text","","is-stem-lang-supported";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
FunctionConsts::FULL_TEXT_IS_STEM_LANG_SUPPORTED_1);
@@ -217,7 +280,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_stop_word,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word";),
+ (createQName("http://zorba.io/modules/full-text","","is-stop-word";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
FunctionConsts::FULL_TEXT_IS_STOP_WORD_1);
@@ -233,7 +296,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_stop_word,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word";),
+ (createQName("http://zorba.io/modules/full-text","","is-stop-word";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -250,7 +313,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_stop_word_lang_supported,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word-lang-supported";),
+ (createQName("http://zorba.io/modules/full-text","","is-stop-word-lang-supported";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
FunctionConsts::FULL_TEXT_IS_STOP_WORD_LANG_SUPPORTED_1);
@@ -266,7 +329,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_thesaurus_lang_supported,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-thesaurus-lang-supported";),
+ (createQName("http://zorba.io/modules/full-text","","is-thesaurus-lang-supported";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
FunctionConsts::FULL_TEXT_IS_THESAURUS_LANG_SUPPORTED_1);
@@ -282,7 +345,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_thesaurus_lang_supported,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-thesaurus-lang-supported";),
+ (createQName("http://zorba.io/modules/full-text","","is-thesaurus-lang-supported";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -299,7 +362,7 @@
{
DECL_WITH_KIND(sctx, full_text_is_tokenizer_lang_supported,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-tokenizer-lang-supported";),
+ (createQName("http://zorba.io/modules/full-text","","is-tokenizer-lang-supported";),
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
FunctionConsts::FULL_TEXT_IS_TOKENIZER_LANG_SUPPORTED_1);
@@ -315,7 +378,7 @@
{
DECL_WITH_KIND(sctx, full_text_stem,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","stem";),
+ (createQName("http://zorba.io/modules/full-text","","stem";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE),
FunctionConsts::FULL_TEXT_STEM_1);
@@ -331,7 +394,7 @@
{
DECL_WITH_KIND(sctx, full_text_stem,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","stem";),
+ (createQName("http://zorba.io/modules/full-text","","stem";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE),
@@ -348,7 +411,7 @@
{
DECL_WITH_KIND(sctx, full_text_strip_diacritics,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","strip-diacritics";),
+ (createQName("http://zorba.io/modules/full-text","","strip-diacritics";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE),
FunctionConsts::FULL_TEXT_STRIP_DIACRITICS_1);
@@ -364,7 +427,7 @@
{
DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup";),
+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_STAR),
FunctionConsts::FULL_TEXT_THESAURUS_LOOKUP_1);
@@ -380,7 +443,7 @@
{
DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup";),
+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_STAR),
@@ -397,7 +460,7 @@
{
DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup";),
+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
@@ -415,7 +478,7 @@
{
DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup";),
+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
@@ -434,7 +497,7 @@
{
DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup";),
+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
@@ -454,8 +517,107 @@
{
+ DECL_WITH_KIND(sctx, full_text_tokenize_node,
+ (createQName("http://zorba.io/modules/full-text","","tokenize-node";),
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
+ FunctionConsts::FULL_TEXT_TOKENIZE_NODE_1);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
+ DECL_WITH_KIND(sctx, full_text_tokenize_node,
+ (createQName("http://zorba.io/modules/full-text","","tokenize-node";),
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
+ FunctionConsts::FULL_TEXT_TOKENIZE_NODE_2);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
+ DECL_WITH_KIND(sctx, full_text_tokenize_nodes,
+ (createQName("http://zorba.io/modules/full-text","","tokenize-nodes";),
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
+ FunctionConsts::FULL_TEXT_TOKENIZE_NODES_2);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
+ DECL_WITH_KIND(sctx, full_text_tokenize_nodes,
+ (createQName("http://zorba.io/modules/full-text","","tokenize-nodes";),
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
+ GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
+ FunctionConsts::FULL_TEXT_TOKENIZE_NODES_3);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
+ DECL_WITH_KIND(sctx, full_text_tokenizer_properties,
+ (createQName("http://zorba.io/modules/full-text","","tokenizer-properties";),
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
+ FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_0);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
+ DECL_WITH_KIND(sctx, full_text_tokenizer_properties,
+ (createQName("http://zorba.io/modules/full-text","","tokenizer-properties";),
+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
+ FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_1);
+
+ }
+
+
+#endif
+
+
+#ifndef ZORBA_NO_FULL_TEXT
+
+
+ {
DECL_WITH_KIND(sctx, full_text_tokenize_string,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","tokenize-string";),
+ (createQName("http://zorba.io/modules/full-text","","tokenize-string";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_STAR),
FunctionConsts::FULL_TEXT_TOKENIZE_STRING_1);
@@ -471,7 +633,7 @@
{
DECL_WITH_KIND(sctx, full_text_tokenize_string,
- (createQName("http://www.zorba-xquery.com/modules/full-text","","tokenize-string";),
+ (createQName("http://zorba.io/modules/full-text","","tokenize-string";),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
GENV_TYPESYSTEM.STRING_TYPE_STAR),
=== modified file 'src/functions/pregenerated/func_ft_module.h'
--- src/functions/pregenerated/func_ft_module.h 2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_ft_module.h 2013-06-26 23:57:27 +0000
@@ -38,6 +38,22 @@
#ifndef ZORBA_NO_FULL_TEXT
+//full-text:current-compare-options
+class full_text_current_compare_options : public function
+{
+public:
+ full_text_current_compare_options(const signature& sig, FunctionConsts::FunctionKind kind)
+ :
+ function(sig, kind)
+ {
+
+ }
+
+ CODEGEN_DECL();
+};
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+
//full-text:current-lang
class full_text_current_lang : public function
{
@@ -198,6 +214,54 @@
#endif
#ifndef ZORBA_NO_FULL_TEXT
+//full-text:tokenize-node
+class full_text_tokenize_node : public function
+{
+public:
+ full_text_tokenize_node(const signature& sig, FunctionConsts::FunctionKind kind)
+ :
+ function(sig, kind)
+ {
+
+ }
+
+ CODEGEN_DECL();
+};
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+
+//full-text:tokenize-nodes
+class full_text_tokenize_nodes : public function
+{
+public:
+ full_text_tokenize_nodes(const signature& sig, FunctionConsts::FunctionKind kind)
+ :
+ function(sig, kind)
+ {
+
+ }
+
+ CODEGEN_DECL();
+};
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+
+//full-text:tokenizer-properties
+class full_text_tokenizer_properties : public function
+{
+public:
+ full_text_tokenizer_properties(const signature& sig, FunctionConsts::FunctionKind kind)
+ :
+ function(sig, kind)
+ {
+
+ }
+
+ CODEGEN_DECL();
+};
+#endif
+#ifndef ZORBA_NO_FULL_TEXT
+
//full-text:tokenize-string
class full_text_tokenize_string : public function
{
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2013-06-08 05:33:57 +0000
+++ src/functions/pregenerated/function_enum.h 2013-06-26 23:57:27 +0000
@@ -187,6 +187,7 @@
FN_ZORBA_FETCH_CONTENT_BINARY_2,
FN_ZORBA_FETCH_CONTENT_TYPE_1,
FN_PUT_2,
+ FULL_TEXT_CURRENT_COMPARE_OPTIONS_0,
FULL_TEXT_CURRENT_LANG_0,
FULL_TEXT_HOST_LANG_0,
FULL_TEXT_IS_STEM_LANG_SUPPORTED_1,
@@ -204,6 +205,12 @@
FULL_TEXT_THESAURUS_LOOKUP_3,
FULL_TEXT_THESAURUS_LOOKUP_4,
FULL_TEXT_THESAURUS_LOOKUP_6,
+ FULL_TEXT_TOKENIZE_NODE_1,
+ FULL_TEXT_TOKENIZE_NODE_2,
+ FULL_TEXT_TOKENIZE_NODES_2,
+ FULL_TEXT_TOKENIZE_NODES_3,
+ FULL_TEXT_TOKENIZER_PROPERTIES_0,
+ FULL_TEXT_TOKENIZER_PROPERTIES_1,
FULL_TEXT_TOKENIZE_STRING_1,
FULL_TEXT_TOKENIZE_STRING_2,
FN_FUNCTION_LOOKUP_2,
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp 2013-06-11 23:38:49 +0000
+++ src/runtime/full_text/ft_module_impl.cpp 2013-06-26 23:57:27 +0000
@@ -72,22 +72,20 @@
static iso639_1::type get_lang_from( store::Item_t lang_item,
QueryLoc const &loc ) {
- zstring lang_string;
- lang_item->getStringValue2( lang_string );
-
- if ( !GenericCast::instance()->castableToLanguage( lang_string ) )
+ zstring const lang_str( lang_item->getStringValue() );
+ if ( !GenericCast::instance()->castableToLanguage( lang_str ) )
throw XQUERY_EXCEPTION(
err::XPTY0004,
ERROR_PARAMS(
- ZED( BadType_23o ), lang_string, ZED( NoCastTo_45o ), "xs:language"
+ ZED( BadType_23o ), lang_str, ZED( NoCastTo_45o ), "xs:language"
),
ERROR_LOC( loc )
);
- if ( iso639_1::type const lang = find_lang( lang_string ) )
+ if ( iso639_1::type const lang = find_lang( lang_str ) )
return lang;
throw XQUERY_EXCEPTION(
err::FTST0009 /* lang not supported */,
- ERROR_PARAMS( lang_string ),
+ ERROR_PARAMS( lang_str ),
ERROR_LOC( loc )
);
}
@@ -109,91 +107,67 @@
return std::move( tokenizer );
}
-static void make_token_element( FTToken const &token,
- TokenQNames const &qnames,
- store::Item_t &result ) {
- zstring base_uri = static_context::ZORBA_FULL_TEXT_FN_NS;
- store::Item_t item, attr_node, node_name, type_name;
- store::NsBindings const ns_bindings;
- zstring value_string;
-
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.token;
- GENV_ITEMFACTORY->createElementNode(
- result, nullptr, node_name, type_name, false, false,
- ns_bindings, base_uri
- );
+static void make_token_object( FTToken const &token, store::Item_t &result ) {
+ store::Item_t item;
+ zstring s;
+ vector<store::Item_t> keys, values;
if ( token.lang() ) {
- value_string = iso639_1::string_of[ token.lang() ];
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.lang;
- GENV_ITEMFACTORY->createAttributeNode(
- attr_node, result, node_name, type_name, item
- );
+ s = "lang";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ s = iso639_1::string_of[ token.lang() ];
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
}
- ztd::to_string( token.para(), &value_string );
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.paragraph;
- GENV_ITEMFACTORY->createAttributeNode(
- attr_node, result, node_name, type_name, item
- );
-
- ztd::to_string( token.sent(), &value_string );
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.sentence;
- GENV_ITEMFACTORY->createAttributeNode(
- attr_node, result, node_name, type_name, item
- );
-
- value_string = token.value();
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.value;
- GENV_ITEMFACTORY->createAttributeNode(
- attr_node, result, node_name, type_name, item
- );
+ s = "paragraph";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ GENV_ITEMFACTORY->createInteger( item, xs_integer( token.para() ) );
+ values.push_back( item );
+
+ s = "sentence";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ GENV_ITEMFACTORY->createInteger( item, xs_integer( token.sent() ) );
+ values.push_back( item );
+
+ s = "value";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ s = token.value();
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
if ( store::Item const *const token_item = token.item() ) {
if ( GENV_STORE.getNodeReference( item, token_item ) ) {
- item->getStringValue2( value_string );
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- node_name = qnames.node_ref;
- GENV_ITEMFACTORY->createAttributeNode(
- attr_node, result, node_name, type_name, item
- );
+ s = item->getStringValue();
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
+ s = "node-ref";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
}
}
+
+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
}
///////////////////////////////////////////////////////////////////////////////
bool CurrentCompareOptionsIterator::nextImpl( store::Item_t &result,
PlanState &plan_state ) const {
- zstring base_uri;
- store::Item_t junk, item, name;
- store::NsBindings const ns_bindings;
+ store::Item_t item;
+ zstring s;
+ vector<store::Item_t> keys, values;
+
static_context const *const sctx = getStaticContext();
ZORBA_ASSERT( sctx );
- store::Item_t type_name;
- zstring value_string;
PlanIteratorState *state;
DEFAULT_STACK_INIT( PlanIteratorState, state, plan_state );
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "compare-options"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- result, nullptr, name, type_name, false, false, ns_bindings, base_uri
- );
-
ft_case_mode::type case_mode;
ft_diacritics_mode::type diacritics_mode;
ft_stem_mode::type stem_mode;
@@ -208,26 +182,28 @@
stem_mode = ft_stem_mode::DEFAULT;
}
- // case="..."
- GENV_ITEMFACTORY->createQName( name, "", "", "case" );
- value_string = ft_case_mode::string_of[ case_mode ];
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
-
- // diacritics="..."
- GENV_ITEMFACTORY->createQName( name, "", "", "diacritics" );
- value_string = ft_diacritics_mode::string_of[ diacritics_mode ];
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
-
- // stemming="..."
- GENV_ITEMFACTORY->createQName( name, "", "", "stemming" );
- value_string = ft_stem_mode::string_of[ stem_mode ];
- GENV_ITEMFACTORY->createString( item, value_string );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
+ s = "case";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ s = ft_case_mode::string_of[ case_mode ];
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
+
+ s = "diacritics";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ s = ft_diacritics_mode::string_of[ diacritics_mode ];
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
+
+ s = "stemming";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ s = ft_stem_mode::string_of[ stem_mode ];
+ GENV_ITEMFACTORY->createString( item, s );
+ values.push_back( item );
+
+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
STACK_PUSH( true, state );
STACK_END( state );
@@ -645,9 +621,7 @@
state->doc_item_->getTokens( *tokenizer_provider, t_state, lang );
while ( state->doc_tokens_->hasNext() ) {
- make_token_element(
- *state->doc_tokens_->next(), state->token_qnames_, result
- );
+ make_token_object( *state->doc_tokens_->next(), result );
STACK_PUSH( true, state );
}
}
@@ -662,7 +636,9 @@
StateTraitsImpl<TokenizeNodeIteratorState>::getState(
plan_state, this->theStateOffset
);
- state->doc_tokens_->reset();
+ FTTokenIterator_t &doc_tokens = state->doc_tokens_;
+ if ( !doc_tokens.isNull() )
+ doc_tokens->reset();
}
///////////////////////////////////////////////////////////////////////////////
@@ -781,9 +757,7 @@
continue;
} // if ( state->tokens_.empty() )
- make_token_element(
- state->tokens_.front(), state->token_qnames_, result
- );
+ make_token_object( state->tokens_.front(), result );
state->tokens_.pop_front();
STACK_PUSH( true, state );
} // while
@@ -798,22 +772,22 @@
StateTraitsImpl<TokenizeNodesIteratorState>::getState(
plan_state, this->theStateOffset
);
- state->doc_tokens_->reset();
+ FTTokenIterator_t &doc_tokens = state->doc_tokens_;
+ if ( !doc_tokens.isNull() )
+ doc_tokens->reset();
}
///////////////////////////////////////////////////////////////////////////////
bool TokenizerPropertiesIterator::nextImpl( store::Item_t &result,
PlanState &plan_state ) const {
- store::Item_t element, item, junk, name;
- zstring base_uri;
+ store::Item_t item;
iso639_1::type lang;
- Tokenizer::State t_state;
- store::NsBindings const ns_bindings;
- Tokenizer::ptr tokenizer;
- store::Item_t type_name;
Tokenizer::Properties props;
- zstring value_string;
+ zstring s;
+ Tokenizer::ptr tokenizer;
+ Tokenizer::State t_state;
+ vector<store::Item_t> keys, values;
PlanIteratorState *state;
DEFAULT_STACK_INIT( PlanIteratorState, state, plan_state );
@@ -830,83 +804,45 @@
tokenizer = get_tokenizer( lang, &t_state, loc );
tokenizer->properties( &props );
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "tokenizer-properties"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- result, nullptr, name, type_name, false, false, ns_bindings, base_uri
- );
-
- // uri="..."
- GENV_ITEMFACTORY->createQName( name, "", "", "uri" );
+ s = "uri";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
GENV_ITEMFACTORY->createAnyURI( item, props.uri );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
+ values.push_back( item );
- // <comments-separate-tokens value="..."/>
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "comments-separate-tokens"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- element, result, name, type_name, false, false, ns_bindings, base_uri
- );
- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
+ s = "comments-separate-tokens";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
GENV_ITEMFACTORY->createBoolean( item, props.comments_separate_tokens );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
+ values.push_back( item );
- // <elements-separate-tokens value="..."/>
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "elements-separate-tokens"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- element, result, name, type_name, false, false, ns_bindings, base_uri
- );
- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
+ s = "elements-separate-tokens";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
GENV_ITEMFACTORY->createBoolean( item, props.elements_separate_tokens );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
+ values.push_back( item );
- // <processing-instructions-separate-tokens value="..."/>
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "",
- "processing-instructions-separate-tokens"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- element, result, name, type_name, false, false, ns_bindings, base_uri
- );
- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
+ s = "processing-instructions-separate-tokens";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
GENV_ITEMFACTORY->createBoolean( item, props.processing_instructions_separate_tokens );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
-
- // <supported-languages>...</supported-languages>
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "supported-languages"
- );
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createElementNode(
- element, result, name, type_name, false, false, ns_bindings, base_uri
- );
-
- // <lang>...</lang>
- FOR_EACH( Tokenizer::Properties::languages_type, i, props.languages ) {
- store::Item_t lang_element;
- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- GENV_ITEMFACTORY->createQName(
- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "lang"
- );
- GENV_ITEMFACTORY->createElementNode(
- lang_element, element, name, type_name, false, false, ns_bindings,
- base_uri
- );
- value_string = iso639_1::string_of[ *i ];
- GENV_ITEMFACTORY->createTextNode( junk, lang_element.getp(), value_string );
+ values.push_back( item );
+
+ s = "supported-languages";
+ GENV_ITEMFACTORY->createString( item, s );
+ keys.push_back( item );
+ { // local scope
+ vector<store::Item_t> langs;
+ FOR_EACH( Tokenizer::Properties::languages_type, i, props.languages ) {
+ s = iso639_1::string_of[ *i ];
+ GENV_ITEMFACTORY->createString( item, s );
+ langs.push_back( item );
+ }
+ GENV_ITEMFACTORY->createJSONArray( item, langs );
}
+ values.push_back( item );
+
+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
STACK_PUSH( true, state );
STACK_END( state );
=== modified file 'src/runtime/full_text/ft_module_util.cpp'
--- src/runtime/full_text/ft_module_util.cpp 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/ft_module_util.cpp 2013-06-26 23:57:27 +0000
@@ -16,9 +16,6 @@
#include "stdafx.h"
#include "api/unmarshaller.h"
-#include "context/static_context.h"
-#include "store/api/item_factory.h"
-#include "system/globalenv.h"
#include "ft_module_util.h"
@@ -41,18 +38,5 @@
///////////////////////////////////////////////////////////////////////////////
-TokenQNames::TokenQNames() {
- GENV_ITEMFACTORY->createQName(
- token, static_context::ZORBA_FULL_TEXT_FN_NS, "", "token"
- );
- GENV_ITEMFACTORY->createQName( lang, "", "", "lang" );
- GENV_ITEMFACTORY->createQName( paragraph, "", "", "paragraph" );
- GENV_ITEMFACTORY->createQName( sentence, "", "", "sentence" );
- GENV_ITEMFACTORY->createQName( value, "", "", "value" );
- GENV_ITEMFACTORY->createQName( node_ref, "", "", "node-ref" );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
} // namespace zorba
/* vim:set et sw=2 ts=2: */
=== modified file 'src/runtime/full_text/ft_module_util.h'
--- src/runtime/full_text/ft_module_util.h 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/ft_module_util.h 2013-06-26 23:57:27 +0000
@@ -31,8 +31,6 @@
#include "store/api/item.h"
#include "zorbatypes/ft_token.h"
-#include "ft_module_util.h"
-
namespace zorba {
///////////////////////////////////////////////////////////////////////////////
@@ -62,19 +60,6 @@
///////////////////////////////////////////////////////////////////////////////
-struct TokenQNames {
- store::Item_t token;
- store::Item_t lang;
- store::Item_t paragraph;
- store::Item_t sentence;
- store::Item_t value;
- store::Item_t node_ref;
-
- TokenQNames();
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
} // namespace zorba
#endif /* ZORBA_FT_MODULE_UTIL_H */
/* vim:set et sw=2 ts=2: */
=== modified file 'src/runtime/full_text/pregenerated/ft_module.h'
--- src/runtime/full_text/pregenerated/ft_module.h 2013-03-05 23:11:50 +0000
+++ src/runtime/full_text/pregenerated/ft_module.h 2013-06-26 23:57:27 +0000
@@ -421,7 +421,6 @@
public:
store::Item_t doc_item_; //
FTTokenIterator_t doc_tokens_; //
- TokenQNames token_qnames_; //
TokenizeNodeIteratorState();
@@ -469,7 +468,6 @@
public:
store::Item_t doc_item_; //
FTTokenIterator_t doc_tokens_; //
- TokenQNames token_qnames_; //
std::list<store::Item_t> includes_; //
std::vector<store::Item_t> excludes_; //
std::stack<Tokenizer*> tokenizers_; //
=== modified file 'src/runtime/spec/full_text/ft_module.xml'
--- src/runtime/spec/full_text/ft_module.xml 2013-02-07 17:24:36 +0000
+++ src/runtime/spec/full_text/ft_module.xml 2013-06-26 23:57:27 +0000
@@ -24,6 +24,11 @@
<zorba:iterator name="CurrentCompareOptionsIterator"
preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
+ <zorba:function>
+ <zorba:signature localname="current-compare-options" prefix="full-text">
+ <zorba:output>object()</zorba:output>
+ </zorba:signature>
+ </zorba:function>
</zorba:iterator>
<zorba:iterator name="CurrentLangIterator"
@@ -198,10 +203,20 @@
<zorba:iterator name="TokenizeNodeIterator"
generateResetImpl="true"
preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
+ <zorba:function>
+ <zorba:signature localname="tokenize-node" prefix="full-text">
+ <zorba:param>node()</zorba:param>
+ <zorba:output>object()*</zorba:output>
+ </zorba:signature>
+ <zorba:signature localname="tokenize-node" prefix="full-text">
+ <zorba:param>node()</zorba:param>
+ <zorba:param>xs:language</zorba:param>
+ <zorba:output>object()*</zorba:output>
+ </zorba:signature>
+ </zorba:function>
<zorba:state generateInit="use-default">
<zorba:member type="store::Item_t" name="doc_item_"/>
<zorba:member type="FTTokenIterator_t" name="doc_tokens_"/>
- <zorba:member type="TokenQNames" name="token_qnames_"/>
</zorba:state>
</zorba:iterator>
@@ -210,12 +225,23 @@
<zorba:iterator name="TokenizeNodesIterator"
generateResetImpl="true"
preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
+ <zorba:function>
+ <zorba:signature localname="tokenize-nodes" prefix="full-text">
+ <zorba:param>node()+</zorba:param>
+ <zorba:param>node()*</zorba:param>
+ <zorba:output>object()*</zorba:output>
+ </zorba:signature>
+ <zorba:signature localname="tokenize-nodes" prefix="full-text">
+ <zorba:param>node()+</zorba:param>
+ <zorba:param>node()*</zorba:param>
+ <zorba:param>xs:language</zorba:param>
+ <zorba:output>object()*</zorba:output>
+ </zorba:signature>
+ </zorba:function>
<zorba:state generateInit="use-default">
<zorba:member type="store::Item_t" name="doc_item_"/>
<zorba:member type="FTTokenIterator_t" name="doc_tokens_"/>
- <zorba:member type="TokenQNames" name="token_qnames_"/>
-
<zorba:member type="std::list<store::Item_t>" name="includes_"/>
<zorba:member type="std::vector<store::Item_t>" name="excludes_"/>
@@ -231,6 +257,15 @@
<zorba:iterator name="TokenizerPropertiesIterator"
preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
+ <zorba:function>
+ <zorba:signature localname="tokenizer-properties" prefix="full-text">
+ <zorba:output>object()</zorba:output>
+ </zorba:signature>
+ <zorba:signature localname="tokenizer-properties" prefix="full-text">
+ <zorba:param>xs:language</zorba:param>
+ <zorba:output>object()</zorba:output>
+ </zorba:signature>
+ </zorba:function>
</zorba:iterator>
<!--========================================================================-->
@@ -238,7 +273,6 @@
<zorba:iterator name="TokenizeStringIterator"
generateResetImpl="true"
preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
-
<zorba:function>
<zorba:signature localname="tokenize-string" prefix="full-text">
<zorba:param>xs:string</zorba:param> <!-- string -->
=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml 2013-03-12 17:03:31 +0000
+++ src/runtime/spec/mappings.xml 2013-06-26 23:57:27 +0000
@@ -81,7 +81,7 @@
prefix="zorba-store-data-structure-unordered-map"/>
<zorba:namespace
- uri="http://www.zorba-xquery.com/modules/full-text";
+ uri="http://zorba.io/modules/full-text";
define="ZORBA_FULL_TEXT_FN_NS"
prefix="full-text"/>
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq 2012-05-08 23:49:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq 2013-06-26 23:57:27 +0000
@@ -1,9 +1,10 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
-
-let $options := validate { ft:current-compare-options() }
-return $options/@case = "case insensitive"
- and $options/@diacritics = "diacritics insensitive"
- and $options/@stemming = "no stemming"
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
+
+let $options := ft:current-compare-options()
+return $options.case eq "case insensitive"
+ and $options.diacritics eq "diacritics insensitive"
+ and $options.stemming eq "no stemming"
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq 2012-05-08 23:49:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq 2013-06-26 23:57:27 +0000
@@ -1,14 +1,15 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option
using case sensitive
using diacritics sensitive
using stemming;
-let $options := validate { ft:current-compare-options() }
-return $options/@case = "case sensitive"
- and $options/@diacritics = "diacritics sensitive"
- and $options/@stemming = "stemming"
+let $options := ft:current-compare-options()
+return $options.case eq "case sensitive"
+ and $options.diacritics eq "diacritics sensitive"
+ and $options.stemming eq "stemming"
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq 2012-03-20 01:05:40 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "zu";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("da") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("de") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("es") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("fi") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("hu") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("it") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("nl") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("no") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("pt") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("ru") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Valid, but unsupported ISO 639-1 code. :)
ft:is-stem-lang-supported( xs:language("zu") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Invalid ISO 639-1 code. :)
ft:is-stem-lang-supported( xs:language("XX") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stem-lang-supported( xs:language("sv") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq 2011-09-30 03:55:43 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word( "flavor", xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Valid, but unsupported ISO 639-1 code. :)
ft:is-stop-word-lang-supported( xs:language("zu") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Invalid ISO 639-1 code. :)
ft:is-stop-word-lang-supported( xs:language("XX") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq 2011-09-30 03:55:43 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word( "the", xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq 2012-03-08 16:58:00 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq 2012-03-08 16:58:00 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-stop-word( "el", xs:language("es") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq 2012-03-08 16:58:00 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "es";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Valid, but unsupported ISO 639-1 code. :)
ft:is-thesaurus-lang-supported( xs:language("zu") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Invalid ISO 639-1 code. :)
ft:is-thesaurus-lang-supported( xs:language("XX") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq 2012-03-06 17:28:50 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Thesaurus URI that is not statically known. :)
ft:is-thesaurus-lang-supported( "http://www.example.com/";, xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-thesaurus-lang-supported( xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:is-thesaurus-lang-supported( "http://wordnet.princeton.edu";,
xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq 2011-09-30 03:55:43 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:stem( "flavoring", xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq 2011-09-30 03:55:43 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:stem( "chico", xs:language("es") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq 2012-03-08 04:53:30 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq 2012-03-08 04:53:30 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "es";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq 2011-09-30 03:55:43 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq 2013-06-26 23:57:27 +0000
@@ -1,3 +1,3 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
ft:strip-diacritics( "é" )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu";,
"marmite",
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu";,
"breakfast",
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu";,
"breakfast",
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq 2013-06-26 23:57:27 +0000
@@ -1,19 +1,20 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $doc := <msg>hello, world</msg>
let $tokens := ft:tokenize-node( $doc, xs:language("en") )
-let $t1 := validate { $tokens[1] }
-let $t2 := validate { $tokens[2] }
-
-return $t1/@value = "hello"
- and $t1/@lang = "en"
- and $t1/@paragraph = 1
- and $t1/@sentence = 1
-
- and $t2/@value = "world"
- and $t2/@lang = "en"
- and $t2/@paragraph = 1
- and $t2/@sentence = 1
+let $t1 := $tokens[1]
+let $t2 := $tokens[2]
+
+return $t1.value eq "hello"
+ and $t1.lang eq "en"
+ and $t1.paragraph eq 1
+ and $t1.sentence eq 1
+
+ and $t2.value eq "world"
+ and $t2.lang eq "en"
+ and $t2.paragraph eq 1
+ and $t2.sentence eq 1
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq 2013-06-26 23:57:27 +0000
@@ -1,19 +1,20 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $doc := <msg xml:lang="es">hola, mundo</msg>
let $tokens := ft:tokenize-node( $doc )
-let $t1 := validate { $tokens[1] }
-let $t2 := validate { $tokens[2] }
-
-return $t1/@value = "hola"
- and $t1/@lang = "es"
- and $t1/@paragraph = 1
- and $t1/@sentence = 1
-
- and $t2/@value = "mundo"
- and $t2/@lang = "es"
- and $t2/@paragraph = 1
- and $t2/@sentence = 1
+let $t1 := $tokens[1]
+let $t2 := $tokens[2]
+
+return $t1.value eq "hola"
+ and $t1.lang eq "es"
+ and $t1.paragraph eq 1
+ and $t1.sentence eq 1
+
+ and $t2.value eq "mundo"
+ and $t2.lang eq "es"
+ and $t2.paragraph eq 1
+ and $t2.sentence eq 1
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq 2013-06-26 23:57:27 +0000
@@ -1,11 +1,11 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
-
let $x := <p xml:lang="en">Houston, we have a <em>problem</em>!</p>
let $tokens := ft:tokenize-node( $x )
-let $node-ref := (validate { $tokens[5] })/@node-ref
+let $node-ref := xs:anyURI( $tokens[5].node-ref )
let $node := ref:node-by-reference( $node-ref )
return $node instance of text()
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq 2013-06-26 23:57:27 +0000
@@ -1,11 +1,11 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
-
let $x := <msg xml:lang="en" content="Houston, we have a problem!"/>
let $tokens := ft:tokenize-node( $x/@content )
-let $node-ref := (validate { $tokens[5] }) /@node-ref
+let $node-ref := xs:anyURI( $tokens[5].node-ref )
let $node := ref:node-by-reference( $node-ref )
return $node instance of attribute(content)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq 2012-06-28 23:18:23 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq 2013-06-26 23:57:27 +0000
@@ -1,5 +1,6 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $book :=
<book>
@@ -29,14 +30,14 @@
let $tokens := ft:tokenize-nodes( $includes, $excludes, xs:language("en") )
-let $t1 := validate { $tokens[1] }
-let $t2 := validate { $tokens[2] }
-let $t3 := validate { $tokens[3] }
-let $t4 := validate { $tokens[4] }
+let $t1 := $tokens[1]
+let $t2 := $tokens[2]
+let $t3 := $tokens[3]
+let $t4 := $tokens[4]
-return $t1/@value = "Notes"
- and $t2/@value = "to"
- and $t3/@value = "the"
- and $t4/@value = "Reader"
+return $t1.value eq "Notes"
+ and $t2.value eq "to"
+ and $t3.value eq "the"
+ and $t4.value eq "Reader"
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq 2012-07-05 21:46:37 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq 2013-06-26 23:57:27 +0000
@@ -1,5 +1,6 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";;
+jsoniq version "1.0";
+
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $x :=
<quotes>
@@ -16,18 +17,18 @@
let $tokens := ft:tokenize-nodes( $includes, $excludes )
-let $t1 := validate { $tokens[1] }
-let $t2 := validate { $tokens[2] }
-let $t3 := validate { $tokens[3] }
-
-let $t10 := validate { $tokens[10] }
-let $t11 := validate { $tokens[11] }
-
-return $t1/@value = "I" and $t1/@lang = "en"
- and $t2/@value = "love" and $t2/@lang = "en"
- and $t3/@value = "you" and $t2/@lang = "en"
-
- and $t10/@value = "Je" and $t10/@lang = "fr"
- and $t11/@value = "t'aime" and $t11/@lang = "fr"
+let $t1 := $tokens[1]
+let $t2 := $tokens[2]
+let $t3 := $tokens[3]
+
+let $t10 := $tokens[10]
+let $t11 := $tokens[11]
+
+return $t1.value eq "I" and $t1.lang eq "en"
+ and $t2.value eq "love" and $t2.lang eq "en"
+ and $t3.value eq "you" and $t2.lang eq "en"
+
+ and $t10.value eq "Je" and $t10.lang eq "fr"
+ and $t11.value eq "t'aime" and $t11.lang eq "fr"
(: vim:set et sw=2 ts=2: :)
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq 2012-03-07 01:58:57 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
let $x := "hello, world"
let $tokens := ft:tokenize-string( $x, xs:language("en") )
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq 2012-03-08 18:46:22 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
declare ft-option using language "en";
=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq'
--- test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq 2012-02-22 16:26:17 +0000
+++ test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq 2013-06-26 23:57:27 +0000
@@ -1,4 +1,4 @@
-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";;
+import module namespace ft = "http://zorba.io/modules/full-text";;
(: Invalid at least/most range. :)
ft:thesaurus-lookup( "http://wordnet.princeton.edu";,
Follow ups
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: noreply, 2013-06-28
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-28
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-28
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Matthias Brantner, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Zorba Build Bot, 2013-06-27
-
[Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189790 into lp:zorba
From: Paul J. Lucas, 2013-06-27
