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

Proposed by Paul J. Lucas on 2013-06-26
Status: Merged
Approved by: Paul J. Lucas on 2013-06-27
Approved revision: 11531
Merged at revision: 11542
Proposed branch: lp:~zorba-coders/zorba/bug-1189790
Merge into: lp:zorba
Diff against target: 2764 lines (+605/-910)
85 files modified
ChangeLog (+1/-0)
modules/CMakeLists.txt (+1/-0)
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+0/-7)
modules/com/zorba-xquery/www/modules/full-text.xsd (+0/-178)
modules/full-text/CMakeLists.txt (+20/-0)
modules/full-text/full-text.xq (+47/-50)
src/compiler/translator/translator.cpp (+0/-1)
src/context/static_context.cpp (+1/-1)
src/functions/CMakeLists.txt (+0/-4)
src/functions/func_ft_module_impl.cpp (+0/-166)
src/functions/func_ft_module_impl.h (+0/-120)
src/functions/function_consts.h (+0/-10)
src/functions/library.cpp (+0/-1)
src/functions/pregenerated/func_ft_module.cpp (+181/-19)
src/functions/pregenerated/func_ft_module.h (+64/-0)
src/functions/pregenerated/function_enum.h (+7/-0)
src/runtime/full_text/ft_module_impl.cpp (+111/-175)
src/runtime/full_text/ft_module_util.cpp (+0/-16)
src/runtime/full_text/ft_module_util.h (+0/-15)
src/runtime/full_text/pregenerated/ft_module.h (+0/-2)
src/runtime/spec/full_text/ft_module.xml (+38/-4)
src/runtime/spec/mappings.xml (+1/-1)
test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res (+0/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq (+8/-7)
test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq (+7/-6)
test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq (+15/-14)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq (+15/-14)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq (+4/-4)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq (+4/-4)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq (+11/-10)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq (+16/-15)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq (+1/-1)
test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq (+1/-1)
test/rbkt/Queries/zorba/no-copy/test3.xq (+0/-12)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189790
Reviewer Review Type Date Requested Status
Matthias Brantner 2013-06-27 Approve on 2013-06-27
Paul J. Lucas Approve on 2013-06-27
Review via email: mp+171696@code.launchpad.net

Commit message

Converted module to zorba.io.

Description of the change

Converted module to zorba.io.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bug-1189790-2013-06-27T00-15-06.655Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

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

Zorba Build Bot (zorba-buildbot) wrote :

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bug-1189790-2013-06-27T14-07-11.339Z is finished. The
  final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

Zorba Build Bot (zorba-buildbot) wrote :

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bug-1189790-2013-06-27T14-21-04.632Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

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

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1189790-2013-06-27T15-37-10.108Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

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

lp:~zorba-coders/zorba/bug-1189790 updated on 2013-06-27
11531. By Paul J. Lucas on 2013-06-27

Changed node-ref to xs:anyURI.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1189790-2013-06-28T00-16-09.223Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-06-24 19:46:35 +0000
3+++ ChangeLog 2013-06-27 23:31:27 +0000
4@@ -50,6 +50,7 @@
5 * Fixed bug #1188095 (do correct normalization for fn:string-length()))
6 * jn:keys function takes item()* as aparameter (instead of item())
7 * Fixed bug #1189996 (Relocate some public API headers to util)
8+ * Fixed bug #1189790 (Update core module "full-text")
9 * Object/array navigation allows item()* as the type of the input sequence
10 (doing implicit iteration over the input sequence and skipping items
11 that are not objects/arrays).
12
13=== modified file 'modules/CMakeLists.txt'
14--- modules/CMakeLists.txt 2013-02-07 17:24:36 +0000
15+++ modules/CMakeLists.txt 2013-06-27 23:31:27 +0000
16@@ -17,6 +17,7 @@
17 ADD_SUBDIRECTORY(functx)
18 ADD_SUBDIRECTORY(xqxq)
19 ADD_SUBDIRECTORY(w3c)
20+ADD_SUBDIRECTORY(full-text)
21
22 # Add external module projects - any subdirectories of a directory
23 # named "zorba_modules" as a sibling to the main Zorba source
24
25=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
26--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-15 16:20:18 +0000
27+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-27 23:31:27 +0000
28@@ -87,13 +87,6 @@
29 DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd
30 URI "http://www.zorba-xquery.com/modules/xqdoc-options")
31
32-IF(NOT ZORBA_NO_FULL_TEXT)
33- DECLARE_ZORBA_MODULE(FILE full-text.xq VERSION 2.0
34- URI "http://www.zorba-xquery.com/modules/full-text")
35- DECLARE_ZORBA_SCHEMA(FILE full-text.xsd
36- URI "http://www.zorba-xquery.com/modules/full-text")
37-ENDIF(NOT ZORBA_NO_FULL_TEXT)
38-
39 # Subdirectories
40 DECLARE_ZORBA_MODULE(FILE converters/base64.xq VERSION 2.0
41 URI "http://www.zorba-xquery.com/modules/converters/base64")
42
43=== removed file 'modules/com/zorba-xquery/www/modules/full-text.xsd'
44--- modules/com/zorba-xquery/www/modules/full-text.xsd 2013-02-07 17:24:36 +0000
45+++ modules/com/zorba-xquery/www/modules/full-text.xsd 1970-01-01 00:00:00 +0000
46@@ -1,178 +0,0 @@
47-<?xml version="1.0"?>
48-<!--
49- ! Copyright 2006-2011 The FLWOR Foundation.
50- !
51- ! Licensed under the Apache License, Version 2.0 (the "License");
52- ! you may not use this file except in compliance with the License.
53- ! You may obtain a copy of the License at
54- !
55- ! http://www.apache.org/licenses/LICENSE-2.0
56- !
57- ! Unless required by applicable law or agreed to in writing, software
58- ! distributed under the License is distributed on an "AS IS" BASIS,
59- ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
60- ! See the License for the specific language governing permissions and
61- ! limitations under the License.
62--->
63-
64-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
65- targetNamespace="http://www.zorba-xquery.com/modules/full-text"
66- xmlns="http://www.zorba-xquery.com/modules/full-text"
67- elementFormDefault="qualified"
68- attributeFormDefault="unqualified">
69-
70- <!--======================================================================-->
71-
72- <xs:element name="compare-options">
73- <xs:complexType>
74- <xs:attributeGroup ref="compare-attributes"/>
75- </xs:complexType>
76- </xs:element>
77-
78- <xs:attributeGroup name="compare-attributes">
79- <xs:attribute name="case" type="case-type" default="case insensitive"/>
80- <xs:attribute name="diacritics" type="diacritics-type" default="diacritics insensitive"/>
81- <xs:attribute name="stemming" type="stemming-type" default="no stemming"/>
82- </xs:attributeGroup>
83-
84- <xs:simpleType name="case-type">
85- <xs:restriction base="xs:string">
86-
87- <!--
88- ! Tokens are matched regardless of the case of characters.
89- -->
90- <xs:enumeration value="case insensitive"/>
91-
92- <!--
93- ! Tokens are matched only if the case of their characters is the same.
94- -->
95- <xs:enumeration value="case sensitive"/>
96-
97- <!--
98- ! Tokens are matched only if they match without regard to character
99- ! case, but contain only lowercase characters.
100- -->
101- <xs:enumeration value="lower"/>
102-
103- <!--
104- ! Tokens are matched only if they match without regard to character
105- ! case, but contain only uppercase characters.
106- -->
107- <xs:enumeration value="upper"/>
108-
109- </xs:restriction>
110- </xs:simpleType>
111-
112- <xs:simpleType name="diacritics-type">
113- <xs:restriction base="xs:string">
114-
115- <!--
116- ! Matches tokens with and without diacritics.
117- -->
118- <xs:enumeration value="diacritics insensitive"/>
119-
120- <!--
121- ! Matches tokens only if they contain the same diacritics.
122- -->
123- <xs:enumeration value="diacritics sensitive"/>
124-
125- </xs:restriction>
126- </xs:simpleType>
127-
128- <xs:simpleType name="stemming-type">
129- <xs:restriction base="xs:string">
130-
131- <!--
132- ! Tokens are not stemmed.
133- -->
134- <xs:enumeration value="no stemming"/>
135-
136- <!--
137- ! Matches may contain tokens that have the same stem.
138- -->
139- <xs:enumeration value="stemming"/>
140-
141- </xs:restriction>
142- </xs:simpleType>
143-
144- <xs:complexType name="boolean-value">
145- <xs:attribute name="value" type="xs:boolean" use="required"/>
146- </xs:complexType>
147-
148- <!--======================================================================-->
149-
150- <xs:element name="token">
151- <xs:complexType>
152-
153- <!-- The language of the token. -->
154- <xs:attribute name="lang" type="xs:language"/>
155-
156- <!-- The sentence number. -->
157- <xs:attribute name="sentence" type="xs:nonNegativeInteger" use="required"/>
158-
159- <!-- The paragraph number. -->
160- <xs:attribute name="paragraph" type="xs:nonNegativeInteger" use="required"/>
161-
162- <!-- The token string value. -->
163- <xs:attribute name="value" type="xs:string" use="required"/>
164-
165- <!--
166- ! A reference to the originating node. If the token occurred within an
167- ! element, the reference refers to the text node. If the token occurred
168- ! within an attribute, the reference refers to the attribute node.
169- -->
170- <xs:attribute name="node-ref" type="xs:anyURI"/>
171-
172- </xs:complexType>
173- </xs:element>
174-
175- <!--======================================================================-->
176-
177- <xs:element name="tokenizer-properties">
178- <xs:complexType>
179- <xs:all>
180-
181- <!--
182- ! If true, XML comments separate tokens. (No example can be provided
183- ! here because it is illegal to nest an XML comment inside an XML
184- ! comment.)
185- -->
186- <xs:element name="comments-separate-tokens" type="boolean-value"/>
187-
188- <!--
189- ! If true, XML elements separate tokens. For example,
190- ! <b>B</b>old would be 2 tokens instead of 1.
191- -->
192- <xs:element name="elements-separate-tokens" type="boolean-value"/>
193-
194- <!--
195- ! If true, XML processing instructions separate tokens. For example,
196- ! net<?PI pi?>work would be 2 tokens instead of 1.
197- -->
198- <xs:element name="processing-instructions-separate-tokens" type="boolean-value"/>
199-
200- <!--
201- ! The list of languages that the tokenizer can tokenize.
202- -->
203- <xs:element name="supported-languages">
204- <xs:complexType>
205- <xs:sequence>
206- <xs:element name="lang" type="xs:language" maxOccurs="unbounded"/>
207- </xs:sequence>
208- </xs:complexType>
209- </xs:element>
210-
211- </xs:all>
212-
213- <!--
214- ! The tokenizer's identifying URI.
215- -->
216- <xs:attribute name="uri" type="xs:anyURI"/>
217-
218- </xs:complexType>
219- </xs:element>
220-
221- <!--======================================================================-->
222-
223-</xs:schema>
224-<!-- vim:set et sw=2 ts=2: -->
225
226=== added directory 'modules/full-text'
227=== added file 'modules/full-text/CMakeLists.txt'
228--- modules/full-text/CMakeLists.txt 1970-01-01 00:00:00 +0000
229+++ modules/full-text/CMakeLists.txt 2013-06-27 23:31:27 +0000
230@@ -0,0 +1,20 @@
231+# Copyright 2006-2012 The FLWOR Foundation.
232+#
233+# Licensed under the Apache License, Version 2.0 (the "License");
234+# you may not use this file except in compliance with the License.
235+# You may obtain a copy of the License at
236+#
237+# http://www.apache.org/licenses/LICENSE-2.0
238+#
239+# Unless required by applicable law or agreed to in writing, software
240+# distributed under the License is distributed on an "AS IS" BASIS,
241+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
242+# See the License for the specific language governing permissions and
243+# limitations under the License.
244+
245+IF (NOT ZORBA_NO_FULL_TEXT)
246+ DECLARE_ZORBA_MODULE(FILE full-text.xq VERSION 1.0
247+ URI "http://zorba.io/modules/full-text")
248+ENDIF (NOT ZORBA_NO_FULL_TEXT)
249+
250+# vim:set et sw=2 ts=2:
251
252=== renamed file 'modules/com/zorba-xquery/www/modules/full-text.xq' => 'modules/full-text/full-text.xq'
253--- modules/com/zorba-xquery/www/modules/full-text.xq 2013-06-15 16:20:18 +0000
254+++ modules/full-text/full-text.xq 2013-06-27 23:31:27 +0000
255@@ -20,20 +20,20 @@
256
257 (:~
258 : This module provides an XQuery API to full-text functions.
259- : For general information about Zorba's implementation of the
260+ : For general information about this implementation of the
261 : <a href="http://www.w3.org/TR/xpath-full-text-10/">XQuery and XPath Full Text 1.0 specification</a>
262 : as well as instructions for building an installing a thesaurus,
263 : see the <a href="http://www.zorba-xquery.com/html/documentation/latest/zorba/ft_thesaurus">Full Text Thesaurus documentation</a>.
264 : <h2>Notes on languages</h2>
265- : To refer to paricular human languages,
266- : Zorba uses both the
267+ : To refer to particular human languages,
268+ : uses either the
269 : <a href="http://en.wikipedia.org/wiki/ISO_639-1">ISO 639-1</a>
270- : and
271+ : or
272 : <a href="http://en.wikipedia.org/wiki/ISO_639-2">ISO 639-2</a>
273 : languages codes.
274- : Note that Zorba supports only a subset of the
275+ : Note that only a subset of the
276 : <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">complete list of language codes</a>
277- : and not every function supports the same subset.
278+ : are supported and not every function supports the same subset.
279 : <p/>
280 : Most functions in this module take a language as a parameter
281 : using the
282@@ -43,8 +43,7 @@
283 : The <code>stem()</code> functions return the
284 : <a href="http://en.wikipedia.org/wiki/Word_stem">stem</a>
285 : of a word.
286- : In Zorba,
287- : the stem of a word itself, however, is not guaranteed to be a word.
288+ : The stem of a word itself, however, is not guaranteed to be a word.
289 : It is best to consider a stem as an opaque byte sequence.
290 : All that is guaranteed about a stem is that,
291 : for a given word,
292@@ -64,7 +63,7 @@
293 : The <code>thesaurus-lookup()</code> functions have "levels"
294 : and "relationship" parameters.
295 : The values for these are implementation-defined.
296- : Zorba's default implementation uses the
297+ : The default implementation uses the
298 : <a href="http://wordnet.princeton.edu/">WordNet lexical database</a>,
299 : version 3.0.
300 : <p/>
301@@ -76,13 +75,13 @@
302 : (carary &gt; finch &gt; oscine &gt; passerine &gt; bird &gt; vertebrate).
303 : <p/>
304 : When using the WordNet implementation,
305- : Zorba supports all of the relationships (and their abbreviations)
306+ : all of the relationships (and their abbreviations)
307 : specified by
308 : <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=7776">ISO 2788</a>
309 : and
310 : <a href="http://www.niso.org/kst/reports/standards?step=2&amp;gid=&amp;project_key=7cc9b583cb5a62e8c15d3099e0bb46bbae9cf38a">ANSI/NISO Z39.19-2005</a>
311 : with the exceptions of "HN" (history note)
312- : and "X SN" (see scope note for).
313+ : and "X SN" (see scope note for) are supported.
314 : These relationships are:
315 : <table>
316 : <tr>
317@@ -166,7 +165,7 @@
318 : and
319 : <a href="http://www.niso.org/kst/reports/standards?step=2&amp;gid=&amp;project_key=7cc9b583cb5a62e8c15d3099e0bb46bbae9cf38a">ANSI/NISO Z39.19-2005</a>
320 : relationships,
321- : Zorba also supports all of the relationships offered by WordNet.
322+ : All of the relationships offered by WordNet are also supported.
323 : These relationships are:
324 : <table class="ft_rels">
325 : <tr>
326@@ -327,22 +326,20 @@
327 : </tr>
328 : </table>
329 : <h2>Notes on tokenization</h2>
330- : For general information about Zorba's implementation of tokenization,
331+ : For general information about the implementation of tokenization,
332 : including what constitutes a token,
333 : see the <a href="http://www.zorba-xquery.com/html/documentation/latest/zorba/ft_tokenizer">Full Text Tokenizer</a> documentation.
334 : @author Paul J. Lucas
335 : @project Zorba/Full-Text
336 :)
337-module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
338
339-import schema namespace ft-schema =
340- "http://www.zorba-xquery.com/modules/full-text";
341+module namespace ft = "http://zorba.io/modules/full-text";
342
343 declare namespace err = "http://www.w3.org/2005/xqt-errors";
344 declare namespace zerr = "http://www.zorba-xquery.com/errors";
345
346 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
347-declare option ver:module-version "2.0";
348+declare option ver:module-version "1.0";
349
350 (:===========================================================================:)
351
352@@ -350,91 +347,91 @@
353 : Predeclared constant for the Danish
354 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
355 :)
356-declare variable $ft:lang-da as xs:language := xs:language("da");
357+declare variable $ft:LANG-DA as xs:language := xs:language("da");
358
359 (:~
360 : Predeclared constant for the German
361 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
362 :)
363-declare variable $ft:lang-de as xs:language := xs:language("de");
364+declare variable $ft:LANG-DE as xs:language := xs:language("de");
365
366 (:~
367 : Predeclared constant for the English
368 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
369 :)
370-declare variable $ft:lang-en as xs:language := xs:language("en");
371+declare variable $ft:LANG-EN as xs:language := xs:language("en");
372
373 (:~
374 : Predeclared constant for the Spanish
375 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
376 :)
377-declare variable $ft:lang-es as xs:language := xs:language("es");
378+declare variable $ft:LANG-ES as xs:language := xs:language("es");
379
380 (:~
381 : Predeclared constant for the Finnish
382 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
383 :)
384-declare variable $ft:lang-fi as xs:language := xs:language("fi");
385+declare variable $ft:LANG-FI as xs:language := xs:language("fi");
386
387 (:~
388 : Predeclared constant for the French
389 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
390 :)
391-declare variable $ft:lang-fr as xs:language := xs:language("fr");
392+declare variable $ft:LANG-FR as xs:language := xs:language("fr");
393
394 (:~
395 : Predeclared constant for the Hungarian
396 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
397 :)
398-declare variable $ft:lang-hu as xs:language := xs:language("hu");
399+declare variable $ft:LANG-HU as xs:language := xs:language("hu");
400
401 (:~
402 : Predeclared constant for the Italian
403 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
404 :)
405-declare variable $ft:lang-it as xs:language := xs:language("it");
406+declare variable $ft:LANG-IT as xs:language := xs:language("it");
407
408 (:~
409 : Predeclared constant for the Dutch
410 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
411 :)
412-declare variable $ft:lang-nl as xs:language := xs:language("nl");
413+declare variable $ft:LANG-NL as xs:language := xs:language("nl");
414
415 (:~
416 : Predeclared constant for the Norwegian
417 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
418 :)
419-declare variable $ft:lang-no as xs:language := xs:language("no");
420+declare variable $ft:LANG-NO as xs:language := xs:language("no");
421
422 (:~
423 : Predeclared constant for the Portuguese
424 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
425 :)
426-declare variable $ft:lang-pt as xs:language := xs:language("pt");
427+declare variable $ft:LANG-PT as xs:language := xs:language("pt");
428
429 (:~
430 : Predeclared constant for the Romanian
431 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
432 :)
433-declare variable $ft:lang-ro as xs:language := xs:language("ro");
434+declare variable $ft:LANG-RO as xs:language := xs:language("ro");
435
436 (:~
437 : Predeclared constant for the Russian
438 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
439 :)
440-declare variable $ft:lang-ru as xs:language := xs:language("ru");
441+declare variable $ft:LANG-RU as xs:language := xs:language("ru");
442
443 (:~
444 : Predeclared constant for the Swedish
445 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
446 :)
447-declare variable $ft:lang-sv as xs:language := xs:language("sv");
448+declare variable $ft:LANG-SV as xs:language := xs:language("sv");
449
450 (:~
451 : Predeclared constant for the Turkish
452 : <a href="http://www.w3.org/TR/xmlschema-2/#language"><code>xs:language</code></a>.
453 :)
454-declare variable $ft:lang-tr as xs:language := xs:language("tr");
455+declare variable $ft:LANG-TR as xs:language := xs:language("tr");
456
457 (:===========================================================================:)
458
459@@ -446,7 +443,7 @@
460 : @example test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq
461 :)
462 declare function ft:current-compare-options()
463- as element(ft-schema:compare-options) external;
464+ as object() external;
465
466 (:~
467 : Gets the current
468@@ -466,7 +463,7 @@
469 (:~
470 : Gets the host's current
471 : <a href="http://www.w3.org/TR/xmlschema-2/#language">language</a>.
472- : The "host" is the computer on which Zorba is running.
473+ : The "host" is the computer on which the software is running.
474 : The host's current language is obtained as follows:
475 : <ul>
476 : <li>
477@@ -641,9 +638,9 @@
478 : thesaurus or the empty sequence if not.
479 : @error err:FTST0009 if <code>ft:current-lang()</code> is not supported.
480 : @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
481- : by the currently running version of Zorba.
482+ : by the currently running version of the software.
483 : @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
484- : that of the CPU on which Zorba is currently running.
485+ : that of the CPU on which the software is currently running.
486 : @error zerr:ZXQP8403 if there was an error reading the thesaurus data.
487 : @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq
488 :)
489@@ -666,9 +663,9 @@
490 : @error zerr:ZOSE0001 if the thesaurus data file could not be found.
491 : @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
492 : @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
493- : by the currently running version of Zorba.
494+ : by the currently running version of the software.
495 : @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
496- : that of the CPU on which Zorba is currently running.
497+ : that of the CPU on which the software is currently running.
498 : @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
499 : @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq
500 :)
501@@ -692,9 +689,9 @@
502 : @error zerr:ZOSE0001 if the thesaurus data file could not be found.
503 : @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
504 : @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
505- : by the currently running version of Zorba.
506+ : by the currently running version of the software.
507 : @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
508- : that of the CPU on which Zorba is currently running.
509+ : that of the CPU on which the software is currently running.
510 : @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
511 : @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq
512 :)
513@@ -719,9 +716,9 @@
514 : @error zerr:ZOSE0001 if the thesaurus data file could not be found.
515 : @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
516 : @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
517- : by the currently running version of Zorba.
518+ : by the currently running version of the software.
519 : @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
520- : that of the CPU on which Zorba is currently running.
521+ : that of the CPU on which the software is currently running.
522 : @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
523 : @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq
524 :)
525@@ -754,9 +751,9 @@
526 : @error zerr:ZOSE0001 if the thesaurus data file could not be found.
527 : @error zerr:ZOSE0002 if the thesaurus data file is not a plain file.
528 : @error zerr:ZXQP8401 if the thesaurus data file's version is not supported
529- : by the currently running version of Zorba.
530+ : by the currently running version of the software.
531 : @error zerr:ZXQP8402 if the thesaurus data file's endianness does not match
532- : that of the CPU on which Zorba is currently running.
533+ : that of the CPU on which the software is currently running.
534 : @error zerr:ZXQP8403 if there was an error reading the thesaurus data file.
535 : @example test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq
536 :)
537@@ -779,7 +776,7 @@
538 : @example test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq
539 :)
540 declare function ft:tokenize-node( $node as node(), $lang as xs:language )
541- as element(ft-schema:token)* external;
542+ as object()* external;
543
544 (:~
545 : Tokenizes the given node and all of its descendants.
546@@ -795,7 +792,7 @@
547 : @example test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq
548 :)
549 declare function ft:tokenize-node( $node as node() )
550- as element(ft-schema:token)* external;
551+ as object()* external;
552
553 (:~
554 : Tokenizes the set of nodes comprising <code>$includes</code> (and all of its
555@@ -813,7 +810,7 @@
556 :)
557 declare function ft:tokenize-nodes( $includes as node()+,
558 $excludes as node()* )
559- as element(ft-schema:token)* external;
560+ as object()* external;
561
562 (:~
563 : Tokenizes the set of nodes comprising <code>$includes</code> (and all of its
564@@ -832,7 +829,7 @@
565 declare function ft:tokenize-nodes( $includes as node()+,
566 $excludes as node()*,
567 $lang as xs:language )
568- as element(ft-schema:token)* external;
569+ as object()* external;
570
571 (:~
572 : Tokenizes the given string.
573@@ -873,7 +870,7 @@
574 : tokenization specifically.
575 :)
576 declare function ft:tokenizer-properties( $lang as xs:language )
577- as element(ft-schema:tokenizer-properties) external;
578+ as object() external;
579
580 (:~
581 : Gets properties of the tokenizer for the
582@@ -884,7 +881,7 @@
583 : @error err:FTST0009 if <code>ft:current-lang()</code> is not supported.
584 :)
585 declare function ft:tokenizer-properties()
586- as element(ft-schema:tokenizer-properties) external;
587+ as object() external;
588
589 (:===========================================================================:)
590
591
592=== modified file 'src/compiler/translator/translator.cpp'
593--- src/compiler/translator/translator.cpp 2013-06-24 09:58:08 +0000
594+++ src/compiler/translator/translator.cpp 2013-06-27 23:31:27 +0000
595@@ -73,7 +73,6 @@
596 #include "functions/udf.h"
597 #include "functions/external_function.h"
598 #include "functions/func_ft_module.h"
599-#include "functions/func_ft_module_impl.h"
600
601 #include "annotations/annotations.h"
602
603
604=== modified file 'src/context/static_context.cpp'
605--- src/context/static_context.cpp 2013-06-26 01:57:13 +0000
606+++ src/context/static_context.cpp 2013-06-27 23:31:27 +0000
607@@ -472,7 +472,7 @@
608 #ifndef ZORBA_NO_FULL_TEXT
609 const char*
610 static_context::ZORBA_FULL_TEXT_FN_NS =
611-"http://www.zorba-xquery.com/modules/full-text";
612+"http://zorba.io/modules/full-text";
613 #endif /* ZORBA_NO_FULL_TEXT */
614
615 const char*
616
617=== modified file 'src/functions/CMakeLists.txt'
618--- src/functions/CMakeLists.txt 2013-06-15 02:57:08 +0000
619+++ src/functions/CMakeLists.txt 2013-06-27 23:31:27 +0000
620@@ -89,7 +89,3 @@
621 func_fn_hof_functions_impl.cpp
622 func_jsoniq_functions_impl.cpp
623 )
624-
625-IF (NOT ZORBA_NO_FULL_TEXT)
626- LIST(APPEND FUNCTIONS_SRCS func_ft_module_impl.cpp)
627-ENDIF (NOT ZORBA_NO_FULL_TEXT)
628
629=== removed file 'src/functions/func_ft_module_impl.cpp'
630--- src/functions/func_ft_module_impl.cpp 2013-02-07 17:24:36 +0000
631+++ src/functions/func_ft_module_impl.cpp 1970-01-01 00:00:00 +0000
632@@ -1,166 +0,0 @@
633-/*
634- * Copyright 2006-2008 The FLWOR Foundation.
635- *
636- * Licensed under the Apache License, Version 2.0 (the "License");
637- * you may not use this file except in compliance with the License.
638- * You may obtain a copy of the License at
639- *
640- * http://www.apache.org/licenses/LICENSE-2.0
641- *
642- * Unless required by applicable law or agreed to in writing, software
643- * distributed under the License is distributed on an "AS IS" BASIS,
644- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
645- * See the License for the specific language governing permissions and
646- * limitations under the License.
647- */
648-#include "stdafx.h"
649-#include "functions/func_ft_module_impl.h"
650-
651-#include "runtime/full_text/ft_module.h"
652-
653-#define FT_MODULE_NS "http://www.zorba-xquery.com/modules/full-text"
654-
655-namespace zorba
656-{
657-
658-#ifndef ZORBA_NO_FULL_TEXT
659-
660-PlanIter_t full_text_tokenize_node::codegen(
661- CompilerCB*,
662- static_context* sctx,
663- const QueryLoc& loc,
664- std::vector<PlanIter_t>& argv,
665- expr& ann) const
666-{
667- return new TokenizeNodeIterator(sctx, loc, argv);
668-}
669-
670-
671-PlanIter_t full_text_tokenize_nodes::codegen(
672- CompilerCB*,
673- static_context* sctx,
674- const QueryLoc& loc,
675- std::vector<PlanIter_t>& argv,
676- expr& ann) const
677-{
678- return new TokenizeNodesIterator(sctx, loc, argv);
679-}
680-
681-
682-PlanIter_t full_text_tokenizer_properties::codegen(
683- CompilerCB*,
684- static_context* sctx,
685- const QueryLoc& loc,
686- std::vector<PlanIter_t>& argv,
687- expr& ann) const
688-{
689- return new TokenizerPropertiesIterator(sctx, loc, argv);
690-}
691-
692-
693-PlanIter_t full_text_current_compare_options::codegen(
694- CompilerCB*,
695- static_context* sctx,
696- const QueryLoc& loc,
697- std::vector<PlanIter_t>& argv,
698- expr& ann) const
699-{
700- return new CurrentCompareOptionsIterator(sctx, loc, argv);
701-}
702-
703-#endif // ZORBA_NO_FULL_TEXT
704-
705-///////////////////////////////////////////////////////////////////////////////
706-
707-void populate_context_ft_module_impl(static_context* sctx)
708-{
709-#ifndef ZORBA_NO_FULL_TEXT
710-
711- xqtref_t current_compare_options_return_type =
712- GENV_TYPESYSTEM.create_node_type(store::StoreConsts::elementNode,
713- createQName(FT_MODULE_NS, "", "compare-options"),
714- NULL,
715- TypeConstants::QUANT_ONE,
716- false,
717- false);
718- {
719- DECL_WITH_KIND(sctx,
720- full_text_current_compare_options,
721- (createQName(FT_MODULE_NS, "", "current-compare-options"),
722- current_compare_options_return_type),
723- FunctionConsts::FULL_TEXT_CURRENT_COMPARE_OPTIONS_0);
724- }
725-
726- xqtref_t tokenize_return_type =
727- GENV_TYPESYSTEM.create_node_type(store::StoreConsts::elementNode,
728- createQName(FT_MODULE_NS, "", "token"),
729- NULL,
730- TypeConstants::QUANT_STAR,
731- false,
732- false);
733- {
734- DECL_WITH_KIND(sctx,
735- full_text_tokenize_node,
736- (createQName(FT_MODULE_NS, "", "tokenize-node"),
737- GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
738- tokenize_return_type),
739- FunctionConsts::FULL_TEXT_TOKENIZE_NODE_1);
740- }
741- {
742- DECL_WITH_KIND(sctx,
743- full_text_tokenize_node,
744- (createQName( FT_MODULE_NS, "", "tokenize-node"),
745- GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
746- GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
747- tokenize_return_type),
748- FunctionConsts::FULL_TEXT_TOKENIZE_NODE_2);
749- }
750- {
751- DECL_WITH_KIND(sctx,
752- full_text_tokenize_nodes,
753- (createQName( FT_MODULE_NS, "", "tokenize-nodes"),
754- GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
755- GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
756- tokenize_return_type),
757- FunctionConsts::FULL_TEXT_TOKENIZE_NODES_2);
758- }
759- {
760- DECL_WITH_KIND(sctx,
761- full_text_tokenize_nodes,
762- (createQName( FT_MODULE_NS, "", "tokenize-nodes"),
763- GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
764- GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
765- GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
766- tokenize_return_type),
767- FunctionConsts::FULL_TEXT_TOKENIZE_NODES_3);
768- }
769-
770- xqtref_t tokenizer_properties_return_type =
771- GENV_TYPESYSTEM.create_node_type(store::StoreConsts::elementNode,
772- createQName(FT_MODULE_NS, "", "tokenizer-properties"),
773- NULL,
774- TypeConstants::QUANT_ONE,
775- false,
776- false);
777- {
778- DECL_WITH_KIND(sctx,
779- full_text_tokenizer_properties,
780- (createQName(FT_MODULE_NS, "", "tokenizer-properties"),
781- tokenizer_properties_return_type),
782- FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_0);
783- }
784- {
785- DECL_WITH_KIND(sctx,
786- full_text_tokenizer_properties,
787- (createQName( FT_MODULE_NS, "", "tokenizer-properties"),
788- GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
789- tokenizer_properties_return_type),
790- FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_1);
791- }
792-#endif /* ZORBA_NO_FULL_TEXT */
793-}
794-
795-///////////////////////////////////////////////////////////////////////////////
796-
797-} // namespace zorba
798-/* vim:set et sw=2 ts=2: */
799
800=== removed file 'src/functions/func_ft_module_impl.h'
801--- src/functions/func_ft_module_impl.h 2013-02-07 17:24:36 +0000
802+++ src/functions/func_ft_module_impl.h 1970-01-01 00:00:00 +0000
803@@ -1,120 +0,0 @@
804-/*
805- * Copyright 2006-2008 The FLWOR Foundation.
806- *
807- * Licensed under the Apache License, Version 2.0 (the "License");
808- * you may not use this file except in compliance with the License.
809- * You may obtain a copy of the License at
810- *
811- * http://www.apache.org/licenses/LICENSE-2.0
812- *
813- * Unless required by applicable law or agreed to in writing, software
814- * distributed under the License is distributed on an "AS IS" BASIS,
815- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
816- * See the License for the specific language governing permissions and
817- * limitations under the License.
818- */
819-#ifndef ZORBA_FUNCTIONS_FT_MODULE_IMPL_H
820-#define ZORBA_FUNCTIONS_FT_MODULE_IMPL_H
821-
822-#include "stdafx.h"
823-
824-#include "functions/function.h"
825-#include "functions/function_impl.h"
826-
827-
828-namespace zorba
829-{
830-
831-#ifndef ZORBA_NO_FULL_TEXT
832-
833-///////////////////////////////////////////////////////////////////////////////
834-
835-//full-text:tokenize
836-class full_text_tokenize_node : public function
837-{
838-public:
839- full_text_tokenize_node(
840- const signature& sig,
841- FunctionConsts::FunctionKind kind)
842- :
843- function(sig, kind)
844- {
845- }
846-
847- // Mark the function as accessing the dyn ctx so that it won't be
848- // const-folded. We must prevent const-folding because the function
849- // uses the store to get access to the tokenizer provider.
850- bool accessesDynCtx() const { return true; }
851-
852- bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 0; }
853-
854- CODEGEN_DECL();
855-};
856-
857-
858-//full-text:tokenize_nodes
859-class full_text_tokenize_nodes : public function
860-{
861-public:
862- full_text_tokenize_nodes(
863- const signature& sig,
864- FunctionConsts::FunctionKind kind)
865- :
866- function(sig, kind)
867- {
868- }
869-
870- // Mark the function as accessing the dyn ctx so that it won't be
871- // const-folded. We must prevent const-folding because the function
872- // uses the store to get access to the tokenizer provider.
873- bool accessesDynCtx() const { return true; }
874-
875- bool mustCopyInputNodes(expr* fo, csize producer) const { return true; }
876-
877- CODEGEN_DECL();
878-};
879-
880-
881-//full-text:tokenizer-properties
882-class full_text_tokenizer_properties : public function
883-{
884-public:
885- full_text_tokenizer_properties(
886- const signature& sig,
887- FunctionConsts::FunctionKind kind)
888- :
889- function(sig, kind)
890- {
891- }
892-
893- // Mark the function as accessing the dyn ctx so that it won't be
894- // const-folded. We must prevent const-folding because the function
895- // uses the store to get access to the tokenizer provider.
896- bool accessesDynCtx() const { return true; }
897-
898- CODEGEN_DECL();
899-};
900-
901-
902-//full-text:current-compare-options
903-class full_text_current_compare_options : public function
904-{
905-public:
906- full_text_current_compare_options(
907- const signature& sig,
908- FunctionConsts::FunctionKind kind)
909- :
910- function(sig, kind)
911- {
912- }
913-
914- CODEGEN_DECL();
915-};
916-
917-///////////////////////////////////////////////////////////////////////////////
918-
919-#endif /* ZORBA_NO_FULL_TEXT */
920-
921-} // namespace zorba
922-#endif /* ZORBA_FULL_TEXT_FN_NS */
923-/* vim:set et sw=2 ts=2: */
924
925=== modified file 'src/functions/function_consts.h'
926--- src/functions/function_consts.h 2013-06-15 02:57:08 +0000
927+++ src/functions/function_consts.h 2013-06-27 23:31:27 +0000
928@@ -237,16 +237,6 @@
929
930 JN_OBJECT_1,
931
932-#ifndef ZORBA_NO_FULL_TEXT
933- FULL_TEXT_CURRENT_COMPARE_OPTIONS_0,
934- FULL_TEXT_TOKENIZER_PROPERTIES_1,
935- FULL_TEXT_TOKENIZER_PROPERTIES_0,
936- FULL_TEXT_TOKENIZE_NODE_2,
937- FULL_TEXT_TOKENIZE_NODE_1,
938- FULL_TEXT_TOKENIZE_NODES_3,
939- FULL_TEXT_TOKENIZE_NODES_2,
940-#endif /* ZORBA_NO_FULL_TEXT */
941-
942 #include "functions/function_enum.h"
943
944 FN_MAX_FUNC
945
946=== modified file 'src/functions/library.cpp'
947--- src/functions/library.cpp 2013-06-15 02:57:08 +0000
948+++ src/functions/library.cpp 2013-06-27 23:31:27 +0000
949@@ -169,7 +169,6 @@
950 populate_context_fetch(sctx);
951 #ifndef ZORBA_NO_FULL_TEXT
952 populate_context_ft_module(sctx);
953- populate_context_ft_module_impl(sctx);
954 #endif /* ZORBA_NO_FULL_TEXT */
955
956 populate_context_jsoniq_functions(sctx);
957
958=== modified file 'src/functions/pregenerated/func_ft_module.cpp'
959--- src/functions/pregenerated/func_ft_module.cpp 2013-03-05 23:11:50 +0000
960+++ src/functions/pregenerated/func_ft_module.cpp 2013-06-27 23:31:27 +0000
961@@ -31,6 +31,18 @@
962
963
964 #ifndef ZORBA_NO_FULL_TEXT
965+PlanIter_t full_text_current_compare_options::codegen(
966+ CompilerCB*,
967+ static_context* sctx,
968+ const QueryLoc& loc,
969+ std::vector<PlanIter_t>& argv,
970+ expr& ann) const
971+{
972+ return new CurrentCompareOptionsIterator(sctx, loc, argv);
973+}
974+
975+#endif
976+#ifndef ZORBA_NO_FULL_TEXT
977 PlanIter_t full_text_current_lang::codegen(
978 CompilerCB*,
979 static_context* sctx,
980@@ -151,6 +163,42 @@
981
982 #endif
983 #ifndef ZORBA_NO_FULL_TEXT
984+PlanIter_t full_text_tokenize_node::codegen(
985+ CompilerCB*,
986+ static_context* sctx,
987+ const QueryLoc& loc,
988+ std::vector<PlanIter_t>& argv,
989+ expr& ann) const
990+{
991+ return new TokenizeNodeIterator(sctx, loc, argv);
992+}
993+
994+#endif
995+#ifndef ZORBA_NO_FULL_TEXT
996+PlanIter_t full_text_tokenize_nodes::codegen(
997+ CompilerCB*,
998+ static_context* sctx,
999+ const QueryLoc& loc,
1000+ std::vector<PlanIter_t>& argv,
1001+ expr& ann) const
1002+{
1003+ return new TokenizeNodesIterator(sctx, loc, argv);
1004+}
1005+
1006+#endif
1007+#ifndef ZORBA_NO_FULL_TEXT
1008+PlanIter_t full_text_tokenizer_properties::codegen(
1009+ CompilerCB*,
1010+ static_context* sctx,
1011+ const QueryLoc& loc,
1012+ std::vector<PlanIter_t>& argv,
1013+ expr& ann) const
1014+{
1015+ return new TokenizerPropertiesIterator(sctx, loc, argv);
1016+}
1017+
1018+#endif
1019+#ifndef ZORBA_NO_FULL_TEXT
1020 PlanIter_t full_text_tokenize_string::codegen(
1021 CompilerCB*,
1022 static_context* sctx,
1023@@ -170,8 +218,23 @@
1024
1025
1026 {
1027+ DECL_WITH_KIND(sctx, full_text_current_compare_options,
1028+ (createQName("http://zorba.io/modules/full-text","","current-compare-options"),
1029+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
1030+ FunctionConsts::FULL_TEXT_CURRENT_COMPARE_OPTIONS_0);
1031+
1032+ }
1033+
1034+
1035+#endif
1036+
1037+
1038+#ifndef ZORBA_NO_FULL_TEXT
1039+
1040+
1041+ {
1042 DECL_WITH_KIND(sctx, full_text_current_lang,
1043- (createQName("http://www.zorba-xquery.com/modules/full-text","","current-lang"),
1044+ (createQName("http://zorba.io/modules/full-text","","current-lang"),
1045 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE),
1046 FunctionConsts::FULL_TEXT_CURRENT_LANG_0);
1047
1048@@ -186,7 +249,7 @@
1049
1050 {
1051 DECL_WITH_KIND(sctx, full_text_host_lang,
1052- (createQName("http://www.zorba-xquery.com/modules/full-text","","host-lang"),
1053+ (createQName("http://zorba.io/modules/full-text","","host-lang"),
1054 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE),
1055 FunctionConsts::FULL_TEXT_HOST_LANG_0);
1056
1057@@ -201,7 +264,7 @@
1058
1059 {
1060 DECL_WITH_KIND(sctx, full_text_is_stem_lang_supported,
1061- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stem-lang-supported"),
1062+ (createQName("http://zorba.io/modules/full-text","","is-stem-lang-supported"),
1063 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1064 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1065 FunctionConsts::FULL_TEXT_IS_STEM_LANG_SUPPORTED_1);
1066@@ -217,7 +280,7 @@
1067
1068 {
1069 DECL_WITH_KIND(sctx, full_text_is_stop_word,
1070- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word"),
1071+ (createQName("http://zorba.io/modules/full-text","","is-stop-word"),
1072 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1073 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1074 FunctionConsts::FULL_TEXT_IS_STOP_WORD_1);
1075@@ -233,7 +296,7 @@
1076
1077 {
1078 DECL_WITH_KIND(sctx, full_text_is_stop_word,
1079- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word"),
1080+ (createQName("http://zorba.io/modules/full-text","","is-stop-word"),
1081 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1082 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1083 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1084@@ -250,7 +313,7 @@
1085
1086 {
1087 DECL_WITH_KIND(sctx, full_text_is_stop_word_lang_supported,
1088- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-stop-word-lang-supported"),
1089+ (createQName("http://zorba.io/modules/full-text","","is-stop-word-lang-supported"),
1090 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1091 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1092 FunctionConsts::FULL_TEXT_IS_STOP_WORD_LANG_SUPPORTED_1);
1093@@ -266,7 +329,7 @@
1094
1095 {
1096 DECL_WITH_KIND(sctx, full_text_is_thesaurus_lang_supported,
1097- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-thesaurus-lang-supported"),
1098+ (createQName("http://zorba.io/modules/full-text","","is-thesaurus-lang-supported"),
1099 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1100 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1101 FunctionConsts::FULL_TEXT_IS_THESAURUS_LANG_SUPPORTED_1);
1102@@ -282,7 +345,7 @@
1103
1104 {
1105 DECL_WITH_KIND(sctx, full_text_is_thesaurus_lang_supported,
1106- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-thesaurus-lang-supported"),
1107+ (createQName("http://zorba.io/modules/full-text","","is-thesaurus-lang-supported"),
1108 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1109 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1110 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1111@@ -299,7 +362,7 @@
1112
1113 {
1114 DECL_WITH_KIND(sctx, full_text_is_tokenizer_lang_supported,
1115- (createQName("http://www.zorba-xquery.com/modules/full-text","","is-tokenizer-lang-supported"),
1116+ (createQName("http://zorba.io/modules/full-text","","is-tokenizer-lang-supported"),
1117 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1118 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
1119 FunctionConsts::FULL_TEXT_IS_TOKENIZER_LANG_SUPPORTED_1);
1120@@ -315,7 +378,7 @@
1121
1122 {
1123 DECL_WITH_KIND(sctx, full_text_stem,
1124- (createQName("http://www.zorba-xquery.com/modules/full-text","","stem"),
1125+ (createQName("http://zorba.io/modules/full-text","","stem"),
1126 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1127 GENV_TYPESYSTEM.STRING_TYPE_ONE),
1128 FunctionConsts::FULL_TEXT_STEM_1);
1129@@ -331,7 +394,7 @@
1130
1131 {
1132 DECL_WITH_KIND(sctx, full_text_stem,
1133- (createQName("http://www.zorba-xquery.com/modules/full-text","","stem"),
1134+ (createQName("http://zorba.io/modules/full-text","","stem"),
1135 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1136 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1137 GENV_TYPESYSTEM.STRING_TYPE_ONE),
1138@@ -348,7 +411,7 @@
1139
1140 {
1141 DECL_WITH_KIND(sctx, full_text_strip_diacritics,
1142- (createQName("http://www.zorba-xquery.com/modules/full-text","","strip-diacritics"),
1143+ (createQName("http://zorba.io/modules/full-text","","strip-diacritics"),
1144 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1145 GENV_TYPESYSTEM.STRING_TYPE_ONE),
1146 FunctionConsts::FULL_TEXT_STRIP_DIACRITICS_1);
1147@@ -364,7 +427,7 @@
1148
1149 {
1150 DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
1151- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup"),
1152+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup"),
1153 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1154 GENV_TYPESYSTEM.STRING_TYPE_STAR),
1155 FunctionConsts::FULL_TEXT_THESAURUS_LOOKUP_1);
1156@@ -380,7 +443,7 @@
1157
1158 {
1159 DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
1160- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup"),
1161+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup"),
1162 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1163 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1164 GENV_TYPESYSTEM.STRING_TYPE_STAR),
1165@@ -397,7 +460,7 @@
1166
1167 {
1168 DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
1169- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup"),
1170+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup"),
1171 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1172 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1173 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1174@@ -415,7 +478,7 @@
1175
1176 {
1177 DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
1178- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup"),
1179+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup"),
1180 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1181 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1182 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1183@@ -434,7 +497,7 @@
1184
1185 {
1186 DECL_WITH_KIND(sctx, full_text_thesaurus_lookup,
1187- (createQName("http://www.zorba-xquery.com/modules/full-text","","thesaurus-lookup"),
1188+ (createQName("http://zorba.io/modules/full-text","","thesaurus-lookup"),
1189 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1190 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1191 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1192@@ -454,8 +517,107 @@
1193
1194
1195 {
1196+ DECL_WITH_KIND(sctx, full_text_tokenize_node,
1197+ (createQName("http://zorba.io/modules/full-text","","tokenize-node"),
1198+ GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
1199+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
1200+ FunctionConsts::FULL_TEXT_TOKENIZE_NODE_1);
1201+
1202+ }
1203+
1204+
1205+#endif
1206+
1207+
1208+#ifndef ZORBA_NO_FULL_TEXT
1209+
1210+
1211+ {
1212+ DECL_WITH_KIND(sctx, full_text_tokenize_node,
1213+ (createQName("http://zorba.io/modules/full-text","","tokenize-node"),
1214+ GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
1215+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1216+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
1217+ FunctionConsts::FULL_TEXT_TOKENIZE_NODE_2);
1218+
1219+ }
1220+
1221+
1222+#endif
1223+
1224+
1225+#ifndef ZORBA_NO_FULL_TEXT
1226+
1227+
1228+ {
1229+ DECL_WITH_KIND(sctx, full_text_tokenize_nodes,
1230+ (createQName("http://zorba.io/modules/full-text","","tokenize-nodes"),
1231+ GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
1232+ GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
1233+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
1234+ FunctionConsts::FULL_TEXT_TOKENIZE_NODES_2);
1235+
1236+ }
1237+
1238+
1239+#endif
1240+
1241+
1242+#ifndef ZORBA_NO_FULL_TEXT
1243+
1244+
1245+ {
1246+ DECL_WITH_KIND(sctx, full_text_tokenize_nodes,
1247+ (createQName("http://zorba.io/modules/full-text","","tokenize-nodes"),
1248+ GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
1249+ GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
1250+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1251+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR),
1252+ FunctionConsts::FULL_TEXT_TOKENIZE_NODES_3);
1253+
1254+ }
1255+
1256+
1257+#endif
1258+
1259+
1260+#ifndef ZORBA_NO_FULL_TEXT
1261+
1262+
1263+ {
1264+ DECL_WITH_KIND(sctx, full_text_tokenizer_properties,
1265+ (createQName("http://zorba.io/modules/full-text","","tokenizer-properties"),
1266+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
1267+ FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_0);
1268+
1269+ }
1270+
1271+
1272+#endif
1273+
1274+
1275+#ifndef ZORBA_NO_FULL_TEXT
1276+
1277+
1278+ {
1279+ DECL_WITH_KIND(sctx, full_text_tokenizer_properties,
1280+ (createQName("http://zorba.io/modules/full-text","","tokenizer-properties"),
1281+ GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1282+ GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
1283+ FunctionConsts::FULL_TEXT_TOKENIZER_PROPERTIES_1);
1284+
1285+ }
1286+
1287+
1288+#endif
1289+
1290+
1291+#ifndef ZORBA_NO_FULL_TEXT
1292+
1293+
1294+ {
1295 DECL_WITH_KIND(sctx, full_text_tokenize_string,
1296- (createQName("http://www.zorba-xquery.com/modules/full-text","","tokenize-string"),
1297+ (createQName("http://zorba.io/modules/full-text","","tokenize-string"),
1298 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1299 GENV_TYPESYSTEM.STRING_TYPE_STAR),
1300 FunctionConsts::FULL_TEXT_TOKENIZE_STRING_1);
1301@@ -471,7 +633,7 @@
1302
1303 {
1304 DECL_WITH_KIND(sctx, full_text_tokenize_string,
1305- (createQName("http://www.zorba-xquery.com/modules/full-text","","tokenize-string"),
1306+ (createQName("http://zorba.io/modules/full-text","","tokenize-string"),
1307 GENV_TYPESYSTEM.STRING_TYPE_ONE,
1308 GENV_TYPESYSTEM.LANGUAGE_TYPE_ONE,
1309 GENV_TYPESYSTEM.STRING_TYPE_STAR),
1310
1311=== modified file 'src/functions/pregenerated/func_ft_module.h'
1312--- src/functions/pregenerated/func_ft_module.h 2013-03-05 23:11:50 +0000
1313+++ src/functions/pregenerated/func_ft_module.h 2013-06-27 23:31:27 +0000
1314@@ -38,6 +38,22 @@
1315
1316 #ifndef ZORBA_NO_FULL_TEXT
1317
1318+//full-text:current-compare-options
1319+class full_text_current_compare_options : public function
1320+{
1321+public:
1322+ full_text_current_compare_options(const signature& sig, FunctionConsts::FunctionKind kind)
1323+ :
1324+ function(sig, kind)
1325+ {
1326+
1327+ }
1328+
1329+ CODEGEN_DECL();
1330+};
1331+#endif
1332+#ifndef ZORBA_NO_FULL_TEXT
1333+
1334 //full-text:current-lang
1335 class full_text_current_lang : public function
1336 {
1337@@ -198,6 +214,54 @@
1338 #endif
1339 #ifndef ZORBA_NO_FULL_TEXT
1340
1341+//full-text:tokenize-node
1342+class full_text_tokenize_node : public function
1343+{
1344+public:
1345+ full_text_tokenize_node(const signature& sig, FunctionConsts::FunctionKind kind)
1346+ :
1347+ function(sig, kind)
1348+ {
1349+
1350+ }
1351+
1352+ CODEGEN_DECL();
1353+};
1354+#endif
1355+#ifndef ZORBA_NO_FULL_TEXT
1356+
1357+//full-text:tokenize-nodes
1358+class full_text_tokenize_nodes : public function
1359+{
1360+public:
1361+ full_text_tokenize_nodes(const signature& sig, FunctionConsts::FunctionKind kind)
1362+ :
1363+ function(sig, kind)
1364+ {
1365+
1366+ }
1367+
1368+ CODEGEN_DECL();
1369+};
1370+#endif
1371+#ifndef ZORBA_NO_FULL_TEXT
1372+
1373+//full-text:tokenizer-properties
1374+class full_text_tokenizer_properties : public function
1375+{
1376+public:
1377+ full_text_tokenizer_properties(const signature& sig, FunctionConsts::FunctionKind kind)
1378+ :
1379+ function(sig, kind)
1380+ {
1381+
1382+ }
1383+
1384+ CODEGEN_DECL();
1385+};
1386+#endif
1387+#ifndef ZORBA_NO_FULL_TEXT
1388+
1389 //full-text:tokenize-string
1390 class full_text_tokenize_string : public function
1391 {
1392
1393=== modified file 'src/functions/pregenerated/function_enum.h'
1394--- src/functions/pregenerated/function_enum.h 2013-06-08 05:33:57 +0000
1395+++ src/functions/pregenerated/function_enum.h 2013-06-27 23:31:27 +0000
1396@@ -187,6 +187,7 @@
1397 FN_ZORBA_FETCH_CONTENT_BINARY_2,
1398 FN_ZORBA_FETCH_CONTENT_TYPE_1,
1399 FN_PUT_2,
1400+ FULL_TEXT_CURRENT_COMPARE_OPTIONS_0,
1401 FULL_TEXT_CURRENT_LANG_0,
1402 FULL_TEXT_HOST_LANG_0,
1403 FULL_TEXT_IS_STEM_LANG_SUPPORTED_1,
1404@@ -204,6 +205,12 @@
1405 FULL_TEXT_THESAURUS_LOOKUP_3,
1406 FULL_TEXT_THESAURUS_LOOKUP_4,
1407 FULL_TEXT_THESAURUS_LOOKUP_6,
1408+ FULL_TEXT_TOKENIZE_NODE_1,
1409+ FULL_TEXT_TOKENIZE_NODE_2,
1410+ FULL_TEXT_TOKENIZE_NODES_2,
1411+ FULL_TEXT_TOKENIZE_NODES_3,
1412+ FULL_TEXT_TOKENIZER_PROPERTIES_0,
1413+ FULL_TEXT_TOKENIZER_PROPERTIES_1,
1414 FULL_TEXT_TOKENIZE_STRING_1,
1415 FULL_TEXT_TOKENIZE_STRING_2,
1416 FN_FUNCTION_LOOKUP_2,
1417
1418=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
1419--- src/runtime/full_text/ft_module_impl.cpp 2013-06-11 23:38:49 +0000
1420+++ src/runtime/full_text/ft_module_impl.cpp 2013-06-27 23:31:27 +0000
1421@@ -72,22 +72,20 @@
1422
1423 static iso639_1::type get_lang_from( store::Item_t lang_item,
1424 QueryLoc const &loc ) {
1425- zstring lang_string;
1426- lang_item->getStringValue2( lang_string );
1427-
1428- if ( !GenericCast::instance()->castableToLanguage( lang_string ) )
1429+ zstring const lang_str( lang_item->getStringValue() );
1430+ if ( !GenericCast::instance()->castableToLanguage( lang_str ) )
1431 throw XQUERY_EXCEPTION(
1432 err::XPTY0004,
1433 ERROR_PARAMS(
1434- ZED( BadType_23o ), lang_string, ZED( NoCastTo_45o ), "xs:language"
1435+ ZED( BadType_23o ), lang_str, ZED( NoCastTo_45o ), "xs:language"
1436 ),
1437 ERROR_LOC( loc )
1438 );
1439- if ( iso639_1::type const lang = find_lang( lang_string ) )
1440+ if ( iso639_1::type const lang = find_lang( lang_str ) )
1441 return lang;
1442 throw XQUERY_EXCEPTION(
1443 err::FTST0009 /* lang not supported */,
1444- ERROR_PARAMS( lang_string ),
1445+ ERROR_PARAMS( lang_str ),
1446 ERROR_LOC( loc )
1447 );
1448 }
1449@@ -109,91 +107,67 @@
1450 return std::move( tokenizer );
1451 }
1452
1453-static void make_token_element( FTToken const &token,
1454- TokenQNames const &qnames,
1455- store::Item_t &result ) {
1456- zstring base_uri = static_context::ZORBA_FULL_TEXT_FN_NS;
1457- store::Item_t item, attr_node, node_name, type_name;
1458- store::NsBindings const ns_bindings;
1459- zstring value_string;
1460-
1461- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1462- node_name = qnames.token;
1463- GENV_ITEMFACTORY->createElementNode(
1464- result, nullptr, node_name, type_name, false, false,
1465- ns_bindings, base_uri
1466- );
1467+static void make_token_object( FTToken const &token, store::Item_t &result ) {
1468+ store::Item_t item;
1469+ zstring s;
1470+ vector<store::Item_t> keys, values;
1471
1472 if ( token.lang() ) {
1473- value_string = iso639_1::string_of[ token.lang() ];
1474- GENV_ITEMFACTORY->createString( item, value_string );
1475- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1476- node_name = qnames.lang;
1477- GENV_ITEMFACTORY->createAttributeNode(
1478- attr_node, result, node_name, type_name, item
1479- );
1480+ s = "lang";
1481+ GENV_ITEMFACTORY->createString( item, s );
1482+ keys.push_back( item );
1483+ s = iso639_1::string_of[ token.lang() ];
1484+ GENV_ITEMFACTORY->createString( item, s );
1485+ values.push_back( item );
1486 }
1487
1488- ztd::to_string( token.para(), &value_string );
1489- GENV_ITEMFACTORY->createString( item, value_string );
1490- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1491- node_name = qnames.paragraph;
1492- GENV_ITEMFACTORY->createAttributeNode(
1493- attr_node, result, node_name, type_name, item
1494- );
1495-
1496- ztd::to_string( token.sent(), &value_string );
1497- GENV_ITEMFACTORY->createString( item, value_string );
1498- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1499- node_name = qnames.sentence;
1500- GENV_ITEMFACTORY->createAttributeNode(
1501- attr_node, result, node_name, type_name, item
1502- );
1503-
1504- value_string = token.value();
1505- GENV_ITEMFACTORY->createString( item, value_string );
1506- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1507- node_name = qnames.value;
1508- GENV_ITEMFACTORY->createAttributeNode(
1509- attr_node, result, node_name, type_name, item
1510- );
1511+ s = "paragraph";
1512+ GENV_ITEMFACTORY->createString( item, s );
1513+ keys.push_back( item );
1514+ GENV_ITEMFACTORY->createInteger( item, xs_integer( token.para() ) );
1515+ values.push_back( item );
1516+
1517+ s = "sentence";
1518+ GENV_ITEMFACTORY->createString( item, s );
1519+ keys.push_back( item );
1520+ GENV_ITEMFACTORY->createInteger( item, xs_integer( token.sent() ) );
1521+ values.push_back( item );
1522+
1523+ s = "value";
1524+ GENV_ITEMFACTORY->createString( item, s );
1525+ keys.push_back( item );
1526+ s = token.value();
1527+ GENV_ITEMFACTORY->createString( item, s );
1528+ values.push_back( item );
1529
1530 if ( store::Item const *const token_item = token.item() ) {
1531 if ( GENV_STORE.getNodeReference( item, token_item ) ) {
1532- item->getStringValue2( value_string );
1533- GENV_ITEMFACTORY->createString( item, value_string );
1534- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1535- node_name = qnames.node_ref;
1536- GENV_ITEMFACTORY->createAttributeNode(
1537- attr_node, result, node_name, type_name, item
1538- );
1539+ s = item->getStringValue();
1540+ GENV_ITEMFACTORY->createAnyURI( item, s );
1541+ values.push_back( item );
1542+ s = "node-ref";
1543+ GENV_ITEMFACTORY->createString( item, s );
1544+ keys.push_back( item );
1545 }
1546 }
1547+
1548+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
1549 }
1550
1551 ///////////////////////////////////////////////////////////////////////////////
1552
1553 bool CurrentCompareOptionsIterator::nextImpl( store::Item_t &result,
1554 PlanState &plan_state ) const {
1555- zstring base_uri;
1556- store::Item_t junk, item, name;
1557- store::NsBindings const ns_bindings;
1558+ store::Item_t item;
1559+ zstring s;
1560+ vector<store::Item_t> keys, values;
1561+
1562 static_context const *const sctx = getStaticContext();
1563 ZORBA_ASSERT( sctx );
1564- store::Item_t type_name;
1565- zstring value_string;
1566
1567 PlanIteratorState *state;
1568 DEFAULT_STACK_INIT( PlanIteratorState, state, plan_state );
1569
1570- GENV_ITEMFACTORY->createQName(
1571- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "compare-options"
1572- );
1573- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1574- GENV_ITEMFACTORY->createElementNode(
1575- result, nullptr, name, type_name, false, false, ns_bindings, base_uri
1576- );
1577-
1578 ft_case_mode::type case_mode;
1579 ft_diacritics_mode::type diacritics_mode;
1580 ft_stem_mode::type stem_mode;
1581@@ -208,26 +182,28 @@
1582 stem_mode = ft_stem_mode::DEFAULT;
1583 }
1584
1585- // case="..."
1586- GENV_ITEMFACTORY->createQName( name, "", "", "case" );
1587- value_string = ft_case_mode::string_of[ case_mode ];
1588- GENV_ITEMFACTORY->createString( item, value_string );
1589- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1590- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
1591-
1592- // diacritics="..."
1593- GENV_ITEMFACTORY->createQName( name, "", "", "diacritics" );
1594- value_string = ft_diacritics_mode::string_of[ diacritics_mode ];
1595- GENV_ITEMFACTORY->createString( item, value_string );
1596- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1597- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
1598-
1599- // stemming="..."
1600- GENV_ITEMFACTORY->createQName( name, "", "", "stemming" );
1601- value_string = ft_stem_mode::string_of[ stem_mode ];
1602- GENV_ITEMFACTORY->createString( item, value_string );
1603- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1604- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
1605+ s = "case";
1606+ GENV_ITEMFACTORY->createString( item, s );
1607+ keys.push_back( item );
1608+ s = ft_case_mode::string_of[ case_mode ];
1609+ GENV_ITEMFACTORY->createString( item, s );
1610+ values.push_back( item );
1611+
1612+ s = "diacritics";
1613+ GENV_ITEMFACTORY->createString( item, s );
1614+ keys.push_back( item );
1615+ s = ft_diacritics_mode::string_of[ diacritics_mode ];
1616+ GENV_ITEMFACTORY->createString( item, s );
1617+ values.push_back( item );
1618+
1619+ s = "stemming";
1620+ GENV_ITEMFACTORY->createString( item, s );
1621+ keys.push_back( item );
1622+ s = ft_stem_mode::string_of[ stem_mode ];
1623+ GENV_ITEMFACTORY->createString( item, s );
1624+ values.push_back( item );
1625+
1626+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
1627
1628 STACK_PUSH( true, state );
1629 STACK_END( state );
1630@@ -645,9 +621,7 @@
1631 state->doc_item_->getTokens( *tokenizer_provider, t_state, lang );
1632
1633 while ( state->doc_tokens_->hasNext() ) {
1634- make_token_element(
1635- *state->doc_tokens_->next(), state->token_qnames_, result
1636- );
1637+ make_token_object( *state->doc_tokens_->next(), result );
1638 STACK_PUSH( true, state );
1639 }
1640 }
1641@@ -662,7 +636,9 @@
1642 StateTraitsImpl<TokenizeNodeIteratorState>::getState(
1643 plan_state, this->theStateOffset
1644 );
1645- state->doc_tokens_->reset();
1646+ FTTokenIterator_t &doc_tokens = state->doc_tokens_;
1647+ if ( !doc_tokens.isNull() )
1648+ doc_tokens->reset();
1649 }
1650
1651 ///////////////////////////////////////////////////////////////////////////////
1652@@ -781,9 +757,7 @@
1653 continue;
1654 } // if ( state->tokens_.empty() )
1655
1656- make_token_element(
1657- state->tokens_.front(), state->token_qnames_, result
1658- );
1659+ make_token_object( state->tokens_.front(), result );
1660 state->tokens_.pop_front();
1661 STACK_PUSH( true, state );
1662 } // while
1663@@ -798,22 +772,22 @@
1664 StateTraitsImpl<TokenizeNodesIteratorState>::getState(
1665 plan_state, this->theStateOffset
1666 );
1667- state->doc_tokens_->reset();
1668+ FTTokenIterator_t &doc_tokens = state->doc_tokens_;
1669+ if ( !doc_tokens.isNull() )
1670+ doc_tokens->reset();
1671 }
1672
1673 ///////////////////////////////////////////////////////////////////////////////
1674
1675 bool TokenizerPropertiesIterator::nextImpl( store::Item_t &result,
1676 PlanState &plan_state ) const {
1677- store::Item_t element, item, junk, name;
1678- zstring base_uri;
1679+ store::Item_t item;
1680 iso639_1::type lang;
1681- Tokenizer::State t_state;
1682- store::NsBindings const ns_bindings;
1683- Tokenizer::ptr tokenizer;
1684- store::Item_t type_name;
1685 Tokenizer::Properties props;
1686- zstring value_string;
1687+ zstring s;
1688+ Tokenizer::ptr tokenizer;
1689+ Tokenizer::State t_state;
1690+ vector<store::Item_t> keys, values;
1691
1692 PlanIteratorState *state;
1693 DEFAULT_STACK_INIT( PlanIteratorState, state, plan_state );
1694@@ -830,83 +804,45 @@
1695 tokenizer = get_tokenizer( lang, &t_state, loc );
1696 tokenizer->properties( &props );
1697
1698- GENV_ITEMFACTORY->createQName(
1699- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "tokenizer-properties"
1700- );
1701- type_name = GENV_TYPESYSTEM.XS_UNTYPED_QNAME;
1702- GENV_ITEMFACTORY->createElementNode(
1703- result, nullptr, name, type_name, false, false, ns_bindings, base_uri
1704- );
1705-
1706- // uri="..."
1707- GENV_ITEMFACTORY->createQName( name, "", "", "uri" );
1708+ s = "uri";
1709+ GENV_ITEMFACTORY->createString( item, s );
1710+ keys.push_back( item );
1711 GENV_ITEMFACTORY->createAnyURI( item, props.uri );
1712- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1713- GENV_ITEMFACTORY->createAttributeNode( junk, result, name, type_name, item );
1714+ values.push_back( item );
1715
1716- // <comments-separate-tokens value="..."/>
1717- GENV_ITEMFACTORY->createQName(
1718- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "comments-separate-tokens"
1719- );
1720- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1721- GENV_ITEMFACTORY->createElementNode(
1722- element, result, name, type_name, false, false, ns_bindings, base_uri
1723- );
1724- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
1725+ s = "comments-separate-tokens";
1726+ GENV_ITEMFACTORY->createString( item, s );
1727+ keys.push_back( item );
1728 GENV_ITEMFACTORY->createBoolean( item, props.comments_separate_tokens );
1729- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1730- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
1731+ values.push_back( item );
1732
1733- // <elements-separate-tokens value="..."/>
1734- GENV_ITEMFACTORY->createQName(
1735- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "elements-separate-tokens"
1736- );
1737- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1738- GENV_ITEMFACTORY->createElementNode(
1739- element, result, name, type_name, false, false, ns_bindings, base_uri
1740- );
1741- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
1742+ s = "elements-separate-tokens";
1743+ GENV_ITEMFACTORY->createString( item, s );
1744+ keys.push_back( item );
1745 GENV_ITEMFACTORY->createBoolean( item, props.elements_separate_tokens );
1746- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1747- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
1748+ values.push_back( item );
1749
1750- // <processing-instructions-separate-tokens value="..."/>
1751- GENV_ITEMFACTORY->createQName(
1752- name, static_context::ZORBA_FULL_TEXT_FN_NS, "",
1753- "processing-instructions-separate-tokens"
1754- );
1755- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1756- GENV_ITEMFACTORY->createElementNode(
1757- element, result, name, type_name, false, false, ns_bindings, base_uri
1758- );
1759- GENV_ITEMFACTORY->createQName( name, "", "", "value" );
1760+ s = "processing-instructions-separate-tokens";
1761+ GENV_ITEMFACTORY->createString( item, s );
1762+ keys.push_back( item );
1763 GENV_ITEMFACTORY->createBoolean( item, props.processing_instructions_separate_tokens );
1764- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1765- GENV_ITEMFACTORY->createAttributeNode( junk, element, name, type_name, item );
1766-
1767- // <supported-languages>...</supported-languages>
1768- GENV_ITEMFACTORY->createQName(
1769- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "supported-languages"
1770- );
1771- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1772- GENV_ITEMFACTORY->createElementNode(
1773- element, result, name, type_name, false, false, ns_bindings, base_uri
1774- );
1775-
1776- // <lang>...</lang>
1777- FOR_EACH( Tokenizer::Properties::languages_type, i, props.languages ) {
1778- store::Item_t lang_element;
1779- type_name = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
1780- GENV_ITEMFACTORY->createQName(
1781- name, static_context::ZORBA_FULL_TEXT_FN_NS, "", "lang"
1782- );
1783- GENV_ITEMFACTORY->createElementNode(
1784- lang_element, element, name, type_name, false, false, ns_bindings,
1785- base_uri
1786- );
1787- value_string = iso639_1::string_of[ *i ];
1788- GENV_ITEMFACTORY->createTextNode( junk, lang_element.getp(), value_string );
1789+ values.push_back( item );
1790+
1791+ s = "supported-languages";
1792+ GENV_ITEMFACTORY->createString( item, s );
1793+ keys.push_back( item );
1794+ { // local scope
1795+ vector<store::Item_t> langs;
1796+ FOR_EACH( Tokenizer::Properties::languages_type, i, props.languages ) {
1797+ s = iso639_1::string_of[ *i ];
1798+ GENV_ITEMFACTORY->createString( item, s );
1799+ langs.push_back( item );
1800+ }
1801+ GENV_ITEMFACTORY->createJSONArray( item, langs );
1802 }
1803+ values.push_back( item );
1804+
1805+ GENV_ITEMFACTORY->createJSONObject( result, keys, values );
1806
1807 STACK_PUSH( true, state );
1808 STACK_END( state );
1809
1810=== modified file 'src/runtime/full_text/ft_module_util.cpp'
1811--- src/runtime/full_text/ft_module_util.cpp 2013-02-07 17:24:36 +0000
1812+++ src/runtime/full_text/ft_module_util.cpp 2013-06-27 23:31:27 +0000
1813@@ -16,9 +16,6 @@
1814
1815 #include "stdafx.h"
1816 #include "api/unmarshaller.h"
1817-#include "context/static_context.h"
1818-#include "store/api/item_factory.h"
1819-#include "system/globalenv.h"
1820
1821 #include "ft_module_util.h"
1822
1823@@ -41,18 +38,5 @@
1824
1825 ///////////////////////////////////////////////////////////////////////////////
1826
1827-TokenQNames::TokenQNames() {
1828- GENV_ITEMFACTORY->createQName(
1829- token, static_context::ZORBA_FULL_TEXT_FN_NS, "", "token"
1830- );
1831- GENV_ITEMFACTORY->createQName( lang, "", "", "lang" );
1832- GENV_ITEMFACTORY->createQName( paragraph, "", "", "paragraph" );
1833- GENV_ITEMFACTORY->createQName( sentence, "", "", "sentence" );
1834- GENV_ITEMFACTORY->createQName( value, "", "", "value" );
1835- GENV_ITEMFACTORY->createQName( node_ref, "", "", "node-ref" );
1836-}
1837-
1838-///////////////////////////////////////////////////////////////////////////////
1839-
1840 } // namespace zorba
1841 /* vim:set et sw=2 ts=2: */
1842
1843=== modified file 'src/runtime/full_text/ft_module_util.h'
1844--- src/runtime/full_text/ft_module_util.h 2013-06-01 00:30:39 +0000
1845+++ src/runtime/full_text/ft_module_util.h 2013-06-27 23:31:27 +0000
1846@@ -31,8 +31,6 @@
1847 #include "store/api/item.h"
1848 #include "zorbatypes/ft_token.h"
1849
1850-#include "ft_module_util.h"
1851-
1852 namespace zorba {
1853
1854 ///////////////////////////////////////////////////////////////////////////////
1855@@ -62,19 +60,6 @@
1856
1857 ///////////////////////////////////////////////////////////////////////////////
1858
1859-struct TokenQNames {
1860- store::Item_t token;
1861- store::Item_t lang;
1862- store::Item_t paragraph;
1863- store::Item_t sentence;
1864- store::Item_t value;
1865- store::Item_t node_ref;
1866-
1867- TokenQNames();
1868-};
1869-
1870-///////////////////////////////////////////////////////////////////////////////
1871-
1872 } // namespace zorba
1873 #endif /* ZORBA_FT_MODULE_UTIL_H */
1874 /* vim:set et sw=2 ts=2: */
1875
1876=== modified file 'src/runtime/full_text/pregenerated/ft_module.h'
1877--- src/runtime/full_text/pregenerated/ft_module.h 2013-03-05 23:11:50 +0000
1878+++ src/runtime/full_text/pregenerated/ft_module.h 2013-06-27 23:31:27 +0000
1879@@ -421,7 +421,6 @@
1880 public:
1881 store::Item_t doc_item_; //
1882 FTTokenIterator_t doc_tokens_; //
1883- TokenQNames token_qnames_; //
1884
1885 TokenizeNodeIteratorState();
1886
1887@@ -469,7 +468,6 @@
1888 public:
1889 store::Item_t doc_item_; //
1890 FTTokenIterator_t doc_tokens_; //
1891- TokenQNames token_qnames_; //
1892 std::list<store::Item_t> includes_; //
1893 std::vector<store::Item_t> excludes_; //
1894 std::stack<Tokenizer*> tokenizers_; //
1895
1896=== modified file 'src/runtime/spec/full_text/ft_module.xml'
1897--- src/runtime/spec/full_text/ft_module.xml 2013-02-07 17:24:36 +0000
1898+++ src/runtime/spec/full_text/ft_module.xml 2013-06-27 23:31:27 +0000
1899@@ -24,6 +24,11 @@
1900
1901 <zorba:iterator name="CurrentCompareOptionsIterator"
1902 preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
1903+ <zorba:function>
1904+ <zorba:signature localname="current-compare-options" prefix="full-text">
1905+ <zorba:output>object()</zorba:output>
1906+ </zorba:signature>
1907+ </zorba:function>
1908 </zorba:iterator>
1909
1910 <zorba:iterator name="CurrentLangIterator"
1911@@ -198,10 +203,20 @@
1912 <zorba:iterator name="TokenizeNodeIterator"
1913 generateResetImpl="true"
1914 preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
1915+ <zorba:function>
1916+ <zorba:signature localname="tokenize-node" prefix="full-text">
1917+ <zorba:param>node()</zorba:param>
1918+ <zorba:output>object()*</zorba:output>
1919+ </zorba:signature>
1920+ <zorba:signature localname="tokenize-node" prefix="full-text">
1921+ <zorba:param>node()</zorba:param>
1922+ <zorba:param>xs:language</zorba:param>
1923+ <zorba:output>object()*</zorba:output>
1924+ </zorba:signature>
1925+ </zorba:function>
1926 <zorba:state generateInit="use-default">
1927 <zorba:member type="store::Item_t" name="doc_item_"/>
1928 <zorba:member type="FTTokenIterator_t" name="doc_tokens_"/>
1929- <zorba:member type="TokenQNames" name="token_qnames_"/>
1930 </zorba:state>
1931 </zorba:iterator>
1932
1933@@ -210,12 +225,23 @@
1934 <zorba:iterator name="TokenizeNodesIterator"
1935 generateResetImpl="true"
1936 preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
1937+ <zorba:function>
1938+ <zorba:signature localname="tokenize-nodes" prefix="full-text">
1939+ <zorba:param>node()+</zorba:param>
1940+ <zorba:param>node()*</zorba:param>
1941+ <zorba:output>object()*</zorba:output>
1942+ </zorba:signature>
1943+ <zorba:signature localname="tokenize-nodes" prefix="full-text">
1944+ <zorba:param>node()+</zorba:param>
1945+ <zorba:param>node()*</zorba:param>
1946+ <zorba:param>xs:language</zorba:param>
1947+ <zorba:output>object()*</zorba:output>
1948+ </zorba:signature>
1949+ </zorba:function>
1950 <zorba:state generateInit="use-default">
1951 <zorba:member type="store::Item_t" name="doc_item_"/>
1952 <zorba:member type="FTTokenIterator_t" name="doc_tokens_"/>
1953
1954- <zorba:member type="TokenQNames" name="token_qnames_"/>
1955-
1956 <zorba:member type="std::list&lt;store::Item_t&gt;" name="includes_"/>
1957 <zorba:member type="std::vector&lt;store::Item_t&gt;" name="excludes_"/>
1958
1959@@ -231,6 +257,15 @@
1960
1961 <zorba:iterator name="TokenizerPropertiesIterator"
1962 preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
1963+ <zorba:function>
1964+ <zorba:signature localname="tokenizer-properties" prefix="full-text">
1965+ <zorba:output>object()</zorba:output>
1966+ </zorba:signature>
1967+ <zorba:signature localname="tokenizer-properties" prefix="full-text">
1968+ <zorba:param>xs:language</zorba:param>
1969+ <zorba:output>object()</zorba:output>
1970+ </zorba:signature>
1971+ </zorba:function>
1972 </zorba:iterator>
1973
1974 <!--========================================================================-->
1975@@ -238,7 +273,6 @@
1976 <zorba:iterator name="TokenizeStringIterator"
1977 generateResetImpl="true"
1978 preprocessorGuard="#ifndef ZORBA_NO_FULL_TEXT">
1979-
1980 <zorba:function>
1981 <zorba:signature localname="tokenize-string" prefix="full-text">
1982 <zorba:param>xs:string</zorba:param> <!-- string -->
1983
1984=== modified file 'src/runtime/spec/mappings.xml'
1985--- src/runtime/spec/mappings.xml 2013-03-12 17:03:31 +0000
1986+++ src/runtime/spec/mappings.xml 2013-06-27 23:31:27 +0000
1987@@ -81,7 +81,7 @@
1988 prefix="zorba-store-data-structure-unordered-map"/>
1989
1990 <zorba:namespace
1991- uri="http://www.zorba-xquery.com/modules/full-text"
1992+ uri="http://zorba.io/modules/full-text"
1993 define="ZORBA_FULL_TEXT_FN_NS"
1994 prefix="full-text"/>
1995
1996
1997=== removed file 'test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res'
1998--- test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res 2012-09-30 09:46:56 +0000
1999+++ test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res 1970-01-01 00:00:00 +0000
2000@@ -1,1 +0,0 @@
2001-xs:untypedAtomic
2002
2003=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq'
2004--- test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq 2012-05-08 23:49:22 +0000
2005+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-1.xq 2013-06-27 23:31:27 +0000
2006@@ -1,9 +1,10 @@
2007-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2008-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2009-
2010-let $options := validate { ft:current-compare-options() }
2011-return $options/@case = "case insensitive"
2012- and $options/@diacritics = "diacritics insensitive"
2013- and $options/@stemming = "no stemming"
2014+jsoniq version "1.0";
2015+
2016+import module namespace ft = "http://zorba.io/modules/full-text";
2017+
2018+let $options := ft:current-compare-options()
2019+return $options.case eq "case insensitive"
2020+ and $options.diacritics eq "diacritics insensitive"
2021+ and $options.stemming eq "no stemming"
2022
2023 (: vim:set et sw=2 ts=2: :)
2024
2025=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq'
2026--- test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq 2012-05-08 23:49:22 +0000
2027+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-compare-options-2.xq 2013-06-27 23:31:27 +0000
2028@@ -1,14 +1,15 @@
2029-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2030-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2031+jsoniq version "1.0";
2032+
2033+import module namespace ft = "http://zorba.io/modules/full-text";
2034
2035 declare ft-option
2036 using case sensitive
2037 using diacritics sensitive
2038 using stemming;
2039
2040-let $options := validate { ft:current-compare-options() }
2041-return $options/@case = "case sensitive"
2042- and $options/@diacritics = "diacritics sensitive"
2043- and $options/@stemming = "stemming"
2044+let $options := ft:current-compare-options()
2045+return $options.case eq "case sensitive"
2046+ and $options.diacritics eq "diacritics sensitive"
2047+ and $options.stemming eq "stemming"
2048
2049 (: vim:set et sw=2 ts=2: :)
2050
2051=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq'
2052--- test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq 2012-03-20 01:05:40 +0000
2053+++ test/rbkt/Queries/zorba/fulltext/ft-module-current-lang-true-1.xq 2013-06-27 23:31:27 +0000
2054@@ -1,4 +1,4 @@
2055-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2056+import module namespace ft = "http://zorba.io/modules/full-text";
2057
2058 declare ft-option using language "zu";
2059
2060
2061=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq'
2062--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq 2012-03-06 17:28:50 +0000
2063+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-da-supported-true.xq 2013-06-27 23:31:27 +0000
2064@@ -1,3 +1,3 @@
2065-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2066+import module namespace ft = "http://zorba.io/modules/full-text";
2067
2068 ft:is-stem-lang-supported( xs:language("da") )
2069
2070=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq'
2071--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq 2012-03-06 17:28:50 +0000
2072+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-de-supported-true.xq 2013-06-27 23:31:27 +0000
2073@@ -1,3 +1,3 @@
2074-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2075+import module namespace ft = "http://zorba.io/modules/full-text";
2076
2077 ft:is-stem-lang-supported( xs:language("de") )
2078
2079=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq'
2080--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq 2012-03-06 17:28:50 +0000
2081+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-en-supported-true.xq 2013-06-27 23:31:27 +0000
2082@@ -1,3 +1,3 @@
2083-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2084+import module namespace ft = "http://zorba.io/modules/full-text";
2085
2086 ft:is-stem-lang-supported( xs:language("en") )
2087
2088=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq'
2089--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq 2012-03-06 17:28:50 +0000
2090+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-es-supported-true.xq 2013-06-27 23:31:27 +0000
2091@@ -1,3 +1,3 @@
2092-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2093+import module namespace ft = "http://zorba.io/modules/full-text";
2094
2095 ft:is-stem-lang-supported( xs:language("es") )
2096
2097=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq'
2098--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq 2012-03-06 17:28:50 +0000
2099+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-fi-supported-true.xq 2013-06-27 23:31:27 +0000
2100@@ -1,3 +1,3 @@
2101-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2102+import module namespace ft = "http://zorba.io/modules/full-text";
2103
2104 ft:is-stem-lang-supported( xs:language("fi") )
2105
2106=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq'
2107--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq 2012-03-06 17:28:50 +0000
2108+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-hu-supported-true.xq 2013-06-27 23:31:27 +0000
2109@@ -1,3 +1,3 @@
2110-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2111+import module namespace ft = "http://zorba.io/modules/full-text";
2112
2113 ft:is-stem-lang-supported( xs:language("hu") )
2114
2115=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq'
2116--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq 2012-03-06 17:28:50 +0000
2117+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-it-supported-true.xq 2013-06-27 23:31:27 +0000
2118@@ -1,3 +1,3 @@
2119-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2120+import module namespace ft = "http://zorba.io/modules/full-text";
2121
2122 ft:is-stem-lang-supported( xs:language("it") )
2123
2124=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq'
2125--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq 2012-03-06 17:28:50 +0000
2126+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-nl-supported-true.xq 2013-06-27 23:31:27 +0000
2127@@ -1,3 +1,3 @@
2128-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2129+import module namespace ft = "http://zorba.io/modules/full-text";
2130
2131 ft:is-stem-lang-supported( xs:language("nl") )
2132
2133=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq'
2134--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq 2012-03-06 17:28:50 +0000
2135+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-no-supported-true.xq 2013-06-27 23:31:27 +0000
2136@@ -1,3 +1,3 @@
2137-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2138+import module namespace ft = "http://zorba.io/modules/full-text";
2139
2140 ft:is-stem-lang-supported( xs:language("no") )
2141
2142=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq'
2143--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq 2012-03-06 17:28:50 +0000
2144+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-pt-supported-true.xq 2013-06-27 23:31:27 +0000
2145@@ -1,3 +1,3 @@
2146-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2147+import module namespace ft = "http://zorba.io/modules/full-text";
2148
2149 ft:is-stem-lang-supported( xs:language("pt") )
2150
2151=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq'
2152--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq 2012-03-06 17:28:50 +0000
2153+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-ru-supported-true.xq 2013-06-27 23:31:27 +0000
2154@@ -1,3 +1,3 @@
2155-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2156+import module namespace ft = "http://zorba.io/modules/full-text";
2157
2158 ft:is-stem-lang-supported( xs:language("ru") )
2159
2160=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq'
2161--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
2162+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-1.xq 2013-06-27 23:31:27 +0000
2163@@ -1,4 +1,4 @@
2164-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2165+import module namespace ft = "http://zorba.io/modules/full-text";
2166
2167 (: Valid, but unsupported ISO 639-1 code. :)
2168 ft:is-stem-lang-supported( xs:language("zu") )
2169
2170=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq'
2171--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
2172+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-supported-false-2.xq 2013-06-27 23:31:27 +0000
2173@@ -1,4 +1,4 @@
2174-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2175+import module namespace ft = "http://zorba.io/modules/full-text";
2176
2177 (: Invalid ISO 639-1 code. :)
2178 ft:is-stem-lang-supported( xs:language("XX") )
2179
2180=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq'
2181--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq 2012-03-06 17:28:50 +0000
2182+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stem-lang-sv-supported-true.xq 2013-06-27 23:31:27 +0000
2183@@ -1,3 +1,3 @@
2184-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2185+import module namespace ft = "http://zorba.io/modules/full-text";
2186
2187 ft:is-stem-lang-supported( xs:language("sv") )
2188
2189=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq'
2190--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq 2011-09-30 03:55:43 +0000
2191+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-false-1.xq 2013-06-27 23:31:27 +0000
2192@@ -1,3 +1,3 @@
2193-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2194+import module namespace ft = "http://zorba.io/modules/full-text";
2195
2196 ft:is-stop-word( "flavor", xs:language("en") )
2197
2198=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq'
2199--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq 2012-03-06 17:28:50 +0000
2200+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-da-supported-true.xq 2013-06-27 23:31:27 +0000
2201@@ -1,3 +1,3 @@
2202-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2203+import module namespace ft = "http://zorba.io/modules/full-text";
2204
2205 ft:is-stop-word-lang-supported( xs:language("en") )
2206
2207=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq'
2208--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq 2012-03-06 17:28:50 +0000
2209+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-de-supported-true.xq 2013-06-27 23:31:27 +0000
2210@@ -1,3 +1,3 @@
2211-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2212+import module namespace ft = "http://zorba.io/modules/full-text";
2213
2214 ft:is-stop-word-lang-supported( xs:language("en") )
2215
2216=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq'
2217--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq 2012-03-06 17:28:50 +0000
2218+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-en-supported-true.xq 2013-06-27 23:31:27 +0000
2219@@ -1,3 +1,3 @@
2220-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2221+import module namespace ft = "http://zorba.io/modules/full-text";
2222
2223 ft:is-stop-word-lang-supported( xs:language("en") )
2224
2225=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq'
2226--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq 2012-03-06 17:28:50 +0000
2227+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-es-supported-true.xq 2013-06-27 23:31:27 +0000
2228@@ -1,3 +1,3 @@
2229-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2230+import module namespace ft = "http://zorba.io/modules/full-text";
2231
2232 ft:is-stop-word-lang-supported( xs:language("en") )
2233
2234=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq'
2235--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq 2012-03-06 17:28:50 +0000
2236+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fi-supported-true.xq 2013-06-27 23:31:27 +0000
2237@@ -1,3 +1,3 @@
2238-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2239+import module namespace ft = "http://zorba.io/modules/full-text";
2240
2241 ft:is-stop-word-lang-supported( xs:language("en") )
2242
2243=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq'
2244--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq 2012-03-06 17:28:50 +0000
2245+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-fr-supported-true.xq 2013-06-27 23:31:27 +0000
2246@@ -1,3 +1,3 @@
2247-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2248+import module namespace ft = "http://zorba.io/modules/full-text";
2249
2250 ft:is-stop-word-lang-supported( xs:language("en") )
2251
2252=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq'
2253--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq 2012-03-06 17:28:50 +0000
2254+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-hu-supported-true.xq 2013-06-27 23:31:27 +0000
2255@@ -1,3 +1,3 @@
2256-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2257+import module namespace ft = "http://zorba.io/modules/full-text";
2258
2259 ft:is-stop-word-lang-supported( xs:language("en") )
2260
2261=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq'
2262--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq 2012-03-06 17:28:50 +0000
2263+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-it-supported-true.xq 2013-06-27 23:31:27 +0000
2264@@ -1,3 +1,3 @@
2265-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2266+import module namespace ft = "http://zorba.io/modules/full-text";
2267
2268 ft:is-stop-word-lang-supported( xs:language("en") )
2269
2270=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq'
2271--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq 2012-03-06 17:28:50 +0000
2272+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-nl-supported-true.xq 2013-06-27 23:31:27 +0000
2273@@ -1,3 +1,3 @@
2274-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2275+import module namespace ft = "http://zorba.io/modules/full-text";
2276
2277 ft:is-stop-word-lang-supported( xs:language("en") )
2278
2279=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq'
2280--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq 2012-03-06 17:28:50 +0000
2281+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-no-supported-true.xq 2013-06-27 23:31:27 +0000
2282@@ -1,3 +1,3 @@
2283-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2284+import module namespace ft = "http://zorba.io/modules/full-text";
2285
2286 ft:is-stop-word-lang-supported( xs:language("en") )
2287
2288=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq'
2289--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq 2012-03-06 17:28:50 +0000
2290+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-pt-supported-true.xq 2013-06-27 23:31:27 +0000
2291@@ -1,3 +1,3 @@
2292-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2293+import module namespace ft = "http://zorba.io/modules/full-text";
2294
2295 ft:is-stop-word-lang-supported( xs:language("en") )
2296
2297=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq'
2298--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
2299+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-1.xq 2013-06-27 23:31:27 +0000
2300@@ -1,4 +1,4 @@
2301-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2302+import module namespace ft = "http://zorba.io/modules/full-text";
2303
2304 (: Valid, but unsupported ISO 639-1 code. :)
2305 ft:is-stop-word-lang-supported( xs:language("zu") )
2306
2307=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq'
2308--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
2309+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-supported-false-2.xq 2013-06-27 23:31:27 +0000
2310@@ -1,4 +1,4 @@
2311-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2312+import module namespace ft = "http://zorba.io/modules/full-text";
2313
2314 (: Invalid ISO 639-1 code. :)
2315 ft:is-stop-word-lang-supported( xs:language("XX") )
2316
2317=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq'
2318--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq 2012-03-06 17:28:50 +0000
2319+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-lang-sv-supported-true.xq 2013-06-27 23:31:27 +0000
2320@@ -1,3 +1,3 @@
2321-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2322+import module namespace ft = "http://zorba.io/modules/full-text";
2323
2324 ft:is-stop-word-lang-supported( xs:language("en") )
2325
2326=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq'
2327--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq 2011-09-30 03:55:43 +0000
2328+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-1.xq 2013-06-27 23:31:27 +0000
2329@@ -1,3 +1,3 @@
2330-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2331+import module namespace ft = "http://zorba.io/modules/full-text";
2332
2333 ft:is-stop-word( "the", xs:language("en") )
2334
2335=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq'
2336--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq 2012-03-08 16:58:00 +0000
2337+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-2.xq 2013-06-27 23:31:27 +0000
2338@@ -1,4 +1,4 @@
2339-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2340+import module namespace ft = "http://zorba.io/modules/full-text";
2341
2342 declare ft-option using language "en";
2343
2344
2345=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq'
2346--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq 2012-03-08 16:58:00 +0000
2347+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-3.xq 2013-06-27 23:31:27 +0000
2348@@ -1,3 +1,3 @@
2349-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2350+import module namespace ft = "http://zorba.io/modules/full-text";
2351
2352 ft:is-stop-word( "el", xs:language("es") )
2353
2354=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq'
2355--- test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq 2012-03-08 16:58:00 +0000
2356+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-stop-word-true-4.xq 2013-06-27 23:31:27 +0000
2357@@ -1,4 +1,4 @@
2358-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2359+import module namespace ft = "http://zorba.io/modules/full-text";
2360
2361 declare ft-option using language "es";
2362
2363
2364=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq'
2365--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq 2012-02-22 16:26:17 +0000
2366+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-1.xq 2013-06-27 23:31:27 +0000
2367@@ -1,4 +1,4 @@
2368-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2369+import module namespace ft = "http://zorba.io/modules/full-text";
2370
2371 (: Valid, but unsupported ISO 639-1 code. :)
2372 ft:is-thesaurus-lang-supported( xs:language("zu") )
2373
2374=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq'
2375--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq 2012-02-22 16:26:17 +0000
2376+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-2.xq 2013-06-27 23:31:27 +0000
2377@@ -1,4 +1,4 @@
2378-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2379+import module namespace ft = "http://zorba.io/modules/full-text";
2380
2381 (: Invalid ISO 639-1 code. :)
2382 ft:is-thesaurus-lang-supported( xs:language("XX") )
2383
2384=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq'
2385--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq 2012-03-06 17:28:50 +0000
2386+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-false-3.xq 2013-06-27 23:31:27 +0000
2387@@ -1,4 +1,4 @@
2388-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2389+import module namespace ft = "http://zorba.io/modules/full-text";
2390
2391 (: Thesaurus URI that is not statically known. :)
2392 ft:is-thesaurus-lang-supported( "http://www.example.com/", xs:language("en") )
2393
2394=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq'
2395--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq 2012-02-22 16:26:17 +0000
2396+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-1.xq 2013-06-27 23:31:27 +0000
2397@@ -1,3 +1,3 @@
2398-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2399+import module namespace ft = "http://zorba.io/modules/full-text";
2400
2401 ft:is-thesaurus-lang-supported( xs:language("en") )
2402
2403=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq'
2404--- test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq 2012-02-22 16:26:17 +0000
2405+++ test/rbkt/Queries/zorba/fulltext/ft-module-is-thesaurus-lang-supported-true-2.xq 2013-06-27 23:31:27 +0000
2406@@ -1,4 +1,4 @@
2407-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2408+import module namespace ft = "http://zorba.io/modules/full-text";
2409
2410 ft:is-thesaurus-lang-supported( "http://wordnet.princeton.edu",
2411 xs:language("en") )
2412
2413=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq'
2414--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq 2011-09-30 03:55:43 +0000
2415+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-1.xq 2013-06-27 23:31:27 +0000
2416@@ -1,3 +1,3 @@
2417-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2418+import module namespace ft = "http://zorba.io/modules/full-text";
2419
2420 ft:stem( "flavoring", xs:language("en") )
2421
2422=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq'
2423--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq 2011-09-30 03:55:43 +0000
2424+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-2.xq 2013-06-27 23:31:27 +0000
2425@@ -1,3 +1,3 @@
2426-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2427+import module namespace ft = "http://zorba.io/modules/full-text";
2428
2429 ft:stem( "chico", xs:language("es") )
2430
2431=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq'
2432--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq 2012-03-08 04:53:30 +0000
2433+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-3.xq 2013-06-27 23:31:27 +0000
2434@@ -1,4 +1,4 @@
2435-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2436+import module namespace ft = "http://zorba.io/modules/full-text";
2437
2438 declare ft-option using language "en";
2439
2440
2441=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq'
2442--- test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq 2012-03-08 04:53:30 +0000
2443+++ test/rbkt/Queries/zorba/fulltext/ft-module-stem-4.xq 2013-06-27 23:31:27 +0000
2444@@ -1,4 +1,4 @@
2445-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2446+import module namespace ft = "http://zorba.io/modules/full-text";
2447
2448 declare ft-option using language "es";
2449
2450
2451=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq'
2452--- test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq 2011-09-30 03:55:43 +0000
2453+++ test/rbkt/Queries/zorba/fulltext/ft-module-strip-diacritics-1.xq 2013-06-27 23:31:27 +0000
2454@@ -1,3 +1,3 @@
2455-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2456+import module namespace ft = "http://zorba.io/modules/full-text";
2457
2458 ft:strip-diacritics( "é" )
2459
2460=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq'
2461--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq 2012-03-08 18:46:22 +0000
2462+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-1.xq 2013-06-27 23:31:27 +0000
2463@@ -1,4 +1,4 @@
2464-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2465+import module namespace ft = "http://zorba.io/modules/full-text";
2466
2467 declare ft-option using language "en";
2468
2469
2470=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq'
2471--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq 2012-03-08 18:46:22 +0000
2472+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-2.xq 2013-06-27 23:31:27 +0000
2473@@ -1,4 +1,4 @@
2474-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2475+import module namespace ft = "http://zorba.io/modules/full-text";
2476
2477 let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu",
2478 "marmite",
2479
2480=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq'
2481--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq 2012-03-08 18:46:22 +0000
2482+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-3.xq 2013-06-27 23:31:27 +0000
2483@@ -1,4 +1,4 @@
2484-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2485+import module namespace ft = "http://zorba.io/modules/full-text";
2486
2487 declare ft-option using language "en";
2488
2489
2490=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq'
2491--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq 2012-03-08 18:46:22 +0000
2492+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-4.xq 2013-06-27 23:31:27 +0000
2493@@ -1,4 +1,4 @@
2494-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2495+import module namespace ft = "http://zorba.io/modules/full-text";
2496
2497 let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu",
2498 "breakfast",
2499
2500=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq'
2501--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq 2012-03-08 18:46:22 +0000
2502+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-5.xq 2013-06-27 23:31:27 +0000
2503@@ -1,4 +1,4 @@
2504-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2505+import module namespace ft = "http://zorba.io/modules/full-text";
2506
2507 let $synonyms := ft:thesaurus-lookup( "http://wordnet.princeton.edu",
2508 "breakfast",
2509
2510=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq'
2511--- test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq 2013-02-07 17:24:36 +0000
2512+++ test/rbkt/Queries/zorba/fulltext/ft-module-thesaurus-lookup-6.xq 2013-06-27 23:31:27 +0000
2513@@ -1,4 +1,4 @@
2514-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2515+import module namespace ft = "http://zorba.io/modules/full-text";
2516
2517 declare ft-option using language "en";
2518
2519
2520=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq'
2521--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq 2013-02-07 17:24:36 +0000
2522+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-1.xq 2013-06-27 23:31:27 +0000
2523@@ -1,19 +1,20 @@
2524-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2525-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2526+jsoniq version "1.0";
2527+
2528+import module namespace ft = "http://zorba.io/modules/full-text";
2529
2530 let $doc := <msg>hello, world</msg>
2531 let $tokens := ft:tokenize-node( $doc, xs:language("en") )
2532-let $t1 := validate { $tokens[1] }
2533-let $t2 := validate { $tokens[2] }
2534-
2535-return $t1/@value = "hello"
2536- and $t1/@lang = "en"
2537- and $t1/@paragraph = 1
2538- and $t1/@sentence = 1
2539-
2540- and $t2/@value = "world"
2541- and $t2/@lang = "en"
2542- and $t2/@paragraph = 1
2543- and $t2/@sentence = 1
2544+let $t1 := $tokens[1]
2545+let $t2 := $tokens[2]
2546+
2547+return $t1.value eq "hello"
2548+ and $t1.lang eq "en"
2549+ and $t1.paragraph eq 1
2550+ and $t1.sentence eq 1
2551+
2552+ and $t2.value eq "world"
2553+ and $t2.lang eq "en"
2554+ and $t2.paragraph eq 1
2555+ and $t2.sentence eq 1
2556
2557 (: vim:set et sw=2 ts=2: :)
2558
2559=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq'
2560--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq 2013-02-07 17:24:36 +0000
2561+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-2.xq 2013-06-27 23:31:27 +0000
2562@@ -1,19 +1,20 @@
2563-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2564-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2565+jsoniq version "1.0";
2566+
2567+import module namespace ft = "http://zorba.io/modules/full-text";
2568
2569 let $doc := <msg xml:lang="es">hola, mundo</msg>
2570 let $tokens := ft:tokenize-node( $doc )
2571-let $t1 := validate { $tokens[1] }
2572-let $t2 := validate { $tokens[2] }
2573-
2574-return $t1/@value = "hola"
2575- and $t1/@lang = "es"
2576- and $t1/@paragraph = 1
2577- and $t1/@sentence = 1
2578-
2579- and $t2/@value = "mundo"
2580- and $t2/@lang = "es"
2581- and $t2/@paragraph = 1
2582- and $t2/@sentence = 1
2583+let $t1 := $tokens[1]
2584+let $t2 := $tokens[2]
2585+
2586+return $t1.value eq "hola"
2587+ and $t1.lang eq "es"
2588+ and $t1.paragraph eq 1
2589+ and $t1.sentence eq 1
2590+
2591+ and $t2.value eq "mundo"
2592+ and $t2.lang eq "es"
2593+ and $t2.paragraph eq 1
2594+ and $t2.sentence eq 1
2595
2596 (: vim:set et sw=2 ts=2: :)
2597
2598=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq'
2599--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq 2013-02-07 17:24:36 +0000
2600+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-3.xq 2013-06-27 23:31:27 +0000
2601@@ -1,11 +1,11 @@
2602-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2603+jsoniq version "1.0";
2604+
2605+import module namespace ft = "http://zorba.io/modules/full-text";
2606 import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";
2607
2608-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2609-
2610 let $x := <p xml:lang="en">Houston, we have a <em>problem</em>!</p>
2611 let $tokens := ft:tokenize-node( $x )
2612-let $node-ref := (validate { $tokens[5] })/@node-ref
2613+let $node-ref := $tokens[5].node-ref
2614 let $node := ref:node-by-reference( $node-ref )
2615 return $node instance of text()
2616
2617
2618=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq'
2619--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq 2013-02-07 17:24:36 +0000
2620+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-node-4.xq 2013-06-27 23:31:27 +0000
2621@@ -1,11 +1,11 @@
2622-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2623+jsoniq version "1.0";
2624+
2625+import module namespace ft = "http://zorba.io/modules/full-text";
2626 import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";
2627
2628-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2629-
2630 let $x := <msg xml:lang="en" content="Houston, we have a problem!"/>
2631 let $tokens := ft:tokenize-node( $x/@content )
2632-let $node-ref := (validate { $tokens[5] }) /@node-ref
2633+let $node-ref := $tokens[5].node-ref
2634 let $node := ref:node-by-reference( $node-ref )
2635 return $node instance of attribute(content)
2636
2637
2638=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq'
2639--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq 2012-06-28 23:18:23 +0000
2640+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-1.xq 2013-06-27 23:31:27 +0000
2641@@ -1,5 +1,6 @@
2642-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2643-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2644+jsoniq version "1.0";
2645+
2646+import module namespace ft = "http://zorba.io/modules/full-text";
2647
2648 let $book :=
2649 <book>
2650@@ -29,14 +30,14 @@
2651
2652 let $tokens := ft:tokenize-nodes( $includes, $excludes, xs:language("en") )
2653
2654-let $t1 := validate { $tokens[1] }
2655-let $t2 := validate { $tokens[2] }
2656-let $t3 := validate { $tokens[3] }
2657-let $t4 := validate { $tokens[4] }
2658+let $t1 := $tokens[1]
2659+let $t2 := $tokens[2]
2660+let $t3 := $tokens[3]
2661+let $t4 := $tokens[4]
2662
2663-return $t1/@value = "Notes"
2664- and $t2/@value = "to"
2665- and $t3/@value = "the"
2666- and $t4/@value = "Reader"
2667+return $t1.value eq "Notes"
2668+ and $t2.value eq "to"
2669+ and $t3.value eq "the"
2670+ and $t4.value eq "Reader"
2671
2672 (: vim:set et sw=2 ts=2: :)
2673
2674=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq'
2675--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq 2012-07-05 21:46:37 +0000
2676+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-nodes-2.xq 2013-06-27 23:31:27 +0000
2677@@ -1,5 +1,6 @@
2678-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2679-import schema namespace fts = "http://www.zorba-xquery.com/modules/full-text";
2680+jsoniq version "1.0";
2681+
2682+import module namespace ft = "http://zorba.io/modules/full-text";
2683
2684 let $x :=
2685 <quotes>
2686@@ -16,18 +17,18 @@
2687
2688 let $tokens := ft:tokenize-nodes( $includes, $excludes )
2689
2690-let $t1 := validate { $tokens[1] }
2691-let $t2 := validate { $tokens[2] }
2692-let $t3 := validate { $tokens[3] }
2693-
2694-let $t10 := validate { $tokens[10] }
2695-let $t11 := validate { $tokens[11] }
2696-
2697-return $t1/@value = "I" and $t1/@lang = "en"
2698- and $t2/@value = "love" and $t2/@lang = "en"
2699- and $t3/@value = "you" and $t2/@lang = "en"
2700-
2701- and $t10/@value = "Je" and $t10/@lang = "fr"
2702- and $t11/@value = "t'aime" and $t11/@lang = "fr"
2703+let $t1 := $tokens[1]
2704+let $t2 := $tokens[2]
2705+let $t3 := $tokens[3]
2706+
2707+let $t10 := $tokens[10]
2708+let $t11 := $tokens[11]
2709+
2710+return $t1.value eq "I" and $t1.lang eq "en"
2711+ and $t2.value eq "love" and $t2.lang eq "en"
2712+ and $t3.value eq "you" and $t2.lang eq "en"
2713+
2714+ and $t10.value eq "Je" and $t10.lang eq "fr"
2715+ and $t11.value eq "t'aime" and $t11.lang eq "fr"
2716
2717 (: vim:set et sw=2 ts=2: :)
2718
2719=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq'
2720--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq 2012-03-07 01:58:57 +0000
2721+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-1.xq 2013-06-27 23:31:27 +0000
2722@@ -1,4 +1,4 @@
2723-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2724+import module namespace ft = "http://zorba.io/modules/full-text";
2725
2726 let $x := "hello, world"
2727 let $tokens := ft:tokenize-string( $x, xs:language("en") )
2728
2729=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq'
2730--- test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq 2012-03-08 18:46:22 +0000
2731+++ test/rbkt/Queries/zorba/fulltext/ft-module-tokenize-string-2.xq 2013-06-27 23:31:27 +0000
2732@@ -1,4 +1,4 @@
2733-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2734+import module namespace ft = "http://zorba.io/modules/full-text";
2735
2736 declare ft-option using language "en";
2737
2738
2739=== modified file 'test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq'
2740--- test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq 2012-02-22 16:26:17 +0000
2741+++ test/rbkt/Queries/zorba/fulltext/ft-thesaurus-FOCA0003-1.xq 2013-06-27 23:31:27 +0000
2742@@ -1,4 +1,4 @@
2743-import module namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2744+import module namespace ft = "http://zorba.io/modules/full-text";
2745
2746 (: Invalid at least/most range. :)
2747 ft:thesaurus-lookup( "http://wordnet.princeton.edu",
2748
2749=== removed file 'test/rbkt/Queries/zorba/no-copy/test3.xq'
2750--- test/rbkt/Queries/zorba/no-copy/test3.xq 2012-09-30 09:46:56 +0000
2751+++ test/rbkt/Queries/zorba/no-copy/test3.xq 1970-01-01 00:00:00 +0000
2752@@ -1,12 +0,0 @@
2753-declare construction strip;
2754-
2755-import schema namespace ft = "http://www.zorba-xquery.com/modules/full-text";
2756-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
2757-
2758-let $x := validate {<ft:compare-options
2759- case="case sensitive"
2760- diacritics="diacritics sensitive"
2761- stemming="stemming"/>}
2762-let $y:= (<a> { $x } </a>)/*
2763-return
2764- schema:schema-type($y/@case)

Subscribers

People subscribed via source and target branches