Merge pull request #2392 from tuurma/develop-5.0.0

(5.0.0) Fix lucene term range queries

Author: adamretter

extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneUtil.java

@@ -146,6 +146,8 @@ public static void extractTerms(final Query query, final Map<Object, Query> term
             extractTermsFromPrefix((PrefixQuery) query, terms, reader, includeFields);
         } else if (query instanceof PhraseQuery) {
             extractTermsFromPhrase((PhraseQuery) query, terms, includeFields);
+        } else if (query instanceof TermRangeQuery) {
+            extractTermsFromTermRange((TermRangeQuery) query, terms, reader, includeFields);
         } else {
             // fallback to Lucene's Query.extractTerms if none of the
             // above matches
@@ -203,6 +205,10 @@ private static void extractTermsFromPhrase(final PhraseQuery query, final Map<Ob
         }
     }
 
+    private static void extractTermsFromTermRange(final TermRangeQuery query, final Map<Object, Query> terms, final IndexReader reader, boolean includeFields) throws IOException {
+        TERM_EXTRACTOR.extractTerms(query, terms, reader, includeFields);
+    }
+
     private static Query rewrite(final MultiTermQuery query, final IndexReader reader) throws IOException {
         query.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
         return query.rewrite(reader);

extensions/indexes/lucene/test/src/xquery/lucene/plain-ft-functions.xml

@@ -146,4 +146,11 @@
         ]]></code>
         <expected>another foobar title</expected>
     </test>
+    <test output="text" >
+        <task>Test Index 7 - search term range (resulted in UnsupportedOperationException)</task>
+        <code><![CDATA[
+        count( ft:search("/db/binary/", "para:[even TO foobaar]")//@uri  )
+        ]]></code>
+        <expected>3</expected>
+    </test>
 </TestSet>

extensions/indexes/lucene/test/src/xquery/lucene/queries.xml

@@ -74,7 +74,16 @@
         <remove-collection collection="/db/lucene"/>
         <remove-document collection="/db/system/config/db/lucene" name="collection.xconf"/>
     </tearDown>
-	<!-- Following axis tests -->
+	<test output="xml">
+		<task>Term range query</task>
+		<code>
+			declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+			doc("/db/lucene/text1.xml")//p[ft:query(., 'eins TO zwei')]</code>
+		<expected>
+			<p>Eins zwei drei vier zwei fünf sechs.</p>
+		</expected>
+	</test>
 	<test output="xml">
 		<task>Case sensitivity</task>
 		<code> for $hit in doc("/db/lucene/text1.xml")//p[ft:query(., 'Eins')] return $hit </code>