You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2025/06/22 20:13:48 UTC
(lucene) branch main updated: style: fix indents inconsistent with editorconfig and validate in CI (#14832)
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new 95d019bd881 style: fix indents inconsistent with editorconfig and validate in CI (#14832)
95d019bd881 is described below
commit 95d019bd881a7a1908a16d3da1eaeb2ab71bafba
Author: Robert Muir <rm...@apache.org>
AuthorDate: Sun Jun 22 16:13:42 2025 -0400
style: fix indents inconsistent with editorconfig and validate in CI (#14832)
editorconfig indents were set across the board for all files, but
nothing was done with existing files. For example, yaml was set to have
a 2-space indent, yet it is the wild-west out there: 1-space indents,
3-space indents, you name it.
* Validate any indent settings specified in editorconfig
* Fix all existing violations (html, xml, etc were especially painful)
* Disable indent settings where it isn't appropriate or reasonable (e.g.
.txt files)
---
.editorconfig | 60 ++-
.github/actions/eclint/action.yml | 46 +-
.github/actions/prepare-for-build/action.yml | 20 +-
CONTRIBUTING.md | 2 +-
README.md | 2 +-
dev-docs/file-formats.md | 20 +-
dev-docs/github-issues-howto.md | 20 +-
dev-tools/aws-jmh/Makefile | 6 +-
dev-tools/aws-jmh/README.md | 2 +-
dev-tools/doap/lucene.rdf | 515 ++++++++++-----------
dev-tools/scripts/README.md | 2 +-
dev-tools/scripts/buildAndPushRelease.py | 8 +-
dev-tools/scripts/reproduceJenkinsFailures.py | 18 +-
gradle/regenerate/snowball/snowball.sh | 16 +-
gradle/validation/owasp/exclusions.xml | 53 +--
lucene/JRE_VERSION_MIGRATION.md | 14 +-
lucene/MIGRATE.md | 22 +-
lucene/SYSTEM_REQUIREMENTS.md | 2 +-
.../org/apache/lucene/analysis/tests/da_UTF8.xml | 2 +-
.../checksums/generateUAX29URLEmailTokenizer.json | 2 +-
.../analysis/email/UAX29URLEmailTokenizerImpl.java | 2 +-
.../org/apache/lucene/analysis/en/KStemmer.java | 33 +-
.../apache/lucene/analysis/en/PorterStemmer.java | 171 +++----
.../lucene/analysis/synonym/SynonymFilter.java | 16 +-
lucene/analysis/common/src/java/overview.html | 24 +-
.../analysis/compound/hyphenation/hyphenation.dtd | 65 +--
.../apache/lucene/analysis/compound/da_UTF8.xml | 2 +-
.../analysis/compound/hyphenation-LUCENE-8124.xml | 2 +-
.../analysis/compound/hyphenation-LUCENE-8183.xml | 2 +-
.../lucene/analysis/compound/hyphenation.dtd | 65 +--
.../analysis/core/TestFlattenGraphFilter.java | 32 +-
.../analysis/email/LuceneResourcesWikiPage.html | 38 +-
lucene/analysis/icu/src/java/overview.html | 75 ++-
lucene/analysis/kuromoji/src/java/overview.html | 34 +-
.../lucene/analysis/ja/TestJapaneseTokenizer.java | 127 +++--
lucene/analysis/morfologik/src/java/overview.html | 24 +-
lucene/analysis/nori/src/java/overview.html | 24 +-
lucene/analysis/opennlp/src/java/overview.html | 24 +-
lucene/analysis/phonetic/src/java/overview.html | 24 +-
lucene/analysis/smartcn/src/java/overview.html | 24 +-
.../stempel/src/java/org/egothor/stemmer/Cell.java | 106 ++---
.../src/java/org/egothor/stemmer/Compile.java | 106 ++---
.../stempel/src/java/org/egothor/stemmer/Diff.java | 106 ++---
.../src/java/org/egothor/stemmer/DiffIt.java | 106 ++---
.../src/java/org/egothor/stemmer/Gener.java | 106 ++---
.../stempel/src/java/org/egothor/stemmer/Lift.java | 106 ++---
.../src/java/org/egothor/stemmer/MultiTrie.java | 106 ++---
.../src/java/org/egothor/stemmer/MultiTrie2.java | 106 ++---
.../src/java/org/egothor/stemmer/Optimizer.java | 106 ++---
.../src/java/org/egothor/stemmer/Optimizer2.java | 106 ++---
.../src/java/org/egothor/stemmer/Reduce.java | 106 ++---
.../stempel/src/java/org/egothor/stemmer/Row.java | 106 ++---
.../stempel/src/java/org/egothor/stemmer/Trie.java | 106 ++---
lucene/analysis/stempel/src/java/overview.html | 48 +-
lucene/backward-codecs/README.md | 2 +-
.../lucene40/blocktree/FieldReader.java | 16 +-
.../lucene90/blocktree/FieldReader.java | 16 +-
lucene/backward-codecs/src/java/overview.html | 24 +-
lucene/benchmark/src/java/overview.html | 24 +-
lucene/classification/src/java/overview.html | 24 +-
.../lucene/codecs/memory/DirectPostingsFormat.java | 14 +-
lucene/codecs/src/java/overview.html | 26 +-
lucene/core.tests/src/java/overview.html | 24 +-
lucene/core/src/generated/jdk/README.md | 2 +-
.../search/comparators/TermOrdValComparator.java | 38 +-
.../apache/lucene/util/hnsw/HnswGraphBuilder.java | 34 +-
.../java/org/apache/lucene/util/hnsw/HnswUtil.java | 14 +-
lucene/core/src/java/overview.html | 37 +-
.../org/apache/lucene/index/TestMultiFields.java | 26 +-
.../lucene/index/TestTransactionRollback.java | 16 +-
.../lucene/search/TestElevationComparator.java | 20 +-
.../apache/lucene/util/packed/TestPackedInts.java | 10 +-
lucene/demo/src/java/overview.html | 64 +--
lucene/distribution/binary-release.gradle | 2 +-
lucene/distribution/src/binary-release/README.md | 16 +-
.../documentation/src/markdown/index.template.md | 24 +-
lucene/expressions/src/java/overview.html | 24 +-
lucene/facet/docs/FacetSets.adoc | 20 +-
lucene/facet/src/java/overview.html | 24 +-
lucene/grouping/src/java/overview.html | 24 +-
lucene/highlighter/src/java/overview.html | 24 +-
lucene/join/src/java/overview.html | 24 +-
lucene/luke/README.md | 2 +-
lucene/luke/src/distribution/README.md | 2 +-
lucene/memory/src/java/overview.html | 24 +-
lucene/misc/src/java/overview.html | 28 +-
lucene/monitor/src/java/overview.html | 24 +-
.../queries/payloads/TestPayloadCheckQuery.java | 4 +-
.../docs/xml/LuceneContribQuery.dtd.html | 409 ++++++++--------
.../queryparser/docs/xml/LuceneCoreQuery.dtd.html | 263 ++++++-----
lucene/queryparser/docs/xml/index.html | 6 +-
.../surround/query/SpanNearClauseFactory.java | 70 +--
.../lucene/queryparser/xml/LuceneContribQuery.dtd | 235 +++++-----
.../lucene/queryparser/xml/LuceneCoreQuery.dtd | 387 ++++++++--------
.../apache/lucene/queryparser/xml/BooleanQuery.xml | 24 +-
.../lucene/queryparser/xml/BoostingQuery.xml | 24 +-
.../lucene/queryparser/xml/BoostingTermQuery.xml | 24 +-
.../lucene/queryparser/xml/ConstantScoreQuery.xml | 24 +-
.../lucene/queryparser/xml/DOCTYPE_TermQuery.xml | 24 +-
.../lucene/queryparser/xml/DisjunctionMaxQuery.xml | 24 +-
.../lucene/queryparser/xml/ENTITY_TermQuery.xml | 24 +-
.../lucene/queryparser/xml/FuzzyLikeThisQuery.xml | 24 +-
.../lucene/queryparser/xml/LikeThisQuery.xml | 24 +-
.../lucene/queryparser/xml/MatchAllDocsQuery.xml | 24 +-
.../lucene/queryparser/xml/NestedBooleanQuery.xml | 25 +-
.../lucene/queryparser/xml/PointRangeQuery.xml | 24 +-
.../xml/PointRangeQueryWithoutLowerTerm.xml | 24 +-
.../xml/PointRangeQueryWithoutRange.xml | 24 +-
.../xml/PointRangeQueryWithoutUpperTerm.xml | 24 +-
.../apache/lucene/queryparser/xml/RangeQuery.xml | 24 +-
.../queryparser/xml/SpanNearQueryWithoutSlop.xml | 24 +-
.../queryparser/xml/SpanPositionRangeQuery.xml | 24 +-
.../apache/lucene/queryparser/xml/SpanQuery.xml | 24 +-
.../apache/lucene/queryparser/xml/TermQuery.xml | 24 +-
.../lucene/queryparser/xml/TermQueryEmpty.xml | 24 +-
.../apache/lucene/queryparser/xml/TermsQuery.xml | 42 +-
.../lucene/queryparser/xml/UserInputQuery.xml | 24 +-
.../queryparser/xml/UserInputQueryCustomField.xml | 24 +-
lucene/replicator/src/java/overview.html | 24 +-
.../prefix/RecursivePrefixTreeStrategy.java | 15 +-
.../spatial/prefix/tree/DateRangePrefixTree.java | 31 +-
lucene/spatial-extras/src/java/overview.html | 24 +-
.../TestGeo3dShapeWGS84ModelRectRelation.java | 24 +-
.../spatial-test-fixtures/src/java/overview.html | 24 +-
lucene/spatial3d/src/java/overview.html | 24 +-
.../lucene/spatial3d/geom/TestGeoPolygon.java | 460 +++++++++---------
lucene/suggest/src/java/overview.html | 24 +-
.../org/apache/lucene/tests/index/RandomCodec.java | 30 +-
lucene/test-framework/src/java/overview.html | 26 +-
129 files changed, 3221 insertions(+), 3213 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index a1eeb5803eb..7a504414f4e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,6 @@ charset = utf-8
# matches spotless.gradle insistence on this
end_of_line = lf
indent_size = 2
-eclint_indent_size = unset
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
@@ -21,11 +20,19 @@ ij_smart_tabs = false
ij_visual_guides =
ij_wrap_on_typing = false
+[{*.txt,*.patch,*.gnuplot,*.rbbi,*.sbl,*.dic,*.aff,*.alg,*.jj,*.jflex,*.css,*.js,*.pl,*.svg}]
+# indent doesn't make sense for filetype, or not worth the trouble
+indent_size = unset
+
[Makefile]
indent_size = 4
indent_style = tab
[*.java]
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+line_comment = //
ij_java_align_consecutive_assignments = false
ij_java_align_consecutive_variable_declarations = false
ij_java_align_group_field_declarations = false
@@ -345,7 +352,7 @@ ij_asciidoc_blank_lines_keep_after_header = 1
ij_asciidoc_formatting_enabled = true
ij_asciidoc_one_sentence_per_line = true
-[*.xml]
+[{*.xml,*.rdf,*.dtd}]
ij_continuation_indent_size = 2
ij_xml_align_attributes = false
ij_xml_align_text = false
@@ -373,7 +380,26 @@ ij_shell_redirect_followed_by_space = false
ij_shell_switch_cases_indented = false
ij_shell_use_unix_line_separator = true
+# feral untamed python code
+[*.py]
+indent_size = unset
+
+# these python scripts are tamed
+[dev-tools/scripts/*.py]
+indent_size = 2
+
+[*.g4]
+indent_size = 4
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+line_comment = //
+
[{*.gradle,*.groovy}]
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+line_comment = //
ij_groovy_align_group_field_declarations = false
ij_groovy_align_multiline_array_initializer_expression = false
ij_groovy_align_multiline_assignment = false
@@ -612,7 +638,13 @@ ij_markdown_min_lines_between_paragraphs = 1
ij_markdown_wrap_text_if_long = false
ij_markdown_wrap_text_inside_blockquotes = false
+[dev-tools/scripts/README.md]
+# TODO: doesn't adhere
+indent_size = unset
+
[*.properties]
+# indent doesn't make sense for filetype
+indent_size = unset
ij_properties_align_group_field_declarations = false
ij_properties_keep_blank_lines = true
ij_properties_key_value_delimiter = equals
@@ -641,14 +673,32 @@ end_of_line = crlf
[lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/rep.aff]
charset = unset
+# test file that may care about offsets and shouldn't be reindented
+[lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/htmlStripReaderTest.html]
+indent_size = unset
+
# this file has no trailing newline
[versions.lock]
insert_final_newline = unset
-# javacc generated files which have trailing whitespace
+# javacc generated files which have trailing whitespace, inconsistent indent
[{**/*Parser.java,**/*ParserTokenManager.java,**/TokenMgrError.java,**/ParseException.java}]
trim_trailing_whitespace = unset
+indent_size = unset
-# jflex generated files which has trailing whitespace
-[**/HTMLStripCharFilter.java]
+# jflex generated files which has trailing whitespace, inconsistent indent
+[{**/HTMLStripCharFilter.java,**/*TokenizerImpl.java}]
trim_trailing_whitespace = unset
+indent_size = unset
+
+# python generated files which have inconsistent indent
+[**/Lev1ParametricDescription.java]
+indent_size = unset
+
+# snowball vendored fields
+[lucene/analysis/common/src/java/org/tartarus/snowball/*.java]
+indent_size = unset
+
+# literal block scalar with inconsistent indents containing email template
+[dev-tools/scripts/releaseWizard.yaml]
+indent_size = unset
diff --git a/.github/actions/eclint/action.yml b/.github/actions/eclint/action.yml
index a0148f038bf..f205a8c81e5 100644
--- a/.github/actions/eclint/action.yml
+++ b/.github/actions/eclint/action.yml
@@ -8,26 +8,26 @@ inputs:
default: "v0.5.1"
runs:
- using: "composite"
- steps:
- - name: Cache eclint binary
- id: cache-eclint
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
- with:
- path: ~/.local/bin/eclint
- key: eclint-${{ inputs.eclint-version }}-${{ runner.os }}-${{ runner.arch }}
- - name: Setup go
- if: steps.cache-eclint.outputs.cache-hit != 'true'
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
- with:
- go-version: '1.24'
- cache: false
- - name: Install eclint
- if: steps.cache-eclint.outputs.cache-hit != 'true'
- run: GOBIN=${HOME}/.local/bin go install gitlab.com/greut/eclint/cmd/eclint@${ECLINT_VERSION}
- shell: bash
- env:
- ECLINT_VERSION: ${{ inputs.eclint-version }}
- - name: Configure gradle
- run: echo "lucene.tool.eclint=eclint" >> build-options.local.properties
- shell: bash
+ using: "composite"
+ steps:
+ - name: Cache eclint binary
+ id: cache-eclint
+ uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+ with:
+ path: ~/.local/bin/eclint
+ key: eclint-${{ inputs.eclint-version }}-${{ runner.os }}-${{ runner.arch }}
+ - name: Setup go
+ if: steps.cache-eclint.outputs.cache-hit != 'true'
+ uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+ with:
+ go-version: '1.24'
+ cache: false
+ - name: Install eclint
+ if: steps.cache-eclint.outputs.cache-hit != 'true'
+ run: GOBIN=${HOME}/.local/bin go install gitlab.com/greut/eclint/cmd/eclint@${ECLINT_VERSION}
+ shell: bash
+ env:
+ ECLINT_VERSION: ${{ inputs.eclint-version }}
+ - name: Configure gradle
+ run: echo "lucene.tool.eclint=eclint" >> build-options.local.properties
+ shell: bash
diff --git a/.github/actions/prepare-for-build/action.yml b/.github/actions/prepare-for-build/action.yml
index 913be29d092..68c92bdcb50 100644
--- a/.github/actions/prepare-for-build/action.yml
+++ b/.github/actions/prepare-for-build/action.yml
@@ -5,19 +5,19 @@ name: Prepare Lucene build
description: Creates a shared setup for other workflows
inputs:
- java-version:
- required: false
- default: "24"
- description: "The default JDK version to set up."
+ java-version:
+ required: false
+ default: "24"
+ description: "The default JDK version to set up."
- java-distribution:
- required: false
- default: "temurin"
- description: "The default JDK distribution type"
+ java-distribution:
+ required: false
+ default: "temurin"
+ description: "The default JDK distribution type"
runs:
- using: "composite"
- steps:
+ using: "composite"
+ steps:
- name: Set up Java (${{ inputs.java-distribution }}, ${{ inputs.java-version }})"
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7b6e0d3d6ac..d6a619f9031 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Contributing to Lucene Guide
diff --git a/README.md b/README.md
index c6af8be29b6..fdaac716060 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Apache Lucene
diff --git a/dev-docs/file-formats.md b/dev-docs/file-formats.md
index 6f23adcc39f..5b138414884 100644
--- a/dev-docs/file-formats.md
+++ b/dev-docs/file-formats.md
@@ -7,7 +7,7 @@ to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
@@ -36,18 +36,18 @@ on their own.
## How to split the data into files?
Most file formats split the data into 3 files:
- - metadata,
- - index data,
- - raw data.
+- metadata,
+- index data,
+- raw data.
The metadata file contains all the data that is read once at open time. This
helps on several fronts:
- - One can validate the checksums of this data at open time without significant
- overhead since all data needs to be read anyway, this helps detect
- corruptions early.
- - No need to perform expensive seeks into the index/raw data files at open
- time, one can create slices into these files from offsets that have been
- written into the metadata file.
+- One can validate the checksums of this data at open time without significant
+overhead since all data needs to be read anyway, this helps detect
+corruptions early.
+- No need to perform expensive seeks into the index/raw data files at open
+time, one can create slices into these files from offsets that have been
+written into the metadata file.
The index file contains data-structures that help search the raw data. For KD
trees, this would be the inner nodes, for doc values this would be jump tables,
diff --git a/dev-docs/github-issues-howto.md b/dev-docs/github-issues-howto.md
index 1f917d62434..49a6aaa9abd 100644
--- a/dev-docs/github-issues-howto.md
+++ b/dev-docs/github-issues-howto.md
@@ -7,7 +7,7 @@ to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
@@ -42,18 +42,18 @@ The Milestone associated with an Issue/PR should be the same version in [CHANGES
There are a few pre-defined label families to organize/search issues.
- `type` (color code `#ffbb00`) : issue type
- - `type:bug` is attached to bug reports
- - `type:enhancement` is attached to enhancement requests or suggestions
- - `type:test` is attached to test improvements or failure reports
- - `type:task` is attached to general tasks
- - `type:documentation` is attached to tasks relate to documentation
+ - `type:bug` is attached to bug reports
+ - `type:enhancement` is attached to enhancement requests or suggestions
+ - `type:test` is attached to test improvements or failure reports
+ - `type:task` is attached to general tasks
+ - `type:documentation` is attached to tasks relate to documentation
- `affects-version` (color code `#f19072`) : the versions in which a bug was found
- - this may be used with `type:bug`
- - (example) `affects-version:9.1.0`
+ - this may be used with `type:bug`
+ - (example) `affects-version:9.1.0`
- `module` (color code `#a0d8ef`) : Lucene module
- - (example) `module:core/index`, `module:analysis`
+ - (example) `module:core/index`, `module:analysis`
- `tool` (color code `#a0d8ef`) : tooling
- - (example) `tool:build`, `tool:release-wizard`
+ - (example) `tool:build`, `tool:release-wizard`
A `type` label is automatically attached to an issue by the issue template that the reporter selected. Other labels such as `affects-version` may be manually added by committers.
diff --git a/dev-tools/aws-jmh/Makefile b/dev-tools/aws-jmh/Makefile
index e1e761b9357..0a432981b0e 100644
--- a/dev-tools/aws-jmh/Makefile
+++ b/dev-tools/aws-jmh/Makefile
@@ -17,15 +17,15 @@ export ANSIBLE_HOST_KEY_CHECKING=false
export ANSIBLE_FORKS=10
ifeq ($(AWS_ACCESS_KEY_ID),)
- $(error AWS_ACCESS_KEY_ID is not set)
+$(error AWS_ACCESS_KEY_ID is not set)
endif
ifeq ($(AWS_SECRET_ACCESS_KEY),)
- $(error AWS_SECRET_ACCESS_KEY is not set)
+$(error AWS_SECRET_ACCESS_KEY is not set)
endif
ifeq ($(PATCH_BRANCH),)
- $(error PATCH_BRANCH is not set)
+$(error PATCH_BRANCH is not set)
endif
# runs benchmark across AWS instances
diff --git a/dev-tools/aws-jmh/README.md b/dev-tools/aws-jmh/README.md
index 398a3fbdaa5..2d384f047d5 100644
--- a/dev-tools/aws-jmh/README.md
+++ b/dev-tools/aws-jmh/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
Runs lucene microbenchmarks across a variety of CPUs in EC2.
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 958464805ce..964610bb54d 100644
--- a/dev-tools/doap/lucene.rdf
+++ b/dev-tools/doap/lucene.rdf
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:asfext="http://projects.apache.org/ns/asfext#"
- xmlns:foaf="http://xmlns.com/foaf/0.1/">
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:asfext="http://projects.apache.org/ns/asfext#"
+ xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
This file's canonical URL is: https://lucene.apache.org/core/doap.rdf
@@ -68,343 +68,342 @@
<!-- NOTE: please insert releases in numeric order, NOT chronologically. -->
<release>
- <Version>
- <name>lucene-10.2.2</name>
- <created>2025-06-20</created>
- <revision>10.2.2</revision>
- </Version>
+ <Version>
+ <name>lucene-10.2.2</name>
+ <created>2025-06-20</created>
+ <revision>10.2.2</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-10.2.1</name>
- <created>2025-05-01</created>
- <revision>10.2.1</revision>
- </Version>
+ <Version>
+ <name>lucene-10.2.1</name>
+ <created>2025-05-01</created>
+ <revision>10.2.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-10.2.0</name>
- <created>2025-04-10</created>
- <revision>10.2.0</revision>
- </Version>
+ <Version>
+ <name>lucene-10.2.0</name>
+ <created>2025-04-10</created>
+ <revision>10.2.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-10.1.0</name>
- <created>2024-12-20</created>
- <revision>10.1.0</revision>
- </Version>
+ <Version>
+ <name>lucene-10.1.0</name>
+ <created>2024-12-20</created>
+ <revision>10.1.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-10.0.0</name>
- <created>2024-10-14</created>
- <revision>10.0.0</revision>
- </Version>
+ <Version>
+ <name>lucene-10.0.0</name>
+ <created>2024-10-14</created>
+ <revision>10.0.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.12.2</name>
- <created>2025-06-20</created>
- <revision>9.12.2</revision>
- </Version>
+ <Version>
+ <name>lucene-9.12.2</name>
+ <created>2025-06-20</created>
+ <revision>9.12.2</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.12.1</name>
- <created>2024-12-13</created>
- <revision>9.12.1</revision>
- </Version>
+ <Version>
+ <name>lucene-9.12.1</name>
+ <created>2024-12-13</created>
+ <revision>9.12.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.12.0</name>
- <created>2024-09-28</created>
- <revision>9.12.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.12.0</name>
+ <created>2024-09-28</created>
+ <revision>9.12.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.11.1</name>
- <created>2024-06-27</created>
- <revision>9.11.1</revision>
- </Version>
+ <Version>
+ <name>lucene-9.11.1</name>
+ <created>2024-06-27</created>
+ <revision>9.11.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.11.0</name>
- <created>2024-06-06</created>
- <revision>9.11.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.11.0</name>
+ <created>2024-06-06</created>
+ <revision>9.11.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.10.0</name>
- <created>2024-02-20</created>
- <revision>9.10.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.10.0</name>
+ <created>2024-02-20</created>
+ <revision>9.10.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.9.2</name>
- <created>2024-01-29</created>
- <revision>9.9.2</revision>
- </Version>
+ <Version>
+ <name>lucene-9.9.2</name>
+ <created>2024-01-29</created>
+ <revision>9.9.2</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.9.1</name>
- <created>2023-12-16</created>
- <revision>9.9.1</revision>
- </Version>
+ <Version>
+ <name>lucene-9.9.1</name>
+ <created>2023-12-16</created>
+ <revision>9.9.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.9.0</name>
- <created>2023-12-04</created>
- <revision>9.9.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.9.0</name>
+ <created>2023-12-04</created>
+ <revision>9.9.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.8.0</name>
- <created>2023-09-28</created>
- <revision>9.8.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.8.0</name>
+ <created>2023-09-28</created>
+ <revision>9.8.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.7.0</name>
- <created>2023-06-25</created>
- <revision>9.7.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.7.0</name>
+ <created>2023-06-25</created>
+ <revision>9.7.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.6.0</name>
- <created>2023-05-09</created>
- <revision>9.6.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.6.0</name>
+ <created>2023-05-09</created>
+ <revision>9.6.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.5.0</name>
- <created>2023-01-30</created>
- <revision>9.5.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.5.0</name>
+ <created>2023-01-30</created>
+ <revision>9.5.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.4.2</name>
- <created>2022-11-21</created>
- <revision>9.4.2</revision>
- </Version>
+ <Version>
+ <name>lucene-9.4.2</name>
+ <created>2022-11-21</created>
+ <revision>9.4.2</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.4.1</name>
- <created>2022-10-24</created>
- <revision>9.4.1</revision>
- </Version>
+ <Version>
+ <name>lucene-9.4.1</name>
+ <created>2022-10-24</created>
+ <revision>9.4.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.4.0</name>
- <created>2022-09-30</created>
- <revision>9.4.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.4.0</name>
+ <created>2022-09-30</created>
+ <revision>9.4.0</revision>
+ </Version>
</release>
- <release>
- <Version>
- <name>lucene-9.3.0</name>
- <created>2022-07-29</created>
- <revision>9.3.0</revision>
- </Version>
+ <release>
+ <Version>
+ <name>lucene-9.3.0</name>
+ <created>2022-07-29</created>
+ <revision>9.3.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.2.0</name>
- <created>2022-05-23</created>
- <revision>9.2.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.2.0</name>
+ <created>2022-05-23</created>
+ <revision>9.2.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.1.0</name>
- <created>2022-03-22</created>
- <revision>9.1.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.1.0</name>
+ <created>2022-03-22</created>
+ <revision>9.1.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-9.0.0</name>
- <created>2021-12-07</created>
- <revision>9.0.0</revision>
- </Version>
+ <Version>
+ <name>lucene-9.0.0</name>
+ <created>2021-12-07</created>
+ <revision>9.0.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.11.4</name>
- <created>2024-09-24</created>
- <revision>8.11.4</revision>
- </Version>
+ <Version>
+ <name>lucene-8.11.4</name>
+ <created>2024-09-24</created>
+ <revision>8.11.4</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.11.3</name>
- <created>2024-02-08</created>
- <revision>8.11.3</revision>
- </Version>
+ <Version>
+ <name>lucene-8.11.3</name>
+ <created>2024-02-08</created>
+ <revision>8.11.3</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.11.2</name>
- <created>2022-06-17</created>
- <revision>8.11.2</revision>
- </Version>
+ <Version>
+ <name>lucene-8.11.2</name>
+ <created>2022-06-17</created>
+ <revision>8.11.2</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.11.1</name>
+ <created>2021-12-16</created>
+ <revision>8.11.1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.11.0</name>
+ <created>2021-11-16</created>
+ <revision>8.11.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.11.1</name>
- <created>2021-12-16</created>
- <revision>8.11.1</revision>
- </Version>
+ <Version>
+ <name>lucene-8.10.1</name>
+ <created>2021-10-18</created>
+ <revision>8.10.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.11.0</name>
- <created>2021-11-16</created>
- <revision>8.11.0</revision>
- </Version>
+ <Version>
+ <name>lucene-8.10.0</name>
+ <created>2021-09-27</created>
+ <revision>8.10.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.10.1</name>
- <created>2021-10-18</created>
- <revision>8.10.1</revision>
- </Version>
+ <Version>
+ <name>lucene-8.9.0</name>
+ <created>2021-06-16</created>
+ <revision>8.9.0</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.10.0</name>
- <created>2021-09-27</created>
- <revision>8.10.0</revision>
- </Version>
+ <Version>
+ <name>lucene-8.8.2</name>
+ <created>2021-04-12</created>
+ <revision>8.8.2</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.9.0</name>
- <created>2021-06-16</created>
- <revision>8.9.0</revision>
- </Version>
+ <Version>
+ <name>lucene-8.8.1</name>
+ <created>2021-02-22</created>
+ <revision>8.8.1</revision>
+ </Version>
</release>
<release>
- <Version>
- <name>lucene-8.8.2</name>
- <created>2021-04-12</created>
- <revision>8.8.2</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.8.1</name>
- <created>2021-02-22</created>
- <revision>8.8.1</revision>
- </Version>
- </release>
+ <Version>
+ <name>lucene-8.8.0</name>
+ <created>2021-02-01</created>
+ <revision>8.8.0</revision>
+ </Version>
+ </release>
<release>
- <Version>
- <name>lucene-8.8.0</name>
- <created>2021-02-01</created>
- <revision>8.8.0</revision>
- </Version>
- </release>
-
+ <Version>
+ <name>lucene-8.7.0</name>
+ <created>2020-11-03</created>
+ <revision>8.7.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.6.3</name>
+ <created>2020-10-07</created>
+ <revision>8.6.3</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.6.2</name>
+ <created>2020-09-01</created>
+ <revision>8.6.2</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.6.1</name>
+ <created>2020-08-13</created>
+ <revision>8.6.1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.6.0</name>
+ <created>2020-07-15</created>
+ <revision>8.6.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.5.2</name>
+ <created>2020-05-26</created>
+ <revision>8.5.2</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>lucene-8.5.1</name>
+ <created>2020-04-16</created>
+ <revision>8.5.1</revision>
+ </Version>
+ </release>
<release>
- <Version>
- <name>lucene-8.7.0</name>
- <created>2020-11-03</created>
- <revision>8.7.0</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.6.3</name>
- <created>2020-10-07</created>
- <revision>8.6.3</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.6.2</name>
- <created>2020-09-01</created>
- <revision>8.6.2</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.6.1</name>
- <created>2020-08-13</created>
- <revision>8.6.1</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.6.0</name>
- <created>2020-07-15</created>
- <revision>8.6.0</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.5.2</name>
- <created>2020-05-26</created>
- <revision>8.5.2</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>lucene-8.5.1</name>
- <created>2020-04-16</created>
- <revision>8.5.1</revision>
- </Version>
- </release>
- <release>
<Version>
<name>lucene-8.5.0</name>
<created>2020-03-24</created>
<revision>8.5.0</revision>
</Version>
</release>
- <release>
+ <release>
<Version>
<name>lucene-8.4.1</name>
<created>2020-01-13</created>
<revision>8.4.1</revision>
</Version>
</release>
- <release>
+ <release>
<Version>
<name>lucene-8.4.0</name>
<created>2019-12-29</created>
<revision>8.4.0</revision>
</Version>
</release>
- <release>
+ <release>
<Version>
<name>lucene-8.3.1</name>
<created>2019-12-03</created>
<revision>8.3.1</revision>
</Version>
</release>
- <release>
+ <release>
<Version>
<name>lucene-8.3.0</name>
<created>2019-11-02</created>
<revision>8.3.0</revision>
</Version>
</release>
- <release>
+ <release>
<Version>
<name>lucene-8.2.0</name>
<created>2019-07-26</created>
diff --git a/dev-tools/scripts/README.md b/dev-tools/scripts/README.md
index 3616ae2a0da..ef40d7f120b 100644
--- a/dev-tools/scripts/README.md
+++ b/dev-tools/scripts/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Developer Scripts
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 24601fb3126..0acdfbbed88 100755
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -267,9 +267,11 @@ def parse_config():
dest="gpg_pass_noprompt",
default=False,
action="store_true",
- help="""Do not prompt for gpg passphrase. For the default gnupg method, this means your gpg-agent
- needs a non-TTY pin-entry program. For gradle signing method, passphrase must be provided
- in gradle.properties or by env.var/sysprop. See ./gradlew helpPublishing for more info""",
+ help="""
+ Do not prompt for gpg passphrase. For the default gnupg method, this means your gpg-agent
+ needs a non-TTY pin-entry program. For gradle signing method, passphrase must be provided
+ in gradle.properties or by env.var/sysprop. See ./gradlew helpPublishing for more info
+ """.strip(),
)
parser.add_argument("--gpg-home", metavar="PATH", help="Path to gpg home containing your secring.gpg Optional, will use $HOME/.gnupg/secring.gpg by default")
parser.add_argument("--rc-num", metavar="NUM", type=int, default=1, help="Release Candidate number. Default: 1")
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index 46cf712c693..46ddbfb1600 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -60,15 +60,15 @@ lastFailureCode = 0
gitCheckoutSucceeded = False
description = dedent("""\
- Must be run from a Lucene/Solr git workspace. Downloads the Jenkins
- log pointed to by the given URL, parses it for Git revision and failed
- Lucene/Solr tests, checks out the Git revision in the local workspace,
- groups the failed tests by module, then runs
- 'ant test -Dtest.dups=%d -Dtests.class="*.test1[|*.test2[...]]" ...'
- in each module of interest, failing at the end if any of the runs fails.
- To control the maximum number of concurrent JVMs used for each module's
- test run, set 'tests.jvms', e.g. in ~/lucene.build.properties
- """)
+ Must be run from a Lucene/Solr git workspace. Downloads the Jenkins
+ log pointed to by the given URL, parses it for Git revision and failed
+ Lucene/Solr tests, checks out the Git revision in the local workspace,
+ groups the failed tests by module, then runs
+ 'ant test -Dtest.dups=%d -Dtests.class="*.test1[|*.test2[...]]" ...'
+ in each module of interest, failing at the end if any of the runs fails.
+ To control the maximum number of concurrent JVMs used for each module's
+ test run, set 'tests.jvms', e.g. in ~/lucene.build.properties
+ """)
defaultIters = 5
diff --git a/gradle/regenerate/snowball/snowball.sh b/gradle/regenerate/snowball/snowball.sh
index 717c3a3875b..329dd1a5cd4 100644
--- a/gradle/regenerate/snowball/snowball.sh
+++ b/gradle/regenerate/snowball/snowball.sh
@@ -57,14 +57,14 @@ rm -f ${WWWDSTDIR}/*_stop.txt
for file in ${WWWSRCDIR}/algorithms/*/stop.txt; do
language=$(basename $(dirname ${file}))
cat > ${WWWDSTDIR}/${language}_stop.txt << EOF
- | From https://snowballstem.org/algorithms/${language}/stop.txt
- | This file is distributed under the BSD License.
- | See https://snowballstem.org/license.html
- | Also see https://opensource.org/licenses/bsd-license.html
- | - Encoding was converted to UTF-8.
- | - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+| From https://snowballstem.org/algorithms/${language}/stop.txt
+| This file is distributed under the BSD License.
+| See https://snowballstem.org/license.html
+| Also see https://opensource.org/licenses/bsd-license.html
+| - Encoding was converted to UTF-8.
+| - This notice was added.
+|
+| NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
EOF
# try to confirm its really UTF-8
iconv -f UTF-8 -t UTF-8 $file >> ${WWWDSTDIR}/${language}_stop.txt
diff --git a/gradle/validation/owasp/exclusions.xml b/gradle/validation/owasp/exclusions.xml
index a1d5ec23a86..38fecd50f22 100644
--- a/gradle/validation/owasp/exclusions.xml
+++ b/gradle/validation/owasp/exclusions.xml
@@ -7,58 +7,59 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
-<!-- See https://jeremylong.github.io/DependencyCheck/general/suppression.html for usage.
- Simply view the HTML report generated in ./build/reports/dependency-check-report.html
- and click the "suppress" button next to the CVE you wish to suppress to copy the xml fragment
- -->
+<!--
+ See https://jeremylong.github.io/DependencyCheck/general/suppression.html for usage.
+ Simply view the HTML report generated in ./build/reports/dependency-check-report.html
+ and click the "suppress" button next to the CVE you wish to suppress to copy the xml fragment
+-->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
- <notes><![CDATA[
- file name: simple-xml-safe-2.7.1.jar
- We use a safe fork that fixes this
- ]]></notes>
+ <notes>
+ file name: simple-xml-safe-2.7.1.jar
+ We use a safe fork that fixes this
+ </notes>
<packageUrl regex="true">^pkg:maven/com\.carrotsearch\.thirdparty/simple\-xml\-safe@.*$</packageUrl>
<cve>CVE-2017-1000190</cve>
</suppress>
<suppress>
- <notes><![CDATA[
- file name: netty-transport-native-epoll-4.1.29.Final.jar
- We only use netty as a client towards Zookeeper
- ]]></notes>
+ <notes>
+ file name: netty-transport-native-epoll-4.1.29.Final.jar
+ We only use netty as a client towards Zookeeper
+ </notes>
<packageUrl regex="true">^pkg:maven/io\.netty/netty\-.*@.*$</packageUrl>
<cpe>cpe:/a:netty:netty</cpe>
</suppress>
<suppress>
- <notes><![CDATA[
- file name: dirgra-0.3.jar
- We will sandbox JRuby
- ]]></notes>
+ <notes>
+ file name: dirgra-0.3.jar
+ We will sandbox JRuby
+ </notes>
<packageUrl regex="true">^pkg:maven/org\.jruby/dirgra@.*$</packageUrl>
<cpe>cpe:/a:jruby:jruby</cpe>
</suppress>
<suppress>
- <notes><![CDATA[
- file name: carrot2-guava-18.0.jar
- Only used with clustering engine, and the risk is DOS attack
- ]]></notes>
+ <notes>
+ file name: carrot2-guava-18.0.jar
+ Only used with clustering engine, and the risk is DOS attack
+ </notes>
<packageUrl regex="true">^pkg:maven/org\.carrot2\.shaded/carrot2\-guava@.*$</packageUrl>
<cpe>cpe:/a:google:guava</cpe>
</suppress>
<suppress>
- <notes><![CDATA[
- file name: carrot2-guava-18.0.jar (shaded: com.google.guava:guava:18.0)
- Only used with clustering engine, and the risk is DOS attack
- ]]></notes>
+ <notes>
+ file name: carrot2-guava-18.0.jar (shaded: com.google.guava:guava:18.0)
+ Only used with clustering engine, and the risk is DOS attack
+ </notes>
<packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
<cve>CVE-2018-10237</cve>
</suppress>
diff --git a/lucene/JRE_VERSION_MIGRATION.md b/lucene/JRE_VERSION_MIGRATION.md
index 74630ada4ea..6edb00e193b 100644
--- a/lucene/JRE_VERSION_MIGRATION.md
+++ b/lucene/JRE_VERSION_MIGRATION.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# JRE Version Migration Guide
@@ -31,12 +31,12 @@ The version of Unicode supported by Java is listed in the documentation
of java.lang.Character class. For reference, Java versions after Java 11
support the following Unicode versions:
- * Java 11, Unicode 10.0
- * Java 12, Unicode 11.0
- * Java 13, Unicode 12.1
- * Java 15, Unicode 13.0
- * Java 16, Unicode 13.0
- * Java 17, Unicode 13.0
+* Java 11, Unicode 10.0
+* Java 12, Unicode 11.0
+* Java 13, Unicode 12.1
+* Java 15, Unicode 13.0
+* Java 16, Unicode 13.0
+* Java 17, Unicode 13.0
In general, whether you need to re-index largely depends upon the data that
you are searching, and what was changed in any given Unicode version. For example,
diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md
index 7510f594bab..3c7d5017c15 100644
--- a/lucene/MIGRATE.md
+++ b/lucene/MIGRATE.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Apache Lucene Migration Guide
@@ -87,7 +87,7 @@ For example:
TopDocs hits = searcher.search(query, 10);
StoredFields storedFields = reader.storedFields();
for (ScoreDoc hit : hits.scoreDocs) {
- Document doc = storedFields.document(hit.doc);
+ Document doc = storedFields.document(hit.doc);
}
```
@@ -256,17 +256,17 @@ For example
public class CustomCollectorManager implements CollectorManager<CustomCollector, List<Object>> {
@Override
public CustomCollector newCollector() throws IOException {
- return new CustomCollector();
+ return new CustomCollector();
}
@Override
public List<Object> reduce(Collection<CustomCollector> collectors) throws IOException {
- List<Object> all = new ArrayList<>();
- for (CustomCollector c : collectors) {
- all.addAll(c.getResult());
- }
+ List<Object> all = new ArrayList<>();
+ for (CustomCollector c : collectors) {
+ all.addAll(c.getResult());
+ }
- return all;
+ return all;
}
}
@@ -537,7 +537,7 @@ factory classes should implement it in the following way:
```java
/** Default ctor for compatibility with SPI */
public StandardTokenizerFactory() {
- throw defaultCtorException();
+ throw defaultCtorException();
}
```
@@ -631,8 +631,8 @@ know the maximum score for a query, the recommended approach is to run a
separate query:
```java
- TopDocs topHits = searcher.search(query, 1);
- float maxScore = topHits.scoreDocs.length == 0 ? Float.NaN : topHits.scoreDocs[0].score;
+TopDocs topHits = searcher.search(query, 1);
+float maxScore = topHits.scoreDocs.length == 0 ? Float.NaN : topHits.scoreDocs[0].score;
```
Thanks to other optimizations that were added to Lucene 8, this query will be
diff --git a/lucene/SYSTEM_REQUIREMENTS.md b/lucene/SYSTEM_REQUIREMENTS.md
index a46a2cf4375..4d23a6b8e71 100644
--- a/lucene/SYSTEM_REQUIREMENTS.md
+++ b/lucene/SYSTEM_REQUIREMENTS.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# System Requirements
diff --git a/lucene/analysis.tests/src/test/org/apache/lucene/analysis/tests/da_UTF8.xml b/lucene/analysis.tests/src/test/org/apache/lucene/analysis/tests/da_UTF8.xml
index 2c8d203be68..a74adf2fa79 100644
--- a/lucene/analysis.tests/src/test/org/apache/lucene/analysis/tests/da_UTF8.xml
+++ b/lucene/analysis.tests/src/test/org/apache/lucene/analysis/tests/da_UTF8.xml
@@ -7,7 +7,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json b/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
index 7dff770f390..81afb67252d 100644
--- a/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
+++ b/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
@@ -1,6 +1,6 @@
{
"gradle/regenerate/jflex/skeleton.disable.buffer.expansion.txt": "6e43a3a64a9b5eb82ec5b4bc21f95aff5a2a061e",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "b7926d1e070e1fce661f5a4426cc9d0ef0a342b9",
- "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java": "df9708b124e587852c5049b4b1ef8e3040425c84",
+ "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java": "106ab1a63cfc1a97105e24a4c9a193dffe342074",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex": "0d43b95334269e1de4f24eed2e4cb60fc05066e4"
}
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java
index 8b8bf240bc7..35fa855442e 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java
@@ -33278,7 +33278,7 @@ public final class UAX29URLEmailTokenizerImpl {
else {
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
case 1:
- { /* Break so we don't hit fall-through warning: */ break; /* Not numeric, word, ideographic, hiragana, emoji or SE Asian -- ignore it. */
+ { break; /* Not numeric, word, ideographic, hiragana, emoji or SE Asian -- ignore it. */
}
// fall through
case 16: break;
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
index 025edad2bca..1590c062efb 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
@@ -1375,11 +1375,10 @@ class KStemmer {
word.setLength(j + 1);
word.unsafeWrite('e');
k = j + 1;
- if (lookup()) /*
- * remove -ition and add `e', and check against the
- * dictionary
- */
+ if (lookup()) {
+ // remove -ition and add `e', and check against the
return; /* (e.g., definition->define, opposition->oppose) */
+ }
/* restore original values */
word.setLength(j + 1);
@@ -1390,21 +1389,19 @@ class KStemmer {
word.setLength(j + 3);
word.unsafeWrite('e');
k = j + 3;
- if (lookup()) /* remove -ion and add `e', and check against the dictionary */
- return; /* (elmination -> eliminate) */
+ if (lookup()) {
+ /* remove -ion and add `e', and check against the dictionary */
+ return; /* (elimination -> eliminate) */
+ }
word.setLength(j + 1);
- word.unsafeWrite('e'); /*
- * remove -ation and add `e', and check against the
- * dictionary
- */
+ word.unsafeWrite('e');
+ // remove -ation and add `e', and check against the dictionary
k = j + 1;
if (lookup()) return;
- word.setLength(j + 1); /*
- * just remove -ation (resignation->resign) and
- * check dictionary
- */
+ word.setLength(j + 1);
+ // just remove -ation (resignation->resign) and check dictionary
k = j;
if (lookup()) return;
@@ -1425,10 +1422,10 @@ class KStemmer {
word.setLength(j + 1);
word.unsafeWrite('y');
k = j + 1;
- if (lookup()) /*
- * remove -ication and add `y', and check against the
- * dictionary
- */ return; /* (e.g., amplification -> amplify) */
+ if (lookup()) {
+ // remove -ication and add `y', and check against the dictionary
+ return; /* (e.g., amplification -> amplify) */
+ }
/* restore original values */
word.setLength(j + 1);
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
index 79943ca5a89..06709aac890 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
@@ -17,30 +17,30 @@
package org.apache.lucene.analysis.en;
/*
-
- Porter stemmer in Java. The original paper is in
-
- Porter, 1980, An algorithm for suffix stripping, Program, Vol. 14,
- no. 3, pp 130-137,
-
- See also https://snowballstem.org/algorithms/porter/stemmer.html
-
- Bug 1 (reported by Gonzalo Parra 16/10/99) fixed as marked below.
- Tthe words 'aed', 'eed', 'oed' leave k at 'a' for step 3, and b[k-1]
- is then out outside the bounds of b.
-
- Similarly,
-
- Bug 2 (reported by Steve Dyrdahl 22/2/00) fixed as marked below.
- 'ion' by itself leaves j = -1 in the test for 'ion' in step 5, and
- b[j] is then outside the bounds of b.
-
- Release 3.
-
- [ This version is derived from Release 3, modified by Brian Goetz to
- optimize for fewer object creations. ]
-
-*/
+ *
+ * Porter stemmer in Java. The original paper is in
+ *
+ * Porter, 1980, An algorithm for suffix stripping, Program, Vol. 14,
+ * no. 3, pp 130-137,
+ *
+ * See also https://snowballstem.org/algorithms/porter/stemmer.html
+ *
+ * Bug 1 (reported by Gonzalo Parra 16/10/99) fixed as marked below.
+ * The words 'aed', 'eed', 'oed' leave k at 'a' for step 3, and b[k-1]
+ * is then out outside the bounds of b.
+ *
+ * Similarly,
+ *
+ * Bug 2 (reported by Steve Dyrdahl 22/2/00) fixed as marked below.
+ * 'ion' by itself leaves j = -1 in the test for 'ion' in step 5, and
+ * b[j] is then outside the bounds of b.
+ *
+ * Release 3.
+ *
+ * [ This version is derived from Release 3, modified by Brian Goetz to
+ * optimize for fewer object creations. ]
+ *
+ */
import org.apache.lucene.util.ArrayUtil;
@@ -123,15 +123,15 @@ class PorterStemmer {
}
/* m() measures the number of consonant sequences between k0 and j. if c is
- a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
- presence,
-
- <c><v> gives 0
- <c>vc<v> gives 1
- <c>vcvc<v> gives 2
- <c>vcvcvc<v> gives 3
- ....
- */
+ * a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
+ * presence,
+ *
+ * <c><v> gives 0
+ * <c>vc<v> gives 1
+ * <c>vcvc<v> gives 2
+ * <c>vcvcvc<v> gives 3
+ * ....
+ */
private final int m() {
int n = 0;
@@ -176,13 +176,13 @@ class PorterStemmer {
}
/* cvc(i) is true <=> i-2,i-1,i has the form consonant - vowel - consonant
- and also if the second c is not w,x or y. this is used when trying to
- restore an e at the end of a short word. e.g.
-
- cav(e), lov(e), hop(e), crim(e), but
- snow, box, tray.
-
- */
+ * and also if the second c is not w,x or y. this is used when trying to
+ * restore an e at the end of a short word. e.g.
+ *
+ * cav(e), lov(e), hop(e), crim(e), but
+ * snow, box, tray.
+ *
+ */
private final boolean cvc(int i) {
if (i < k0 + 2 || !cons(i) || cons(i - 1) || !cons(i - 2)) return false;
@@ -220,26 +220,26 @@ class PorterStemmer {
}
/* step1() gets rid of plurals and -ed or -ing. e.g.
-
- caresses -> caress
- ponies -> poni
- ties -> ti
- caress -> caress
- cats -> cat
-
- feed -> feed
- agreed -> agree
- disabled -> disable
-
- matting -> mat
- mating -> mate
- meeting -> meet
- milling -> mill
- messing -> mess
-
- meetings -> meet
-
- */
+ *
+ * caresses -> caress
+ * ponies -> poni
+ * ties -> ti
+ * caress -> caress
+ * cats -> cat
+ *
+ * feed -> feed
+ * agreed -> agree
+ * disabled -> disable
+ *
+ * matting -> mat
+ * mating -> mate
+ * meeting -> meet
+ * milling -> mill
+ * messing -> mess
+ *
+ * meetings -> meet
+ *
+ */
private final void step1() {
if (b[k] == 's') {
@@ -555,55 +555,4 @@ class PorterStemmer {
i = k + 1;
return dirty;
}
-
- /* Test program for demonstrating the Stemmer. It reads a file and
- * stems each word, writing the result to standard out.
- * Usage: Stemmer file-name
- public static void main(String[] args) {
- PorterStemmer s = new PorterStemmer();
-
- for (int i = 0; i < args.length; i++) {
- try {
- InputStream in = new FileInputStream(args[i]);
- byte[] buffer = new byte[1024];
- int bufferLen, offset, ch;
-
- bufferLen = in.read(buffer);
- offset = 0;
- s.reset();
-
- while(true) {
- if (offset < bufferLen)
- ch = buffer[offset++];
- else {
- bufferLen = in.read(buffer);
- offset = 0;
- if (bufferLen < 0)
- ch = -1;
- else
- ch = buffer[offset++];
- }
-
- if (Character.isLetter((char) ch)) {
- s.add(Character.toLowerCase((char) ch));
- }
- else {
- s.stem();
- System.out.print(s.toString());
- s.reset();
- if (ch < 0)
- break;
- else {
- System.out.print((char) ch);
- }
- }
- }
-
- in.close();
- }
- catch (IOException e) {
- System.out.println("error reading " + args[i]);
- }
- }
- }*/
}
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
index 51298c42a49..bbe656edd06 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
@@ -291,14 +291,14 @@ public final class SynonymFilter extends TokenFilter {
}
/*
- This is the core of this TokenFilter: it locates the
- synonym matches and buffers up the results into
- futureInputs/Outputs.
-
- NOTE: this calls input.incrementToken and does not
- capture the state if no further tokens were checked. So
- caller must then forward state to our caller, or capture:
- */
+ * This is the core of this TokenFilter: it locates the
+ * synonym matches and buffers up the results into
+ * futureInputs/Outputs.
+ *
+ * NOTE: this calls input.incrementToken and does not
+ * capture the state if no further tokens were checked. So
+ * caller must then forward state to our caller, or capture:
+ */
private int lastStartOffset;
private int lastEndOffset;
diff --git a/lucene/analysis/common/src/java/overview.html b/lucene/analysis/common/src/java/overview.html
index 9bcd2817f1d..5b9203d42a4 100644
--- a/lucene/analysis/common/src/java/overview.html
+++ b/lucene/analysis/common/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/common/src/resources/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd b/lucene/analysis/common/src/resources/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
index f413afc2f9a..56eb8777156 100644
--- a/lucene/analysis/common/src/resources/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
+++ b/lucene/analysis/common/src/resources/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,52 +15,59 @@
limitations under the License.
-->
-<!ELEMENT hyphenation-info (hyphen-char?, hyphen-min?,
- classes, exceptions?, patterns)>
+<!ELEMENT hyphenation-info (hyphen-char?, hyphen-min?, classes, exceptions?, patterns)>
-<!-- Hyphen character to be used in the exception list as shortcut for
- <hyphen pre-break="-"/>. Defaults to '-'
+<!--
+ Hyphen character to be used in the exception list as shortcut for
+ <hyphen pre-break="-"/>. Defaults to '-'
-->
<!ELEMENT hyphen-char EMPTY>
<!ATTLIST hyphen-char value CDATA #REQUIRED>
-<!-- Default minimun length in characters of hyphenated word fragments
- before and after the line break. For some languages this is not
- only for aesthetic purposes, wrong hyphens may be generated if this
- is not accounted for.
+<!--
+ Default minimun length in characters of hyphenated word fragments
+ before and after the line break. For some languages this is not
+ only for aesthetic purposes, wrong hyphens may be generated if this
+ is not accounted for.
-->
<!ELEMENT hyphen-min EMPTY>
<!ATTLIST hyphen-min before CDATA #REQUIRED>
<!ATTLIST hyphen-min after CDATA #REQUIRED>
-<!-- Character equivalent classes: space separated list of character groups, all
- characters in a group are to be treated equivalent as far as
- the hyphenation algorithm is concerned. The first character in a group
- is the group's equivalent character. Patterns should only contain
- first characters. It also defines word characters, i.e. a word that
- contains characters not present in any of the classes is not hyphenated.
+<!--
+ Character equivalent classes: space separated list of character groups, all
+ characters in a group are to be treated equivalent as far as
+ the hyphenation algorithm is concerned. The first character in a group
+ is the group's equivalent character. Patterns should only contain
+ first characters. It also defines word characters, i.e. a word that
+ contains characters not present in any of the classes is not hyphenated.
-->
<!ELEMENT classes (#PCDATA)>
-<!-- Hyphenation exceptions: space separated list of hyphenated words.
- A hyphen is indicated by the hyphen tag, but you can use the
- hyphen-char defined previously as shortcut. This is in cases
- when the algorithm procedure finds wrong hyphens or you want
- to provide your own hyphenation for some words.
+<!--
+ Hyphenation exceptions: space separated list of hyphenated words.
+ A hyphen is indicated by the hyphen tag, but you can use the
+ hyphen-char defined previously as shortcut. This is in cases
+ when the algorithm procedure finds wrong hyphens or you want
+ to provide your own hyphenation for some words.
-->
<!ELEMENT exceptions (#PCDATA|hyphen)* >
-<!-- The hyphenation patterns, space separated. A pattern is made of 'equivalent'
- characters as described before, between any two word characters a digit
- in the range 0 to 9 may be specified. The absence of a digit is equivalent
- to zero. The '.' character is reserved to indicate beginning or ending
- of words. -->
+<!--
+ The hyphenation patterns, space separated. A pattern is made of 'equivalent'
+ characters as described before, between any two word characters a digit
+ in the range 0 to 9 may be specified. The absence of a digit is equivalent
+ to zero. The '.' character is reserved to indicate beginning or ending
+ of words.
+-->
<!ELEMENT patterns (#PCDATA)>
-<!-- A "full hyphen" equivalent to TeX's \discretionary
- with pre-break, post-break and no-break attributes.
- To be used in the exceptions list, the hyphen character is not
- automatically added -->
+<!--
+ A "full hyphen" equivalent to TeX's \discretionary
+ with pre-break, post-break and no-break attributes.
+ To be used in the exceptions list, the hyphen character is not
+ automatically added
+-->
<!ELEMENT hyphen EMPTY>
<!ATTLIST hyphen pre CDATA #IMPLIED>
<!ATTLIST hyphen no CDATA #IMPLIED>
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
index 2c8d203be68..a74adf2fa79 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
@@ -7,7 +7,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8124.xml b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8124.xml
index 8710eab0872..cb17ced6535 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8124.xml
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8124.xml
@@ -5,7 +5,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8183.xml b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8183.xml
index 88909a906e0..77f94b62c3e 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8183.xml
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation-LUCENE-8183.xml
@@ -5,7 +5,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
index fb3db16cf67..083a8d32ccb 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,52 +16,59 @@
-->
<!-- Id: hyphenation.dtd,v 1.3 2004/02/27 18:34:59 jeremias Exp $ -->
-<!ELEMENT hyphenation-info (hyphen-char?, hyphen-min?,
- classes, exceptions?, patterns)>
+<!ELEMENT hyphenation-info (hyphen-char?, hyphen-min?, classes, exceptions?, patterns)>
-<!-- Hyphen character to be used in the exception list as shortcut for
- <hyphen pre-break="-"/>. Defaults to '-'
+<!--
+ Hyphen character to be used in the exception list as shortcut for
+ <hyphen pre-break="-"/>. Defaults to '-'
-->
<!ELEMENT hyphen-char EMPTY>
<!ATTLIST hyphen-char value CDATA #REQUIRED>
-<!-- Default minimun length in characters of hyphenated word fragments
- before and after the line break. For some languages this is not
- only for aesthetic purposes, wrong hyphens may be generated if this
- is not accounted for.
+<!--
+ Default minimun length in characters of hyphenated word fragments
+ before and after the line break. For some languages this is not
+ only for aesthetic purposes, wrong hyphens may be generated if this
+ is not accounted for.
-->
<!ELEMENT hyphen-min EMPTY>
<!ATTLIST hyphen-min before CDATA #REQUIRED>
<!ATTLIST hyphen-min after CDATA #REQUIRED>
-<!-- Character equivalent classes: space separated list of character groups, all
- characters in a group are to be treated equivalent as far as
- the hyphenation algorithm is concerned. The first character in a group
- is the group's equivalent character. Patterns should only contain
- first characters. It also defines word characters, i.e. a word that
- contains characters not present in any of the classes is not hyphenated.
+<!--
+ Character equivalent classes: space separated list of character groups, all
+ characters in a group are to be treated equivalent as far as
+ the hyphenation algorithm is concerned. The first character in a group
+ is the group's equivalent character. Patterns should only contain
+ first characters. It also defines word characters, i.e. a word that
+ contains characters not present in any of the classes is not hyphenated.
-->
<!ELEMENT classes (#PCDATA)>
-<!-- Hyphenation exceptions: space separated list of hyphenated words.
- A hyphen is indicated by the hyphen tag, but you can use the
- hyphen-char defined previously as shortcut. This is in cases
- when the algorithm procedure finds wrong hyphens or you want
- to provide your own hyphenation for some words.
+<!--
+ Hyphenation exceptions: space separated list of hyphenated words.
+ A hyphen is indicated by the hyphen tag, but you can use the
+ hyphen-char defined previously as shortcut. This is in cases
+ when the algorithm procedure finds wrong hyphens or you want
+ to provide your own hyphenation for some words.
-->
<!ELEMENT exceptions (#PCDATA|hyphen)* >
-<!-- The hyphenation patterns, space separated. A pattern is made of 'equivalent'
- characters as described before, between any two word characters a digit
- in the range 0 to 9 may be specified. The absence of a digit is equivalent
- to zero. The '.' character is reserved to indicate beginning or ending
- of words. -->
+<!--
+ The hyphenation patterns, space separated. A pattern is made of 'equivalent'
+ characters as described before, between any two word characters a digit
+ in the range 0 to 9 may be specified. The absence of a digit is equivalent
+ to zero. The '.' character is reserved to indicate beginning or ending
+ of words.
+-->
<!ELEMENT patterns (#PCDATA)>
-<!-- A "full hyphen" equivalent to TeX's \discretionary
- with pre-break, post-break and no-break attributes.
- To be used in the exceptions list, the hyphen character is not
- automatically added -->
+<!--
+ A "full hyphen" equivalent to TeX's \discretionary
+ with pre-break, post-break and no-break attributes.
+ To be used in the exceptions list, the hyphen character is not
+ automatically added
+-->
<!ELEMENT hyphen EMPTY>
<!ATTLIST hyphen pre CDATA #IMPLIED>
<!ATTLIST hyphen no CDATA #IMPLIED>
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java
index 93209fb62e6..5f604586fc8 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java
@@ -704,22 +704,22 @@ public class TestFlattenGraphFilter extends BaseTokenStreamTestCase {
flattenedTokenStream.close();
/*
- CheckGeneralization can get VERY slow as matching holes to tokens or other holes generates a lot of potentially valid paths.
- Analyzer withoutFlattenGraph =
- new Analyzer() {
- @Override
- protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer in = new WhitespaceTokenizer();
- TokenStream result = new SynonymGraphFilter(in, synMap, true);
- result = new StopFilter(result, stopWords);
- return new TokenStreamComponents(in, result);
- }
- };
- checkGeneralization(
- withFlattenGraph.tokenStream("field", text),
- withoutFlattenGraph.tokenStream("field", text));
-
- */
+ * CheckGeneralization can get VERY slow as matching holes to tokens or other holes generates a lot of potentially valid paths.
+ * Analyzer withoutFlattenGraph =
+ * new Analyzer() {
+ * @Override
+ * protected TokenStreamComponents createComponents(String fieldName) {
+ * Tokenizer in = new WhitespaceTokenizer();
+ * TokenStream result = new SynonymGraphFilter(in, synMap, true);
+ * result = new StopFilter(result, stopWords);
+ * return new TokenStreamComponents(in, result);
+ * }
+ * };
+ * checkGeneralization(
+ * withFlattenGraph.tokenStream("field", text),
+ * withoutFlattenGraph.tokenStream("field", text));
+ *
+ */
}
/*
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html
index f70a43d1470..0f4bbf3946e 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html
@@ -21,7 +21,7 @@ var search_hint = "Search";
<!-- css only for MS IE6/IE7 browsers -->
<!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="/moin_static184/modernized/css/msie.css">
+ <link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="/moin_static184/modernized/css/msie.css">
<![endif]-->
@@ -51,12 +51,12 @@ var search_hint = "Search";
<input type="hidden" name="context" value="180">
<label for="searchinput">Search:</label>
<input id="searchinput" type="text" name="value" value="" size="20"
- onfocus="searchFocus(this)" onblur="searchBlur(this)"
- onkeyup="searchChange(this)" onchange="searchChange(this)" alt="Search">
+ onfocus="searchFocus(this)" onblur="searchBlur(this)"
+ onkeyup="searchChange(this)" onchange="searchChange(this)" alt="Search">
<input id="titlesearch" name="titlesearch" type="submit"
- value="Titles" alt="Search Titles">
+ value="Titles" alt="Search Titles">
<input id="fullsearch" name="fullsearch" type="submit"
- value="Text" alt="Search Full Text">
+ value="Text" alt="Search Full Text">
</div>
</form>
<script type="text/javascript">
@@ -86,14 +86,14 @@ searchBlur(e);
<ul class="editbar"><li><span class="disabled">Immutable Page</span></li><li class="toggleCommentsButton" style="display:none;"><a href="#" class="nbcomment" onClick="toggleComments();return false;">Comments</a></li><li><a class="nbinfo" href="/lucene-java/Resources?action=info" rel="nofollow">Info</a></li><li>
<form class="actionsmenu" method="GET" action="/lucene-java/Resources">
<div>
- <label>More Actions:</label>
- <select name="action"
- onchange="if ((this.selectedIndex != 0) &&
- (this.options[this.selectedIndex].disabled == false)) {
- this.form.submit();
- }
- this.selectedIndex = 0;">
- <option value="raw">Raw Text</option>
+ <label>More Actions:</label>
+ <select name="action"
+ onchange="if ((this.selectedIndex != 0) &&
+ (this.options[this.selectedIndex].disabled == false)) {
+ this.form.submit();
+ }
+ this.selectedIndex = 0;">
+ <option value="raw">Raw Text</option>
<option value="print">Print View</option>
<option value="RenderAsDocbook">Render as Docbook</option>
<option value="refresh">Delete Cache</option>
@@ -116,8 +116,8 @@ searchBlur(e);
<option value="show" disabled class="disabled">------------------------</option>
<option value="Load">Load</option>
<option value="Save">Save</option>
- </select>
- <input type="submit" value="Do">
+ </select>
+ <input type="submit" value="Do">
</div>
<script type="text/javascript">
@@ -151,10 +151,10 @@ actionsMenuInit('More Actions:');
<span class="anchor" id="line-18"></span><span class="anchor" id="line-19"></span><ul><li><p class="line891"><img alt="http://www.manning.com/hatcher3/hatcher3_cover150.jpg" class="external_image" src="http://www.manning.com/hatcher3/hatcher3_cover150.jpg" title="http://www.manning.com/hatcher3/hatcher3_cover150.jpg" /> "<a class="http" href="http://www.manning.com/hatcher3/">Lucene in Action, Second Edition"</a> by Erik Hatcher, Otis Gospodnetić, and Michael McCandless <span class= [...]
<h1 id="Articles">Articles</h1>
<span class="anchor" id="line-26"></span><span class="anchor" id="line-27"></span><ul><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Getting-Started-with-Lucene/">Getting Started with Lucene</a> (by Grant Ingersoll) <br>
- (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-28"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Optimizing-Findability-in-Lucene-and-Solr/">Optimizing Findability in Lucene and Solr</a> (by Grant Ingersoll)<br>
- (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-29"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Debugging-Relevance-Issues-in-Search/">Debugging Relevance Issues in Search</a> (by Grant Ingersoll)<br>
- (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-30"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Scaling-Lucene-and-Solr/">Scaling Lucene and Solr</a> (by Mark Miller)<br>
- (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-31"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Introduction-to-Apache-Lucene-and-Solr/">Introduction to Apache Lucene and Solr</a> (by Marc Krellenstein)<br>
+ (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-28"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Optimizing-Findability-in-Lucene-and-Solr/">Optimizing Findability in Lucene and Solr</a> (by Grant Ingersoll)<br>
+ (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-29"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Debugging-Relevance-Issues-in-Search/">Debugging Relevance Issues in Search</a> (by Grant Ingersoll)<br>
+ (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-30"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Scaling-Lucene-and-Solr/">Scaling Lucene and Solr</a> (by Mark Miller)<br>
+ (<em>Published: January 2009 - article</em>) <span class="anchor" id="line-31"></span></li><li><p class="line891"><a class="http" href="http://www.lucidimagination.com/Community/Hear-from-the-Experts/Articles/Introduction-to-Apache-Lucene-and-Solr/">Introduction to Apache Lucene and Solr</a> (by Marc Krellenstein)<br>
(<em>Published: January 2009 - article</em>) <span class="anchor" id="line-32"></span></li><li><p class="line891"><a class="http" href="http://cephas.net/blog/2008/03/30/how-morelikethis-works-in-lucene/">How MoreLikeThis Works in Lucene</a> (by Aaron Johnson)<br>
(<em>Last updated: March 2008 - blog entry</em>) <span class="anchor" id="line-33"></span></li><li><p class="line891"><a class="http" href="http://schmidt.devlib.org/software/lucene-wikipedia.html">Lucene Wikipedia indexer</a> (by Marco Schmidt)<br>
(<em>Last updated: November 2007 - tutorial</em>) <span class="anchor" id="line-34"></span></li><li><p class="line891"><a class="http" href="http://marceloochoa.blogspot.com/2007/09/running-lucene-inside-your-oracle-jvm.html">Running Lucene inside your Oracle JVM</a> (by Marcelo Ochoa)<br>
diff --git a/lucene/analysis/icu/src/java/overview.html b/lucene/analysis/icu/src/java/overview.html
index 76840f4c0b6..2ee900fa032 100644
--- a/lucene/analysis/icu/src/java/overview.html
+++ b/lucene/analysis/icu/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
@@ -71,9 +71,7 @@ algorithm.
<h2>Example Usages</h2>
<h3>Tokenizing multilanguage text</h3>
<pre class="prettyprint">
- /**
- * This tokenizer will work well in general for most languages.
- */
+ // This tokenizer will work well in general for most languages.
Tokenizer tokenizer = new ICUTokenizer(reader);
</pre>
<hr>
@@ -244,13 +242,9 @@ algorithm.
<h2>Example Usages</h2>
<h3>Normalizing text to NFC</h3>
<pre class="prettyprint">
- /**
- * Normalizer2 objects are unmodifiable and immutable.
- */
+ // Normalizer2 objects are unmodifiable and immutable.
Normalizer2 normalizer = Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE);
- /**
- * This filter will normalize to NFC.
- */
+ // This filter will normalize to NFC.
TokenStream tokenstream = new ICUNormalizer2Filter(tokenizer, normalizer);
</pre>
<hr>
@@ -283,9 +277,7 @@ this integration. To perform case-folding, you use normalization with the form
<h2>Example Usages</h2>
<h3>Lowercasing text</h3>
<pre class="prettyprint">
- /**
- * This filter will case-fold and normalize to NFKC.
- */
+ // This filter will case-fold and normalize to NFKC.
TokenStream tokenstream = new ICUNormalizer2Filter(tokenizer);
</pre>
<hr>
@@ -310,10 +302,8 @@ many character foldings recursively.
<h2>Example Usages</h2>
<h3>Removing accents</h3>
<pre class="prettyprint">
- /**
- * This filter will case-fold, remove accents and other distinctions, and
- * normalize to NFKC.
- */
+ // This filter will case-fold, remove accents and other distinctions, and
+ // normalize to NFKC.
TokenStream tokenstream = new ICUFoldingFilter(tokenizer);
</pre>
<hr>
@@ -340,16 +330,13 @@ and
<h2>Example Usages</h2>
<h3>Convert Traditional to Simplified</h3>
<pre class="prettyprint">
- /**
- * This filter will map Traditional Chinese to Simplified Chinese
- */
+ // This filter will map Traditional Chinese to Simplified Chinese
TokenStream tokenstream = new ICUTransformFilter(tokenizer, Transliterator.getInstance("Traditional-Simplified"));
</pre>
<h3>Transliterate Serbian Cyrillic to Serbian Latin</h3>
<pre class="prettyprint">
- /**
- * This filter will map Serbian Cyrillic to Serbian Latin according to BGN rules
- */
+ //
+ This filter will map Serbian Cyrillic to Serbian Latin according to BGN rules
TokenStream tokenstream = new ICUTransformFilter(tokenizer, Transliterator.getInstance("Serbian-Latin/BGN"));
</pre>
<hr>
@@ -364,17 +351,15 @@ a specific Unicode Version by using a {@link com.ibm.icu.text.FilteredNormalizer
<h2>Example Usages</h2>
<h3>Restricting normalization to Unicode 5.0</h3>
<pre class="prettyprint">
- /**
- * This filter will do NFC normalization, but will ignore any characters that
- * did not exist as of Unicode 5.0. Because of the normalization stability policy
- * of Unicode, this is an easy way to force normalization to a specific version.
- */
- Normalizer2 normalizer = Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE);
- UnicodeSet set = new UnicodeSet("[:age=5.0:]");
- // see FilteredNormalizer2 docs, the set should be frozen or performance will suffer
- set.freeze();
- FilteredNormalizer2 unicode50 = new FilteredNormalizer2(normalizer, set);
- TokenStream tokenstream = new ICUNormalizer2Filter(tokenizer, unicode50);
+ // This filter will do NFC normalization, but will ignore any characters that
+ // did not exist as of Unicode 5.0. Because of the normalization stability policy
+ // of Unicode, this is an easy way to force normalization to a specific version.
+ Normalizer2 normalizer = Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE);
+ UnicodeSet set = new UnicodeSet("[:age=5.0:]");
+ // see FilteredNormalizer2 docs, the set should be frozen or performance will suffer
+ set.freeze();
+ FilteredNormalizer2 unicode50 = new FilteredNormalizer2(normalizer, set);
+ TokenStream tokenstream = new ICUNormalizer2Filter(tokenizer, unicode50);
</pre>
</body>
</html>
diff --git a/lucene/analysis/kuromoji/src/java/overview.html b/lucene/analysis/kuromoji/src/java/overview.html
index db065a2887b..f87a1c0d77d 100644
--- a/lucene/analysis/kuromoji/src/java/overview.html
+++ b/lucene/analysis/kuromoji/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
@@ -29,9 +29,11 @@
<p>
For an introduction to Lucene's analysis API, see the {@link org.apache.lucene.analysis} package documentation.
</p>
- <!-- TODO: give a high level overview of the features, how they are supported
- by the attributes api, which components do what, etc. Also would be nice
- to show some examples for some Japanese strings, we could show the various
- attributes resulting from analysis in a table -->
+ <!--
+ TODO: give a high level overview of the features, how they are supported
+ by the attributes api, which components do what, etc. Also would be nice
+ to show some examples for some Japanese strings, we could show the various
+ attributes resulting from analysis in a table
+ -->
</body>
</html>
diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
index 25e247a8587..2dce46524c7 100644
--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
@@ -305,29 +305,28 @@ public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
}
/*
- // NOTE: intentionally fails! Just trying to debug this
- // one input...
- public void testDecomposition6() throws Exception {
- assertAnalyzesTo(analyzer, "奈良先端科学技術大学院大学",
- new String[] { "これ", "は", "本", "で", "は", "ない" },
- new int[] { 0, 2, 3, 4, 5, 6 },
- new int[] { 2, 3, 4, 5, 6, 8 }
- );
- }
- */
+ * // NOTE: intentionally fails! Just trying to debug this
+ * // one input...
+ * public void testDecomposition6() throws Exception {
+ * assertAnalyzesTo(analyzer, "奈良先端科学技術大学院大学",
+ * new String[] { "これ", "は", "本", "で", "は", "ない" },
+ * new int[] { 0, 2, 3, 4, 5, 6 },
+ * new int[] { 2, 3, 4, 5, 6, 8 });
+ * }
+ */
/** Tests that sentence offset is incorporated into the resulting offsets */
public void testTwoSentences() throws Exception {
/*
- //TokenStream ts = a.tokenStream("foo", "妹の咲子です。俺と年子で、今受験生です。");
- TokenStream ts = analyzer.tokenStream("foo", "�<!--\"<!--#<!--;?><!--#<!--#><!---->?>-->;");
- ts.reset();
- CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
- while(ts.incrementToken()) {
- System.out.println(" " + termAtt.toString());
- }
- System.out.println("DONE PARSE\n\n");
- */
+ * //TokenStream ts = a.tokenStream("foo", "妹の咲子です。俺と年子で、今受験生です。");
+ * TokenStream ts = analyzer.tokenStream("foo", "�<!--\"<!--#<!--;?><!--#<!--#><!---->?>-->;");
+ * ts.reset();
+ * CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
+ * while(ts.incrementToken()) {
+ * System.out.println(" " + termAtt.toString());
+ * }
+ * System.out.println("DONE PARSE\n\n");
+ */
assertAnalyzesTo(
analyzerNoPunct,
@@ -688,51 +687,51 @@ public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
}
/*
- public void testWikipedia() throws Exception {
- final FileInputStream fis = new FileInputStream("/q/lucene/jawiki-20120220-pages-articles.xml");
- final Reader r = new BufferedReader(new InputStreamReader(fis, StandardCharsets.UTF_8));
-
- final long startTimeNS = System.nanoTime();
- boolean done = false;
- long compoundCount = 0;
- long nonCompoundCount = 0;
- long netOffset = 0;
- while (!done) {
- final TokenStream ts = analyzer.tokenStream("ignored", r);
- ts.reset();
- final PositionIncrementAttribute posIncAtt = ts.addAttribute(PositionIncrementAttribute.class);
- final OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class);
- int count = 0;
- while (true) {
- if (!ts.incrementToken()) {
- done = true;
- break;
- }
- count++;
- if (posIncAtt.getPositionIncrement() == 0) {
- compoundCount++;
- } else {
- nonCompoundCount++;
- if (nonCompoundCount % 1000000 == 0) {
- System.out.println(String.format("%.2f msec [pos=%d, %d, %d]",
- (System.nanoTime() - startTimeNS) / (double) TimeUnit.MILLISECONDS.toNanos(1),
- netOffset + offsetAtt.startOffset(),
- nonCompoundCount,
- compoundCount));
- }
- }
- if (count == 100000000) {
- System.out.println(" again...");
- break;
- }
- }
- ts.end();
- netOffset += offsetAtt.endOffset();
- }
- System.out.println("compoundCount=" + compoundCount + " nonCompoundCount=" + nonCompoundCount);
- r.close();
- }
- */
+ * public void testWikipedia() throws Exception {
+ * final FileInputStream fis = new FileInputStream("/q/lucene/jawiki-20120220-pages-articles.xml");
+ * final Reader r = new BufferedReader(new InputStreamReader(fis, StandardCharsets.UTF_8));
+ *
+ * final long startTimeNS = System.nanoTime();
+ * boolean done = false;
+ * long compoundCount = 0;
+ * long nonCompoundCount = 0;
+ * long netOffset = 0;
+ * while (!done) {
+ * final TokenStream ts = analyzer.tokenStream("ignored", r);
+ * ts.reset();
+ * final PositionIncrementAttribute posIncAtt = ts.addAttribute(PositionIncrementAttribute.class);
+ * final OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class);
+ * int count = 0;
+ * while (true) {
+ * if (!ts.incrementToken()) {
+ * done = true;
+ * break;
+ * }
+ * count++;
+ * if (posIncAtt.getPositionIncrement() == 0) {
+ * compoundCount++;
+ * } else {
+ * nonCompoundCount++;
+ * if (nonCompoundCount % 1000000 == 0) {
+ * System.out.println(String.format("%.2f msec [pos=%d, %d, %d]",
+ * (System.nanoTime() - startTimeNS) / (double) TimeUnit.MILLISECONDS.toNanos(1),
+ * netOffset + offsetAtt.startOffset(),
+ * nonCompoundCount,
+ * compoundCount));
+ * }
+ * }
+ * if (count == 100000000) {
+ * System.out.println(" again...");
+ * break;
+ * }
+ * }
+ * ts.end();
+ * netOffset += offsetAtt.endOffset();
+ * }
+ * System.out.println("compoundCount=" + compoundCount + " nonCompoundCount=" + nonCompoundCount);
+ * r.close();
+ * }
+ */
private void doTestBocchan(int numIterations) throws Exception {
LineNumberReader reader =
diff --git a/lucene/analysis/morfologik/src/java/overview.html b/lucene/analysis/morfologik/src/java/overview.html
index 91fc70a9744..109d002a7fa 100644
--- a/lucene/analysis/morfologik/src/java/overview.html
+++ b/lucene/analysis/morfologik/src/java/overview.html
@@ -1,19 +1,19 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/nori/src/java/overview.html b/lucene/analysis/nori/src/java/overview.html
index 8ed9efda8ad..8af4ccfd64b 100644
--- a/lucene/analysis/nori/src/java/overview.html
+++ b/lucene/analysis/nori/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/opennlp/src/java/overview.html b/lucene/analysis/opennlp/src/java/overview.html
index bf70e955078..d3ad1f0afec 100644
--- a/lucene/analysis/opennlp/src/java/overview.html
+++ b/lucene/analysis/opennlp/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/phonetic/src/java/overview.html b/lucene/analysis/phonetic/src/java/overview.html
index 0cfc5a91720..ac423c13f1d 100644
--- a/lucene/analysis/phonetic/src/java/overview.html
+++ b/lucene/analysis/phonetic/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/smartcn/src/java/overview.html b/lucene/analysis/smartcn/src/java/overview.html
index 973f52abb4c..adb4712266d 100644
--- a/lucene/analysis/smartcn/src/java/overview.html
+++ b/lucene/analysis/smartcn/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Cell.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Cell.java
index 3804d095882..ddb759c49cb 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Cell.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Cell.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
/** A Cell is a portion of a trie. */
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
index c6d586c871b..59aa3256a3a 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.BufferedOutputStream;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Diff.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Diff.java
index 8a92e6b7d36..65ae01e9e21 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Diff.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Diff.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
/**
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
index 2518357e7db..24b422768cc 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.LineNumberReader;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
index ecd1f4e197e..d776c189dad 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.util.ArrayList;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
index 0536c3e1610..5b51f6b4552 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.util.ArrayList;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
index 5210137d3ac..f208e540330 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.DataInput;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
index 21f432fb7cf..1b17b4fac16 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.DataInput;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
index bb232175983..b05f539a99e 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.util.ArrayList;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java
index 60138c39056..a32dda99c95 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
/**
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
index d8a3692e2c8..c4fe5e852c5 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.util.ArrayList;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
index 275991a5094..58fea0c85df 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.DataInput;
diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
index b350c64a750..b6a26795f69 100644
--- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
+++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
@@ -1,57 +1,57 @@
/*
- Egothor Software License version 1.00
- Copyright (C) 1997-2004 Leo Galambos.
- Copyright (C) 2002-2004 "Egothor developers"
- on behalf of the Egothor Project.
- All rights reserved.
-
- This software is copyrighted by the "Egothor developers". If this
- license applies to a single file or document, the "Egothor developers"
- are the people or entities mentioned as copyright holders in that file
- or document. If this license applies to the Egothor project as a
- whole, the copyright holders are the people or entities mentioned in
- the file CREDITS. This file can be found in the same location as this
- license in the distribution.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, the list of contributors, this list of conditions, and the
- following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, the list of contributors, this list of conditions, and the
- disclaimer that follows these conditions in the documentation
- and/or other materials provided with the distribution.
- 3. The name "Egothor" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact Leo.G@seznam.cz
- 4. Products derived from this software may not be called "Egothor",
- nor may "Egothor" appear in their name, without prior written
- permission from Leo.G@seznam.cz.
-
- In addition, we request that you include in the end-user documentation
- provided with the redistribution and/or in the software itself an
- acknowledgement equivalent to the following:
- "This product includes software developed by the Egothor Project.
- http://egothor.sf.net/"
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Egothor Project and was originally
- created by Leo Galambos (Leo.G@seznam.cz).
-*/
+ * Egothor Software License version 1.00
+ * Copyright (C) 1997-2004 Leo Galambos.
+ * Copyright (C) 2002-2004 "Egothor developers"
+ * on behalf of the Egothor Project.
+ * All rights reserved.
+ *
+ * This software is copyrighted by the "Egothor developers". If this
+ * license applies to a single file or document, the "Egothor developers"
+ * are the people or entities mentioned as copyright holders in that file
+ * or document. If this license applies to the Egothor project as a
+ * whole, the copyright holders are the people or entities mentioned in
+ * the file CREDITS. This file can be found in the same location as this
+ * license in the distribution.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, the list of contributors, this list of conditions, and the
+ * disclaimer that follows these conditions in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name "Egothor" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact Leo.G@seznam.cz
+ * 4. Products derived from this software may not be called "Egothor",
+ * nor may "Egothor" appear in their name, without prior written
+ * permission from Leo.G@seznam.cz.
+ *
+ * In addition, we request that you include in the end-user documentation
+ * provided with the redistribution and/or in the software itself an
+ * acknowledgement equivalent to the following:
+ * "This product includes software developed by the Egothor Project.
+ * http://egothor.sf.net/"
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE EGOTHOR PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Egothor Project and was originally
+ * created by Leo Galambos (Leo.G@seznam.cz).
+ */
package org.egothor.stemmer;
import java.io.DataInput;
diff --git a/lucene/analysis/stempel/src/java/overview.html b/lucene/analysis/stempel/src/java/overview.html
index 942a86ceed5..b9d92fe3cd7 100644
--- a/lucene/analysis/stempel/src/java/overview.html
+++ b/lucene/analysis/stempel/src/java/overview.html
@@ -1,19 +1,19 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
@@ -21,10 +21,10 @@
<title>Stempel - Algorithmic Stemmer for Polish Language</title>
<meta content="Andrzej Bialecki" name="author">
<meta name="keywords"
- content="stemming, stemmer, algorithmic stemmer, Polish stemmer">
+ content="stemming, stemmer, algorithmic stemmer, Polish stemmer">
<meta
- content="This page describes a software package consisting of high-quality stemming tables for Polish, and a universal algorithmic stemmer, which operates using these tables."
- name="description">
+ content="This page describes a software package consisting of high-quality stemming tables for Polish, and a universal algorithmic stemmer, which operates using these tables."
+ name="description">
</head>
<body style="font-family: Arial,SansSerif;">
<h1><i>Stempel</i> - Algorithmic Stemmer for Polish Language</h1>
@@ -103,9 +103,9 @@ good quality commercial lemmatizers for Polish. However, there is only
one
freely available Polish stemmer, implemented by
<a
- href="http://www.cs.put.poznan.pl/dweiss/xml/projects/lametyzator/index.xml?lang=en">Dawid
+ href="http://www.cs.put.poznan.pl/dweiss/xml/projects/lametyzator/index.xml?lang=en">Dawid
Weiss</a>, based on the "ispell" dictionary and Jan Daciuk's <a
- href="http://www.eti.pg.gda.pl/%7Ejandac/">FSA package</a>. That
+ href="http://www.eti.pg.gda.pl/%7Ejandac/">FSA package</a>. That
stemmer is dictionary-based. This means that even
though it can achieve
perfect accuracy for previously known word forms found in its
@@ -183,8 +183,8 @@ the P-commands stored there). The result is a word stem.<br>
<p><i>(to be completed...)</i></p>
<p>The following Polish corpora have been used:</p>
<ul>
- <li><a
- href="http://sourceforge.net/project/showfiles.php?group_id=49316&package_id=65354">Polish
+ <li>
+ <a href="http://sourceforge.net/project/showfiles.php?group_id=49316&package_id=65354">Polish
dictionary
from ispell distribution</a></li>
<li><a href="http://www.mimuw.edu.pl/polszczyzna/">Wzbogacony korpus
@@ -192,8 +192,8 @@ słownika frekwencyjnego</a></li>
<!--<li><a href="http://www.korpus.pl">Korpus IPI PAN</a></li>-->
<!--<li>The Bible (so called "Warsaw Bible" or "Brytyjka")</li>--><li>The
Bible (so called "TysiÄ…clecia") - unauthorized electronic version</li>
- <li><a
- href="http://www.mimuw.edu.pl/polszczyzna/Debian/sam34_3.4a.02-1_i386.deb">Analizator
+ <li>
+ <a href="http://www.mimuw.edu.pl/polszczyzna/Debian/sam34_3.4a.02-1_i386.deb">Analizator
morfologiczny SAM v. 3.4</a> - this was used to recover lemmas
missing from other texts</li>
</ul>
@@ -427,7 +427,7 @@ produce a
single stem varies between 5-10 microseconds.<br>
</p>
<p>This means that the stemmer can process up to <span
- style="font-weight: bold;">200,000 words per second</span>, an
+ style="font-weight: bold;">200,000 words per second</span>, an
outstanding result when compared to other stemmers (Morfeusz - ~2,000
w/s, FormAN (MS Word analyzer) - ~1,000 w/s).<br>
</p>
@@ -460,8 +460,8 @@ Intelligent Information Processing and Web Mining Conference, 2004,
Zakopane, Poland.</li>
<li>Galambos, L.: Lemmatizer for Document Information Retrieval
Systems in JAVA.<a
- class="moz-txt-link-rfc2396E"
- href="http://www.informatik.uni-trier.de/%7Eley/db/conf/sofsem/sofsem2001.html#Galambos01"><http://www.informatik.uni-trier.de/%7Eley/db/conf/sofsem/sofsem2001.html#Galambos01></a>
+ class="moz-txt-link-rfc2396E"
+ href="http://www.informatik.uni-trier.de/%7Eley/db/conf/sofsem/sofsem2001.html#Galambos01"><http://www.informatik.uni-trier.de/%7Eley/db/conf/sofsem/sofsem2001.html#Galambos01></a>
SOFSEM 2001, Piestany, Slovakia. <br>
</li>
</ol>
diff --git a/lucene/backward-codecs/README.md b/lucene/backward-codecs/README.md
index a96fd781f65..8e4b2c61307 100644
--- a/lucene/backward-codecs/README.md
+++ b/lucene/backward-codecs/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Index backwards compatibility
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene40/blocktree/FieldReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene40/blocktree/FieldReader.java
index 05b350d5ba2..b74f8b1ecdd 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene40/blocktree/FieldReader.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene40/blocktree/FieldReader.java
@@ -100,14 +100,14 @@ public final class FieldReader extends Terms {
}
index = FST.fromFSTReader(fstMetadata, new OffHeapFSTStore(indexIn, indexStartFP, fstMetadata));
/*
- if (false) {
- final String dotFileName = segment + "_" + fieldInfo.name + ".dot";
- Writer w = new OutputStreamWriter(new FileOutputStream(dotFileName));
- Util.toDot(index, w, false, false);
- System.out.println("FST INDEX: SAVED to " + dotFileName);
- w.close();
- }
- */
+ * if (false) {
+ * final String dotFileName = segment + "_" + fieldInfo.name + ".dot";
+ * Writer w = new OutputStreamWriter(new FileOutputStream(dotFileName));
+ * Util.toDot(index, w, false, false);
+ * System.out.println("FST INDEX: SAVED to " + dotFileName);
+ * w.close();
+ * }
+ */
}
@Override
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/blocktree/FieldReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/blocktree/FieldReader.java
index 83286bb7695..16eac747bf9 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/blocktree/FieldReader.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/blocktree/FieldReader.java
@@ -91,14 +91,14 @@ public final class FieldReader extends Terms {
var metadata = FST.readMetadata(metaIn, ByteSequenceOutputs.getSingleton());
index = FST.fromFSTReader(metadata, new OffHeapFSTStore(indexIn, indexStartFP, metadata));
/*
- if (false) {
- final String dotFileName = segment + "_" + fieldInfo.name + ".dot";
- Writer w = new OutputStreamWriter(new FileOutputStream(dotFileName));
- Util.toDot(index, w, false, false);
- System.out.println("FST INDEX: SAVED to " + dotFileName);
- w.close();
- }
- */
+ * if (false) {
+ * final String dotFileName = segment + "_" + fieldInfo.name + ".dot";
+ * Writer w = new OutputStreamWriter(new FileOutputStream(dotFileName));
+ * Util.toDot(index, w, false, false);
+ * System.out.println("FST INDEX: SAVED to " + dotFileName);
+ * w.close();
+ * }
+ */
BytesRef emptyOutput = metadata.getEmptyOutput();
if (rootCode.equals(emptyOutput) == false) {
// TODO: this branch is never taken
diff --git a/lucene/backward-codecs/src/java/overview.html b/lucene/backward-codecs/src/java/overview.html
index 5b9849aa352..fd343e954de 100644
--- a/lucene/backward-codecs/src/java/overview.html
+++ b/lucene/backward-codecs/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/benchmark/src/java/overview.html b/lucene/benchmark/src/java/overview.html
index 57feea4ac92..e7ec8426fd9 100644
--- a/lucene/benchmark/src/java/overview.html
+++ b/lucene/benchmark/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/classification/src/java/overview.html b/lucene/classification/src/java/overview.html
index a27bc1696bb..bded6614170 100644
--- a/lucene/classification/src/java/overview.html
+++ b/lucene/classification/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
index 5bb8b533d88..83c545c4bcf 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
@@ -1256,13 +1256,13 @@ public final class DirectPostingsFormat extends PostingsFormat {
}
/*
- if (DEBUG) {
- System.out.println(" check ord=" + termOrd + " term[" + stateUpto + "]=" + (char) label + "(" + label + ") term=" + new BytesRef(terms[termOrd].term).utf8ToString() + " trans " +
- (char) state.transitionMin + "(" + state.transitionMin + ")" + "-" + (char) state.transitionMax + "(" + state.transitionMax + ") nextChange=+" + (state.changeOrd - termOrd) + " skips=" + (skips == null ? "null" : Arrays.toString(skips)));
- System.out.println(" check ord=" + termOrd + " term[" + stateUpto + "]=" + Integer.toHexString(label) + "(" + label + ") term=" + new BytesRef(termBytes, termOffset, termLength) + " trans " +
- Integer.toHexString(state.transitionMin) + "(" + state.transitionMin + ")" + "-" + Integer.toHexString(state.transitionMax) + "(" + state.transitionMax + ") nextChange=+" + (state.changeOrd - termOrd) + " skips=" + (skips == null ? "null" : Arrays.toString(skips)));
- }
- */
+ * if (DEBUG) {
+ * System.out.println(" check ord=" + termOrd + " term[" + stateUpto + "]=" + (char) label + "(" + label + ") term=" + new BytesRef(terms[termOrd].term).utf8ToString() + " trans " +
+ * (char) state.transitionMin + "(" + state.transitionMin + ")" + "-" + (char) state.transitionMax + "(" + state.transitionMax + ") nextChange=+" + (state.changeOrd - termOrd) + " skips=" + (skips == null ? "null" : Arrays.toString(skips)));
+ * System.out.println(" check ord=" + termOrd + " term[" + stateUpto + "]=" + Integer.toHexString(label) + "(" + label + ") term=" + new BytesRef(termBytes, termOffset, termLength) + " trans " +
+ * Integer.toHexString(state.transitionMin) + "(" + state.transitionMin + ")" + "-" + Integer.toHexString(state.transitionMax) + "(" + state.transitionMax + ") nextChange=+" + (state.changeOrd - termOrd) + " skips=" + (skips == null ? "null" : Arrays.toString(skips)));
+ * }
+ */
final int targetLabel = state.transitionMin;
diff --git a/lucene/codecs/src/java/overview.html b/lucene/codecs/src/java/overview.html
index 25a479b57b0..84ed5598bc8 100644
--- a/lucene/codecs/src/java/overview.html
+++ b/lucene/codecs/src/java/overview.html
@@ -1,22 +1,22 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
- <title>Apache Lucene - Codecs</title>
+ <title>Apache Lucene - Codecs</title>
</head>
<body>
Collection of useful codec, postings format and terms dictionary implementations.
diff --git a/lucene/core.tests/src/java/overview.html b/lucene/core.tests/src/java/overview.html
index e71200a7af4..cde940273f1 100644
--- a/lucene/core.tests/src/java/overview.html
+++ b/lucene/core.tests/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/core/src/generated/jdk/README.md b/lucene/core/src/generated/jdk/README.md
index c0e2f314cbb..f454b2c5431 100644
--- a/lucene/core/src/generated/jdk/README.md
+++ b/lucene/core/src/generated/jdk/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Generated Java API signatures files
diff --git a/lucene/core/src/java/org/apache/lucene/search/comparators/TermOrdValComparator.java b/lucene/core/src/java/org/apache/lucene/search/comparators/TermOrdValComparator.java
index e97d8eb97bd..866528dbee6 100644
--- a/lucene/core/src/java/org/apache/lucene/search/comparators/TermOrdValComparator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/comparators/TermOrdValComparator.java
@@ -49,33 +49,43 @@ import org.apache.lucene.util.PriorityQueue;
*/
public class TermOrdValComparator extends FieldComparator<BytesRef> {
- /* Ords for each slot.
- @lucene.internal */
+ /*
+ * Ords for each slot.
+ * @lucene.internal
+ */
final int[] ords;
- /* Values for each slot.
- @lucene.internal */
+ /*
+ * Values for each slot.
+ * @lucene.internal
+ */
final BytesRef[] values;
private final BytesRefBuilder[] tempBRs;
- /* Which reader last copied a value into the slot. When
- we compare two slots, we just compare-by-ord if the
- readerGen is the same; else we must compare the
- values (slower).
- @lucene.internal */
+ /*
+ * Which reader last copied a value into the slot. When
+ * we compare two slots, we just compare-by-ord if the
+ * readerGen is the same; else we must compare the
+ * values (slower).
+ * @lucene.internal
+ */
final int[] readerGen;
- /* Gen of current reader we are on.
- @lucene.internal */
+ /*
+ * Gen of current reader we are on.
+ * @lucene.internal
+ */
int currentReaderGen = -1;
private final String field;
private final boolean reverse;
private final boolean sortMissingLast;
- /* Bottom value (same as values[bottomSlot] once
- bottomSlot is set). Cached for faster compares.
- @lucene.internal */
+ /*
+ * Bottom value (same as values[bottomSlot] once
+ * bottomSlot is set). Cached for faster compares.
+ * @lucene.internal
+ */
BytesRef bottomValue;
/* Bottom slot, or -1 if queue isn't full yet */
diff --git a/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswGraphBuilder.java b/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswGraphBuilder.java
index 5ded543e48a..cd437069ff2 100644
--- a/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswGraphBuilder.java
+++ b/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswGraphBuilder.java
@@ -295,23 +295,23 @@ public class HnswGraphBuilder implements HnswBuilder {
@Override
public void addGraphNode(int node) throws IOException {
/*
- Note: this implementation is thread safe when graph size is fixed (e.g. when merging)
- The process of adding a node is roughly:
- 1. Add the node to all level from top to the bottom, but do not connect it to any other node,
- nor try to promote itself to an entry node before the connection is done. (Unless the graph is empty
- and this is the first node, in that case we set the entry node and return)
- 2. Do the search from top to bottom, remember all the possible neighbours on each level the node
- is on.
- 3. Add the neighbor to the node from bottom to top level, when adding the neighbour,
- we always add all the outgoing links first before adding incoming link such that
- when a search visits this node, it can always find a way out
- 4. If the node has level that is less or equal to graph level, then we're done here.
- If the node has level larger than graph level, then we need to promote the node
- as the entry node. If, while we add the node to the graph, the entry node has changed
- (which means the graph level has changed as well), we need to reinsert the node
- to the newly introduced levels (repeating step 2,3 for new levels) and again try to
- promote the node to entry node.
- */
+ * Note: this implementation is thread safe when graph size is fixed (e.g. when merging)
+ * The process of adding a node is roughly:
+ * 1. Add the node to all level from top to the bottom, but do not connect it to any other node,
+ * nor try to promote itself to an entry node before the connection is done. (Unless the graph is empty
+ * and this is the first node, in that case we set the entry node and return)
+ * 2. Do the search from top to bottom, remember all the possible neighbours on each level the node
+ * is on.
+ * 3. Add the neighbor to the node from bottom to top level, when adding the neighbour,
+ * we always add all the outgoing links first before adding incoming link such that
+ * when a search visits this node, it can always find a way out
+ * 4. If the node has level that is less or equal to graph level, then we're done here.
+ * If the node has level larger than graph level, then we need to promote the node
+ * as the entry node. If, while we add the node to the graph, the entry node has changed
+ * (which means the graph level has changed as well), we need to reinsert the node
+ * to the newly introduced levels (repeating step 2,3 for new levels) and again try to
+ * promote the node to entry node.
+ */
UpdateableRandomVectorScorer scorer = scorerSupplier.scorer();
scorer.setScoringOrdinal(node);
addGraphNodeInternal(node, scorer, null);
diff --git a/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswUtil.java b/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswUtil.java
index 9540a972fb2..f316048a04c 100644
--- a/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswUtil.java
+++ b/lucene/core/src/java/org/apache/lucene/util/hnsw/HnswUtil.java
@@ -40,13 +40,13 @@ public class HnswUtil {
private HnswUtil() {}
/*
- For each level, check rooted components from previous level nodes, which are entry
- points with the goal that each node should be reachable from *some* entry point. For each entry
- point, compute a spanning tree, recording the nodes in a single shared bitset.
-
- Also record a bitset marking nodes that are not full to be used when reconnecting in order to
- limit the search to include non-full nodes only.
- */
+ * For each level, check rooted components from previous level nodes, which are entry
+ * points with the goal that each node should be reachable from *some* entry point. For each entry
+ * point, compute a spanning tree, recording the nodes in a single shared bitset.
+ *
+ * Also record a bitset marking nodes that are not full to be used when reconnecting in order to
+ * limit the search to include non-full nodes only.
+ */
/** Returns true if every node on every level is reachable from node 0. */
static boolean isRooted(HnswGraph knnValues) throws IOException {
diff --git a/lucene/core/src/java/overview.html b/lucene/core/src/java/overview.html
index f9e2f6d5d3f..07a988bae4c 100644
--- a/lucene/core/src/java/overview.html
+++ b/lucene/core/src/java/overview.html
@@ -1,22 +1,22 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
- <title>Apache Lucene API</title>
+ <title>Apache Lucene API</title>
</head>
<body>
@@ -26,9 +26,10 @@ search across high-dimensionality vectors, spell correction or query suggestions
Here's a simple example how to use Lucene for indexing and searching (using JUnit
to check if the results are what we expect):</p>
-<!-- code comes from org.apache.lucene.TestDemo.
- See LUCENE-8481 for reasons why it's out of sync with the code.
- -->
+<!--
+code comes from org.apache.lucene.TestDemo.
+See LUCENE-8481 for reasons why it's out of sync with the code.
+-->
<pre class="prettyprint">
Analyzer analyzer = new StandardAnalyzer();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
index 3a4a901dc4f..74c0a94af93 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
@@ -160,19 +160,19 @@ public class TestMultiFields extends LuceneTestCase {
}
/*
- private void verify(IndexReader r, String term, List<Integer> expected) throws Exception {
- DocsEnum docs = _TestUtil.docs(random, r,
- "field",
- new BytesRef(term),
- MultiLeafReader.getLiveDocs(r),
- null,
- false);
- for(int docID : expected) {
- assertEquals(docID, docs.nextDoc());
- }
- assertEquals(docs.NO_MORE_DOCS, docs.nextDoc());
- }
- */
+ * private void verify(IndexReader r, String term, List<Integer> expected) throws Exception {
+ * DocsEnum docs = _TestUtil.docs(random, r,
+ * "field",
+ * new BytesRef(term),
+ * MultiLeafReader.getLiveDocs(r),
+ * null,
+ * false);
+ * for(int docID : expected) {
+ * assertEquals(docID, docs.nextDoc());
+ * }
+ * assertEquals(docs.NO_MORE_DOCS, docs.nextDoc());
+ * }
+ */
public void testSeparateEnums() throws Exception {
Directory dir = newDirectory();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
index 873145dc155..1fd7c1f4f16 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
@@ -181,14 +181,14 @@ public class TestTransactionRollback extends LuceneTestCase {
int last = Integer.parseInt(lastVal);
if (last > rollbackPoint) {
/*
- System.out.print("\tRolling back commit point:" +
- " UserData="+commit.getUserData() +") ("+(commits.size()-1)+" commit points left) files=");
- Collection files = commit.getFileNames();
- for (Iterator iterator2 = files.iterator(); iterator2.hasNext();) {
- System.out.print(" "+iterator2.next());
- }
- System.out.println();
- */
+ * System.out.print("\tRolling back commit point:" +
+ * " UserData="+commit.getUserData() +") ("+(commits.size()-1)+" commit points left) files=");
+ * Collection files = commit.getFileNames();
+ * for (Iterator iterator2 = files.iterator(); iterator2.hasNext();) {
+ * System.out.print(" "+iterator2.next());
+ * }
+ * System.out.println();
+ */
commit.delete();
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
index dab1e165113..71f54795aaa 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
@@ -116,16 +116,16 @@ public class TestElevationComparator extends LuceneTestCase {
}
/*
- StoredFields storedFields = searcher.storedFields();
- for (int i = 0; i < nDocsReturned; i++) {
- ScoreDoc scoreDoc = topDocs.scoreDocs[i];
- ids[i] = scoreDoc.doc;
- scores[i] = scoreDoc.score;
- documents[i] = storedFields.document(ids[i]);
- System.out.println("ids[i] = " + ids[i]);
- System.out.println("documents[i] = " + documents[i]);
- System.out.println("scores[i] = " + scores[i]);
- }
+ * StoredFields storedFields = searcher.storedFields();
+ * for (int i = 0; i < nDocsReturned; i++) {
+ * ScoreDoc scoreDoc = topDocs.scoreDocs[i];
+ * ids[i] = scoreDoc.doc;
+ * scores[i] = scoreDoc.score;
+ * documents[i] = storedFields.document(ids[i]);
+ * System.out.println("ids[i] = " + ids[i]);
+ * System.out.println("documents[i] = " + documents[i]);
+ * System.out.println("scores[i] = " + scores[i]);
+ * }
*/
}
diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
index b114070ba9c..26332f4ebc0 100644
--- a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
+++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
@@ -420,11 +420,11 @@ public class TestPackedInts extends LuceneTestCase {
}
/*
- Check if the structures properly handle the case where
- index * bitsPerValue > Integer.MAX_VALUE
-
- NOTE: this test allocates 256 MB
- */
+ * Check if the structures properly handle the case where
+ * index * bitsPerValue > Integer.MAX_VALUE
+ *
+ * NOTE: this test allocates 256 MB
+ */
@Ignore("See LUCENE-4488")
public void testIntOverflow() {
int INDEX = (int) Math.pow(2, 30) + 1;
diff --git a/lucene/demo/src/java/overview.html b/lucene/demo/src/java/overview.html
index 7ddf0ded3d9..40dd1eaf01f 100644
--- a/lucene/demo/src/java/overview.html
+++ b/lucene/demo/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
@@ -99,8 +99,8 @@ applications.</p>
<div class="section">
<p>The files discussed here are linked into this documentation directly:
<ul>
- <li><a href="src-html/org/apache/lucene/demo/IndexFiles.html">IndexFiles.java</a>: code to create a Lucene index.
- <li><a href="src-html/org/apache/lucene/demo/SearchFiles.html">SearchFiles.java</a>: code to search a Lucene index.
+ <li><a href="src-html/org/apache/lucene/demo/IndexFiles.html">IndexFiles.java</a>: code to create a Lucene index.
+ <li><a href="src-html/org/apache/lucene/demo/SearchFiles.html">SearchFiles.java</a>: code to search a Lucene index.
</ul>
</div>
<a id="IndexFiles"></a>
@@ -182,7 +182,7 @@ adding the new document to the index.</p>
quite simple. It primarily collaborates with an
{@link org.apache.lucene.search.IndexSearcher IndexSearcher},
{@link org.apache.lucene.analysis.standard.StandardAnalyzer StandardAnalyzer},
- (which is used in the <a href=
+(which is used in the <a href=
"src-html/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class as well)
and a {@link org.apache.lucene.queryparser.classic.QueryParser QueryParser}. The
query parser is constructed with an analyzer used to interpret your query text
@@ -206,26 +206,26 @@ by score (i.e. relevance).</p>
</div>
<h2 id="Embeddings" class="boxed">Working with vector embeddings</h2>
<div class="section">
- <p>In addition to indexing and searching text, IndexFiles and SearchFiles can also index and search
- numeric vectors derived from that text, known as "embeddings." This demo code uses pre-computed embeddings
- provided by the <a href="https://nlp.stanford.edu/projects/glove/">GloVe</a> project, which are in the public
- domain. The dictionary here is a tiny subset of the full GloVe dataset. It includes only the words that occur
- in the toy data set, and is definitely <i>not ready for production use</i>! If you use this code to create
- a vector index for a larger document set, the indexer will throw an exception because
- a more complete set of embeddings is needed to get reasonable results.
- </p>
+ <p>In addition to indexing and searching text, IndexFiles and SearchFiles can also index and search
+ numeric vectors derived from that text, known as "embeddings." This demo code uses pre-computed embeddings
+ provided by the <a href="https://nlp.stanford.edu/projects/glove/">GloVe</a> project, which are in the public
+ domain. The dictionary here is a tiny subset of the full GloVe dataset. It includes only the words that occur
+ in the toy data set, and is definitely <i>not ready for production use</i>! If you use this code to create
+ a vector index for a larger document set, the indexer will throw an exception because
+ a more complete set of embeddings is needed to get reasonable results.
+ </p>
</div>
<h2 id="Faceting" class="boxed">Working with facets</h2>
<div class="section">
- <p>Lucene also provides aggregation capabilities over the index, e.g. counting results across a category
- (<a href="src-html/org/apache/lucene/demo/facet/SimpleFacetsExample.html">SimpleFacetsExample</a>),
- computing expressions (<a href=
- "src-html/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.html">
- ExpressionAggregationFacetsExample</a>), dynamic ranges (<a href=
- "src-html/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.html">DynamicRangeFacetsExample</a>).
- For more details, see the dedicated
- <a href="org/apache/lucene/demo/facet/package-summary.html">faceting guide</a>.
- </p>
+ <p>Lucene also provides aggregation capabilities over the index, e.g. counting results across a category
+ (<a href="src-html/org/apache/lucene/demo/facet/SimpleFacetsExample.html">SimpleFacetsExample</a>),
+ computing expressions (<a href=
+ "src-html/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.html">
+ ExpressionAggregationFacetsExample</a>), dynamic ranges (<a href=
+ "src-html/org/apache/lucene/demo/facet/DynamicRangeFacetsExample.html">DynamicRangeFacetsExample</a>).
+ For more details, see the dedicated
+ <a href="org/apache/lucene/demo/facet/package-summary.html">faceting guide</a>.
+ </p>
</div>
</body>
</html>
diff --git a/lucene/distribution/binary-release.gradle b/lucene/distribution/binary-release.gradle
index 531c5ef6c7e..971111956bd 100644
--- a/lucene/distribution/binary-release.gradle
+++ b/lucene/distribution/binary-release.gradle
@@ -21,7 +21,7 @@
configure(project(":lucene:distribution")) {
def packageBaseName = "${buildDir}/packages/lucene-${version}"
- // Prepare site documentation dependency for inclusion.
+ // Prepare site documentation dependency for inclusion.
configurations {
docs
diff --git a/lucene/distribution/src/binary-release/README.md b/lucene/distribution/src/binary-release/README.md
index efe33523c96..24f6a04ab23 100644
--- a/lucene/distribution/src/binary-release/README.md
+++ b/lucene/distribution/src/binary-release/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Apache Lucene README file
@@ -23,22 +23,22 @@ This is a binary distribution of Lucene. Lucene is a Java full-text
search engine. Lucene is not a complete application, but rather a code library
and an API that can easily be used to add search capabilities to applications.
- * The Lucene web site is at: https://lucene.apache.org/
- * Please join the Lucene-User mailing list by sending a message to:
- java-user-subscribe@lucene.apache.org
+* The Lucene web site is at: https://lucene.apache.org/
+* Please join the Lucene-User mailing list by sending a message to:
+java-user-subscribe@lucene.apache.org
## Files in this binary distribution
The following sub-folders are included in the binary distribution of Lucene:
* `bin/`:
- Convenience scripts to launch Lucene Luke and other index-maintenance tools.
+Convenience scripts to launch Lucene Luke and other index-maintenance tools.
* `modules/`:
- All binary Lucene Java modules (JARs).
+All binary Lucene Java modules (JARs).
* `modules-thirdparty/`
- Third-party binary modules required to run Lucene Luke.
+Third-party binary modules required to run Lucene Luke.
* `licenses/`
- Third-party licenses and notice files.
+Third-party licenses and notice files.
Please note that this package does not include all the binary dependencies
of all Lucene modules. Up-to-date dependency information for each Lucene
diff --git a/lucene/documentation/src/markdown/index.template.md b/lucene/documentation/src/markdown/index.template.md
index 586be9146ae..da20b935770 100644
--- a/lucene/documentation/src/markdown/index.template.md
+++ b/lucene/documentation/src/markdown/index.template.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
@@ -37,30 +37,30 @@ development of Lucene. The goal is to help you "get started". It does not go int
on some of the conceptual or inner details of Lucene:
* [Lucene demo, its usage, and sources](demo/overview-summary.html#overview.description):
- Tutorial and walk-through of the command-line Lucene demo.
+Tutorial and walk-through of the command-line Lucene demo.
* [Introduction to Lucene's APIs](core/overview-summary.html#overview.description):
- High-level summary of the different Lucene packages. </li>
+High-level summary of the different Lucene packages. </li>
* [Analysis overview](core/org/apache/lucene/analysis/package-summary.html#package.description):
- Introduction to Lucene's analysis API. See also the
- [TokenStream consumer workflow](core/org/apache/lucene/analysis/TokenStream.html).
+Introduction to Lucene's analysis API. See also the
+[TokenStream consumer workflow](core/org/apache/lucene/analysis/TokenStream.html).
## Reference Documents
* [Changes](changes/Changes.html): List of changes in this release.
* [System Requirements](SYSTEM_REQUIREMENTS.html): Minimum and supported Java versions.
* [Migration Guide](MIGRATE.html): What changed in Lucene ${project.majorVersion}; how to migrate code from
- Lucene ${project.majorVersion-1}.x.
+Lucene ${project.majorVersion-1}.x.
* [JRE Version Migration](JRE_VERSION_MIGRATION.html): Information about upgrading between major JRE versions.
* [File Formats](core/org/apache/lucene/codecs/${defaultCodecPackage}/package-summary.html#package.description):
- Guide to the supported index format used by Lucene. This can be customized by using
- [an alternate codec](core/org/apache/lucene/codecs/package-summary.html#package.description).
+Guide to the supported index format used by Lucene. This can be customized by using
+[an alternate codec](core/org/apache/lucene/codecs/package-summary.html#package.description).
* [Search and Scoring in Lucene](core/org/apache/lucene/search/package-summary.html#package.description):
- Introduction to how Lucene scores documents.
+Introduction to how Lucene scores documents.
* [Classic Scoring Formula](core/org/apache/lucene/search/similarities/TFIDFSimilarity.html):
- Formula of Lucene's classic [Vector Space](https://en.wikipedia.org/wiki/Vector_Space_Model) implementation
- (look [here](core/org/apache/lucene/search/similarities/package-summary.html#package.description) for other models).
+Formula of Lucene's classic [Vector Space](https://en.wikipedia.org/wiki/Vector_Space_Model) implementation
+(look [here](core/org/apache/lucene/search/similarities/package-summary.html#package.description) for other models).
* [Classic QueryParser Syntax](queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package.description):
- Overview of the Classic QueryParser's syntax and features.
+Overview of the Classic QueryParser's syntax and features.
## API Javadocs
diff --git a/lucene/expressions/src/java/overview.html b/lucene/expressions/src/java/overview.html
index 03917ff24ee..834fa57f15a 100644
--- a/lucene/expressions/src/java/overview.html
+++ b/lucene/expressions/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/facet/docs/FacetSets.adoc b/lucene/facet/docs/FacetSets.adoc
index c95a25b1bda..a491e7dcc4c 100644
--- a/lucene/facet/docs/FacetSets.adoc
+++ b/lucene/facet/docs/FacetSets.adoc
@@ -48,18 +48,18 @@ as filter parts that fit only a certain manufacturer or year. Few example docume
[source]
----
{
- "type": "Wiper Blades V1",
- "models": [
- { "manufaturer": "Ford", "year": 2010 },
- { "manufacturer": "Chevy", "year": 2011 }
- ]
+ "type": "Wiper Blades V1",
+ "models": [
+ { "manufaturer": "Ford", "year": 2010 },
+ { "manufacturer": "Chevy", "year": 2011 }
+ ]
}
{
- "type": "Wiper Blades V2",
- "models": [
- { "manufaturer": "Ford", "year": 2011 },
- { "manufacturer": "Chevy", "year": 2010 }
- ]
+ "type": "Wiper Blades V2",
+ "models": [
+ { "manufaturer": "Ford", "year": 2011 },
+ { "manufacturer": "Chevy", "year": 2010 }
+ ]
}
----
diff --git a/lucene/facet/src/java/overview.html b/lucene/facet/src/java/overview.html
index f57939efe1f..de9a6131139 100644
--- a/lucene/facet/src/java/overview.html
+++ b/lucene/facet/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head><title>facet</title></head>
diff --git a/lucene/grouping/src/java/overview.html b/lucene/grouping/src/java/overview.html
index 6925f75e4df..07769f29d9a 100644
--- a/lucene/grouping/src/java/overview.html
+++ b/lucene/grouping/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<body>
diff --git a/lucene/highlighter/src/java/overview.html b/lucene/highlighter/src/java/overview.html
index 9c0edf81974..fc495c6d47e 100644
--- a/lucene/highlighter/src/java/overview.html
+++ b/lucene/highlighter/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/join/src/java/overview.html b/lucene/join/src/java/overview.html
index ebe2143666a..2ae135dc961 100644
--- a/lucene/join/src/java/overview.html
+++ b/lucene/join/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<body>
diff --git a/lucene/luke/README.md b/lucene/luke/README.md
index 2b381fb907e..b2e6a88369e 100644
--- a/lucene/luke/README.md
+++ b/lucene/luke/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Luke
diff --git a/lucene/luke/src/distribution/README.md b/lucene/luke/src/distribution/README.md
index 4ff8bc717a6..e3ae680c3bc 100644
--- a/lucene/luke/src/distribution/README.md
+++ b/lucene/luke/src/distribution/README.md
@@ -13,7 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
# Luke
diff --git a/lucene/memory/src/java/overview.html b/lucene/memory/src/java/overview.html
index dd32d219947..c9a364ae912 100644
--- a/lucene/memory/src/java/overview.html
+++ b/lucene/memory/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/misc/src/java/overview.html b/lucene/misc/src/java/overview.html
index ec54caea5a4..07272c79707 100644
--- a/lucene/misc/src/java/overview.html
+++ b/lucene/misc/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/monitor/src/java/overview.html b/lucene/monitor/src/java/overview.html
index 906636fbcf4..ba1f8067c06 100644
--- a/lucene/monitor/src/java/overview.html
+++ b/lucene/monitor/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
index 75091294b48..455188fe358 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
@@ -271,7 +271,7 @@ public class TestPayloadCheckQuery extends LuceneTestCase {
stringGT2,
alignedIntArray(
"""
- 155, 255, 355, 455, 555, 655, 755, 855, 955,
+ 155, 255, 355, 455, 555, 655, 755, 855, 955,
1055, 1155, 1255, 1355, 1455, 1555, 1655, 1755, 1855, 1955
"""));
SpanQuery stringGTE2 =
@@ -284,7 +284,7 @@ public class TestPayloadCheckQuery extends LuceneTestCase {
stringGTE2,
alignedIntArray(
"""
- 55, 155, 255, 355, 455, 555, 655, 755, 855, 955,
+ 55, 155, 255, 355, 455, 555, 655, 755, 855, 955,
1055, 1155, 1255, 1355, 1455, 1555, 1655, 1755, 1855, 1955
"""));
diff --git a/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html b/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html
index 3408fa98658..55c8f77db10 100644
--- a/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html
+++ b/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html
@@ -28,19 +28,18 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
<p>BooleanQuerys implement Boolean logic which controls how multiple Clauses should be interpreted.
Some clauses may represent optional Query criteria while others represent mandatory criteria.</p><p><span class='inTextTitle'>Example:</span> <em>Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo"</em>
</p><pre>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery>sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
-
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery>sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<BooleanQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><BooleanQuery>'s children</th></tr>
@@ -139,17 +138,17 @@ Queries that are cached as filters obviously retain none of the scoring informat
a Boolean yes/no record of which documents matched.</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
RAM to eliminate the cost of building this filter from disk for every query</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <CachedFilter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </CachedFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <CachedFilter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </CachedFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<CachedFilter>'s children">
<thead>
<tr><th class='title' colspan='2'><CachedFilter>'s children</th></tr>
@@ -189,8 +188,8 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>Passes content directly through to the standard LuceneQuery parser see "Lucene Query Syntax"</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about John Smith or John Doe using standard LuceneQuerySyntax</em>
</p><pre>
- <UserQuery>"John Smith" OR "John Doe"</UserQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <UserQuery>"John Smith" OR "John Doe"</UserQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<UserQuery>'s attributes"><tr>
<th class='title' colspan='3'><UserQuery>'s attributes</th>
</tr>
@@ -222,23 +221,23 @@ is a "mustNot" match (Lucene requires at least one positive clause) and..</li>
used to select content rather than its usual role of filtering the results of a query.</li>
</ol></p><p><span class='inTextTitle'>Example:</span> <em>Effectively use a Filter as a query </em>
</p><pre>
- <FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><p class='emptyTagNote'>This element is always empty.</p><a name='TermQuery'></a>
+ <FilteredQuery>
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><p class='emptyTagNote'>This element is always empty.</p><a name='TermQuery'></a>
<br /><table class='elementTitle' summary="TermQuery"><tr><td class='leftElementTitle'>
<TermQuery></td><td class='rightElementTitle'>
Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a href='#CachedFilter'>CachedFilter</a>, <a href='#Query'>Query</a>
</td></tr></table>
<p>a single term query - no analysis is done of the child text</p><p><span class='inTextTitle'>Example:</span> <em>Match on a primary key</em>
</p><pre>
- <TermQuery fieldName="primaryKey">13424</TermQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <TermQuery fieldName="primaryKey">13424</TermQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<TermQuery>'s attributes"><tr>
<th class='title' colspan='3'><TermQuery>'s attributes</th>
</tr>
@@ -283,8 +282,8 @@ Unlike UserQuery element, this does not parse any special characters to control
of producing a Query parse error given any user input</p><p><span class='inTextTitle'>Example:</span> <em>Match on text from a database description (which may contain characters that
are illegal characters in the standard Lucene Query syntax used in the UserQuery tag</em>
</p><pre>
- <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<TermsQuery>'s attributes"><tr>
<th class='title' colspan='3'><TermsQuery>'s attributes</th>
</tr>
@@ -320,15 +319,15 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>Runs a Query and filters results to only those query matches that also match the Filter element.</p><p><span class='inTextTitle'>Example:</span> <em>Find all documents about Lucene that have a status of "published"</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>Lucene</UserQuery>
- </Query>
- <Filter>
- <TermsFilter fieldName="status">published</TermsFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>Lucene</UserQuery>
+ </Query>
+ <Filter>
+ <TermsFilter fieldName="status">published</TermsFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<FilteredQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><FilteredQuery>'s children</th></tr>
@@ -410,15 +409,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Filter'>Filter</a>, <a href='#C
</td></tr></table>
<p>Filter used to limit query results to documents matching a range of field values</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about banks from the last 10 years</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote>
<table summary="<RangeFilter>'s attributes"><tr>
<th class='title' colspan='3'><RangeFilter>'s attributes</th>
</tr>
@@ -459,8 +458,8 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>A Query that matches numeric values within a specified range.</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about people who are aged 20-25</em>
</p><pre>
- <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
- </pre><p></p><blockquote>
+ <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
+</pre><p></p><blockquote>
<table summary="<NumericRangeQuery>'s attributes"><tr>
<th class='title' colspan='3'><NumericRangeQuery>'s attributes</th>
</tr>
@@ -511,15 +510,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Filter'>Filter</a>, <a href='#C
</td></tr></table>
<p>A Filter that only accepts numeric values within a specified range</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about people who are aged 20-25</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>person</UserQuery>
- </Query>
- <Filter>
- <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>person</UserQuery>
+ </Query>
+ <Filter>
+ <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote>
<table summary="<NumericRangeFilter>'s attributes"><tr>
<th class='title' colspan='3'><NumericRangeFilter>'s attributes</th>
</tr>
@@ -570,19 +569,19 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>A single term used in a SpanQuery. These clauses are the building blocks for more complex "span" queries which test word proximity</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms close to each other about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanTerm>'s attributes"><tr>
<th class='title' colspan='3'><SpanTerm>'s attributes</th>
</tr>
@@ -604,11 +603,11 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
<p>A field-specific analyzer is used here to parse the child text provided in this tag. The SpanTerms produced are ORed in terms of Boolean logic</p><p><span class='inTextTitle'>Example:</span> <em>Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
using words describing a fatality near to references to miners</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
- <SpanOrTerms>miner mining miners</SpanOrTerms>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
+ <SpanOrTerms>miner mining miners</SpanOrTerms>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanOrTerms>'s attributes"><tr>
<th class='title' colspan='3'><SpanOrTerms>'s attributes</th>
</tr>
@@ -629,19 +628,19 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>Takes any number of child queries from the Span family</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms close to each other about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanOr>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanOr>'s children</th></tr>
@@ -692,19 +691,19 @@ Attribute of <a href='#SpanNear'>SpanNear</a>
</td></tr></table>
<p>defines the maximum distance between Span elements where distance is expressed as word number, not byte offset</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms within 8 words of each other talking about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><p><span class='inTextTitle'>Required</span></p><a name='SpanNear_inOrder'></a>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><p><span class='inTextTitle'>Required</span></p><a name='SpanNear_inOrder'></a>
<br /><table class='attributeTitle' summary="inOrder"><tr><td class='leftAttributeTitle'>
@inOrder</td><td class='rightAttributeTitle'>
Attribute of <a href='#SpanNear'>SpanNear</a>
@@ -716,10 +715,10 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>Looks for a SpanQuery match occuring near the beginning of a document</p><p><span class='inTextTitle'>Example:</span> <em>Find letters where the first 50 words talk about a resignation:</em>
</p><pre>
- <SpanFirst end="50">
- <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
- </SpanFirst>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanFirst end="50">
+ <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
+ </SpanFirst>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanFirst>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanFirst>'s children</th></tr>
@@ -759,18 +758,18 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>Finds documents matching a SpanQuery but not if matching another SpanQuery</p><p><span class='inTextTitle'>Example:</span> <em>Find documents talking about social services but not containing the word "public"</em>
</p><pre>
- <SpanNot fieldName="text">
- <Include>
- <SpanNear slop="2" inOrder="true">
- <SpanTerm>social</SpanTerm>
- <SpanTerm>services</SpanTerm>
- </SpanNear>
- </Include>
- <Exclude>
- <SpanTerm>public</SpanTerm>
- </Exclude>
- </SpanNot>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNot fieldName="text">
+ <Include>
+ <SpanNear slop="2" inOrder="true">
+ <SpanTerm>social</SpanTerm>
+ <SpanTerm>services</SpanTerm>
+ </SpanNear>
+ </Include>
+ <Exclude>
+ <SpanTerm>public</SpanTerm>
+ </Exclude>
+ </SpanNot>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanNot>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanNot>'s children</th></tr>
@@ -830,10 +829,10 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
</td></tr></table>
<p>a utility tag to wrap any filter as a query</p><p><span class='inTextTitle'>Example:</span> <em> Find all documents from the last 10 years </em>
</p><pre>
- <ConstantScoreQuery>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </ConstantScoreQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <ConstantScoreQuery>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </ConstantScoreQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<ConstantScoreQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><ConstantScoreQuery>'s children</th></tr>
@@ -870,12 +869,12 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
variants (typically misspellings) more highly. This can be a useful default search mode for processing user input where the end user
is not expected to know about the standard query operators for fuzzy, boolean or phrase logic found in UserQuery</p><p><span class='inTextTitle'>Example:</span> <em>Search for information about the Sumitomo bank, where the end user has mis-spelt the name</em>
</p><pre>
- <FuzzyLikeThisQuery>
- <Field fieldName="contents">
- Sumitimo bank
- </Field>
- </FuzzyLikeThisQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FuzzyLikeThisQuery>
+ <Field fieldName="contents">
+ Sumitimo bank
+ </Field>
+ </FuzzyLikeThisQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<FuzzyLikeThisQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><FuzzyLikeThisQuery>'s children</th></tr>
@@ -950,23 +949,23 @@ Child of <a href='#BoostQuery'>BoostQuery</a>, <a href='#Clause'>Clause</a>, <a
performance cost of the query is substantially reduced and large bodies of text can be used as example content.</p><p><span class='inTextTitle'>Example:</span> <em>Use a block of text as an example of the type of content to be found, ignoring the "Reuters" word which
appears commonly in the index.</em>
</p><pre>
- <LikeThisQuery percentTermsToMatch="5" stopWords="Reuters">
- IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
- positions they had initially occupied when they launched a new offensive near the southern port of
- Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
- and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
- (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
- unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
- assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
- their advance until they purge the last foothold" occupied by the Iranians, it said.
- (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
- The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
- during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
- Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
- offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
- the communique said. Reuters 3;
- </LikeThisQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <LikeThisQuery percentTermsToMatch="5" stopWords="Reuters">
+ IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
+ positions they had initially occupied when they launched a new offensive near the southern port of
+ Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
+ and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
+ (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
+ unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
+ assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
+ their advance until they purge the last foothold" occupied by the Iranians, it said.
+ (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
+ The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
+ during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
+ Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
+ offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
+ the communique said. Reuters 3;
+ </LikeThisQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<LikeThisQuery>'s attributes"><tr>
<th class='title' colspan='3'><LikeThisQuery>'s attributes</th>
</tr>
@@ -1016,21 +1015,21 @@ Unlike a regular BooleanQuery the boost can be less than 1 to produce a subtract
on the match score.</p><p><span class='inTextTitle'>Example:</span> <em>Find documents about banks, preferably related to mergers, and preferably not about "World bank"</em>
</p><pre>
<BoostingQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
- <BoostQuery boost="0.01">
- <UserQuery>"world bank"</UserQuery>
- </BoostQuery>
- </BoostingQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ </Query>
+ <BoostQuery boost="0.01">
+ <UserQuery>"world bank"</UserQuery>
+ </BoostQuery>
+ </BoostingQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<BoostingQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><BoostingQuery>'s children</th></tr>
@@ -1105,15 +1104,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Filter'>Filter</a>, <a href='#C
</td></tr></table>
<p>Removes duplicated documents from results where "duplicate" means documents share a value for a particular field such as a primary key</p><p><span class='inTextTitle'>Example:</span> <em>Find the latest version of each web page that mentions "Lucene"</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <TermQuery fieldName="text">lucene</TermQuery>
- </Query>
+ <FilteredQuery>
+ <Query>
+ <TermQuery fieldName="text">lucene</TermQuery>
+ </Query>
<Filter>
- <DuplicateFilter fieldName="url" keepMode="last"/>
+ <DuplicateFilter fieldName="url" keepMode="last"/>
</Filter>
- </FilteredQuery>
- </pre><p></p><blockquote>
+ </FilteredQuery>
+</pre><p></p><blockquote>
<table summary="<DuplicateFilter>'s attributes"><tr>
<th class='title' colspan='3'><DuplicateFilter>'s attributes</th>
</tr>
@@ -1147,15 +1146,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Filter'>Filter</a>, <a href='#C
</td></tr></table>
<p>Processes child text using a field-specific choice of Analyzer to produce a set of terms that are then used as a filter.</p><p><span class='inTextTitle'>Example:</span> <em>Find documents talking about Lucene written on a Monday or a Friday</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <TermQuery fieldName="text">lucene</TermQuery>
- </Query>
- <Filter>
- <TermsFilter fieldName="dayOfWeek">monday friday</TermsFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <TermQuery fieldName="text">lucene</TermQuery>
+ </Query>
+ <Filter>
+ <TermsFilter fieldName="dayOfWeek">monday friday</TermsFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<TermsFilter>'s attributes"><tr>
<th class='title' colspan='3'><TermsFilter>'s attributes</th>
</tr>
@@ -1177,25 +1176,25 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Filter'>Filter</a>, <a href='#C
<p>A Filter equivalent to BooleanQuery that applies Boolean logic to Clauses containing Filters.
Unlike BooleanQuery a BooleanFilter can contain a single "mustNot" clause.</p><p><span class='inTextTitle'>Example:</span> <em>Find documents from the first quarter of this year or last year that are not in "draft" status</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
- <Filter>
- <BooleanFilter>
- <Clause occurs="should">
- <RangeFilter fieldName="date" lowerTerm="20070101" upperTerm="20070401"/>
- </Clause>
- <Clause occurs="should">
- <RangeFilter fieldName="date" lowerTerm="20060101" upperTerm="20060401"/>
- </Clause>
- <Clause occurs="mustNot">
- <TermsFilter fieldName="status">draft</TermsFilter>
- </Clause>
- </BooleanFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+ <Filter>
+ <BooleanFilter>
+ <Clause occurs="should">
+ <RangeFilter fieldName="date" lowerTerm="20070101" upperTerm="20070401"/>
+ </Clause>
+ <Clause occurs="should">
+ <RangeFilter fieldName="date" lowerTerm="20060101" upperTerm="20060401"/>
+ </Clause>
+ <Clause occurs="mustNot">
+ <TermsFilter fieldName="status">draft</TermsFilter>
+ </Clause>
+ </BooleanFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<BooleanFilter>'s children">
<thead>
<tr><th class='title' colspan='2'><BooleanFilter>'s children</th></tr>
diff --git a/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html b/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
index 5117abe1c8f..49500707508 100644
--- a/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
+++ b/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
@@ -46,19 +46,18 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#Cac
<p>BooleanQuerys implement Boolean logic which controls how multiple Clauses should be interpreted.
Some clauses may represent optional Query criteria while others represent mandatory criteria.</p><p><span class='inTextTitle'>Example:</span> <em>Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo"</em>
</p><pre>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery>sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
-
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery>sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<BooleanQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><BooleanQuery>'s children</th></tr>
@@ -151,17 +150,17 @@ Queries that are cached as filters obviously retain none of the scoring informat
a Boolean yes/no record of which documents matched.</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
RAM to eliminate the cost of building this filter from disk for every query</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <CachedFilter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </CachedFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <CachedFilter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </CachedFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<CachedFilter>'s children">
<thead>
<tr><th class='title' colspan='2'><CachedFilter>'s children</th></tr>
@@ -195,8 +194,8 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#Cac
</td></tr></table>
<p>Passes content directly through to the standard LuceneQuery parser see "Lucene Query Syntax"</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about John Smith or John Doe using standard LuceneQuerySyntax</em>
</p><pre>
- <UserQuery>"John Smith" OR "John Doe"</UserQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <UserQuery>"John Smith" OR "John Doe"</UserQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<UserQuery>'s attributes"><tr>
<th class='title' colspan='3'><UserQuery>'s attributes</th>
</tr>
@@ -228,23 +227,23 @@ is a "mustNot" match (Lucene requires at least one positive clause) and..</li>
used to select content rather than its usual role of filtering the results of a query.</li>
</ol></p><p><span class='inTextTitle'>Example:</span> <em>Effectively use a Filter as a query </em>
</p><pre>
- <FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><p class='emptyTagNote'>This element is always empty.</p><a name='TermQuery'></a>
+ <FilteredQuery>
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><p class='emptyTagNote'>This element is always empty.</p><a name='TermQuery'></a>
<br /><table class='elementTitle' summary="TermQuery"><tr><td class='leftElementTitle'>
<TermQuery></td><td class='rightElementTitle'>
Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#CachedFilter'>CachedFilter</a>
</td></tr></table>
<p>a single term query - no analysis is done of the child text</p><p><span class='inTextTitle'>Example:</span> <em>Match on a primary key</em>
</p><pre>
- <TermQuery fieldName="primaryKey">13424</TermQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <TermQuery fieldName="primaryKey">13424</TermQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<TermQuery>'s attributes"><tr>
<th class='title' colspan='3'><TermQuery>'s attributes</th>
</tr>
@@ -289,8 +288,8 @@ Unlike UserQuery element, this does not parse any special characters to control
of producing a Query parse error given any user input</p><p><span class='inTextTitle'>Example:</span> <em>Match on text from a database description (which may contain characters that
are illegal characters in the standard Lucene Query syntax used in the UserQuery tag</em>
</p><pre>
- <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<TermsQuery>'s attributes"><tr>
<th class='title' colspan='3'><TermsQuery>'s attributes</th>
</tr>
@@ -326,15 +325,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#Cac
</td></tr></table>
<p>Runs a Query and filters results to only those query matches that also match the Filter element.</p><p><span class='inTextTitle'>Example:</span> <em>Find all documents about Lucene that have a status of "published"</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>Lucene</UserQuery>
- </Query>
- <Filter>
- <TermsFilter fieldName="status">published</TermsFilter>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>Lucene</UserQuery>
+ </Query>
+ <Filter>
+ <TermsFilter fieldName="status">published</TermsFilter>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<FilteredQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><FilteredQuery>'s children</th></tr>
@@ -410,15 +409,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#ConstantScoreQuery'>ConstantSco
</td></tr></table>
<p>Filter used to limit query results to documents matching a range of field values</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about banks from the last 10 years</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote>
<table summary="<RangeFilter>'s attributes"><tr>
<th class='title' colspan='3'><RangeFilter>'s attributes</th>
</tr>
@@ -459,8 +458,8 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#Cac
</td></tr></table>
<p>A Query that matches numeric values within a specified range.</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about people who are aged 20-25</em>
</p><pre>
- <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
- </pre><p></p><blockquote>
+ <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
+</pre><p></p><blockquote>
<table summary="<NumericRangeQuery>'s attributes"><tr>
<th class='title' colspan='3'><NumericRangeQuery>'s attributes</th>
</tr>
@@ -511,15 +510,15 @@ Child of <a href='#Clause'>Clause</a>, <a href='#ConstantScoreQuery'>ConstantSco
</td></tr></table>
<p>A Filter that only accepts numeric values within a specified range</p><p><span class='inTextTitle'>Example:</span> <em>Search for documents about people who are aged 20-25</em>
</p><pre>
- <FilteredQuery>
- <Query>
- <UserQuery>person</UserQuery>
- </Query>
- <Filter>
- <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
- </Filter>
- </FilteredQuery>
- </pre><p></p><blockquote>
+ <FilteredQuery>
+ <Query>
+ <UserQuery>person</UserQuery>
+ </Query>
+ <Filter>
+ <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
+ </Filter>
+ </FilteredQuery>
+</pre><p></p><blockquote>
<table summary="<NumericRangeFilter>'s attributes"><tr>
<th class='title' colspan='3'><NumericRangeFilter>'s attributes</th>
</tr>
@@ -570,19 +569,19 @@ Child of <a href='#Include'>Include</a>, <a href='#Clause'>Clause</a>, <a href='
</td></tr></table>
<p>A single term used in a SpanQuery. These clauses are the building blocks for more complex "span" queries which test word proximity</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms close to each other about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanTerm>'s attributes"><tr>
<th class='title' colspan='3'><SpanTerm>'s attributes</th>
</tr>
@@ -604,11 +603,11 @@ Child of <a href='#Include'>Include</a>, <a href='#Clause'>Clause</a>, <a href='
<p>A field-specific analyzer is used here to parse the child text provided in this tag. The SpanTerms produced are ORed in terms of Boolean logic</p><p><span class='inTextTitle'>Example:</span> <em>Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
using words describing a fatality near to references to miners</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
- <SpanOrTerms>miner mining miners</SpanOrTerms>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
+ <SpanOrTerms>miner mining miners</SpanOrTerms>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanOrTerms>'s attributes"><tr>
<th class='title' colspan='3'><SpanOrTerms>'s attributes</th>
</tr>
@@ -629,19 +628,19 @@ Child of <a href='#Include'>Include</a>, <a href='#Clause'>Clause</a>, <a href='
</td></tr></table>
<p>Takes any number of child queries from the Span family</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms close to each other about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanOr>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanOr>'s children</th></tr>
@@ -692,19 +691,19 @@ Attribute of <a href='#SpanNear'>SpanNear</a>
</td></tr></table>
<p>defines the maximum distance between Span elements where distance is expressed as word number, not byte offset</p><p><span class='inTextTitle'>Example:</span> <em>Find documents using terms within 8 words of each other talking about mining and accidents</em>
</p><pre>
- <SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
- </SpanNear>
- </pre><p></p><p><span class='inTextTitle'>Required</span></p><a name='SpanNear_inOrder'></a>
+ <SpanNear slop="8" inOrder="false" fieldName="text">
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
+ </SpanNear>
+</pre><p></p><p><span class='inTextTitle'>Required</span></p><a name='SpanNear_inOrder'></a>
<br /><table class='attributeTitle' summary="inOrder"><tr><td class='leftAttributeTitle'>
@inOrder</td><td class='rightAttributeTitle'>
Attribute of <a href='#SpanNear'>SpanNear</a>
@@ -716,10 +715,10 @@ Child of <a href='#Include'>Include</a>, <a href='#Clause'>Clause</a>, <a href='
</td></tr></table>
<p>Looks for a SpanQuery match occuring near the beginning of a document</p><p><span class='inTextTitle'>Example:</span> <em>Find letters where the first 50 words talk about a resignation:</em>
</p><pre>
- <SpanFirst end="50">
- <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
- </SpanFirst>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanFirst end="50">
+ <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
+ </SpanFirst>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanFirst>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanFirst>'s children</th></tr>
@@ -759,18 +758,18 @@ Child of <a href='#Include'>Include</a>, <a href='#Clause'>Clause</a>, <a href='
</td></tr></table>
<p>Finds documents matching a SpanQuery but not if matching another SpanQuery</p><p><span class='inTextTitle'>Example:</span> <em>Find documents talking about social services but not containing the word "public"</em>
</p><pre>
- <SpanNot fieldName="text">
- <Include>
- <SpanNear slop="2" inOrder="true">
- <SpanTerm>social</SpanTerm>
- <SpanTerm>services</SpanTerm>
- </SpanNear>
- </Include>
- <Exclude>
- <SpanTerm>public</SpanTerm>
- </Exclude>
- </SpanNot>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <SpanNot fieldName="text">
+ <Include>
+ <SpanNear slop="2" inOrder="true">
+ <SpanTerm>social</SpanTerm>
+ <SpanTerm>services</SpanTerm>
+ </SpanNear>
+ </Include>
+ <Exclude>
+ <SpanTerm>public</SpanTerm>
+ </Exclude>
+ </SpanNot>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<SpanNot>'s children">
<thead>
<tr><th class='title' colspan='2'><SpanNot>'s children</th></tr>
@@ -830,10 +829,10 @@ Child of <a href='#Clause'>Clause</a>, <a href='#Query'>Query</a>, <a href='#Cac
</td></tr></table>
<p>a utility tag to wrap any filter as a query</p><p><span class='inTextTitle'>Example:</span> <em> Find all documents from the last 10 years </em>
</p><pre>
- <ConstantScoreQuery>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </ConstantScoreQuery>
- </pre><p></p><blockquote><table summary='element info'><tr>
+ <ConstantScoreQuery>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </ConstantScoreQuery>
+</pre><p></p><blockquote><table summary='element info'><tr>
<td class='construct'><table summary="<ConstantScoreQuery>'s children">
<thead>
<tr><th class='title' colspan='2'><ConstantScoreQuery>'s children</th></tr>
diff --git a/lucene/queryparser/docs/xml/index.html b/lucene/queryparser/docs/xml/index.html
index 14a5bdaf935..6aaa4167a02 100644
--- a/lucene/queryparser/docs/xml/index.html
+++ b/lucene/queryparser/docs/xml/index.html
@@ -3,9 +3,9 @@
<title>DTDDoc for Lucene XML Query syntax</title>
<link rel='StyleSheet' href='DTDDocStyle.css' type='text/css' media='screen' /></head>
<frameset cols='20%, 80%'>
- <frame src='toc.html' />
- <frame src='intro.html' name='detail' />
- <noframes><body>
+ <frame src='toc.html' />
+ <frame src='intro.html' name='detail' />
+ <noframes><body>
<p class='DTDSource'>Elements - Entities - Source | <a href='intro.html'>Intro</a> - <a href='elementsIndex.html'>Index</a><br /><a href='index.html' target='_top'>FRAMES</a> / <a href='intro.html' target='_top'>NO FRAMES</a></p><h1>Lucene XML Query syntax</h1>
<table border='1' cellspacing='0'>
<tr><td><code><a href='LuceneContribQuery.dtd.html'>LuceneContribQuery.dtd</a></code></td><td>Contrib Lucene</td></tr>
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
index fc7f9b98557..bf0fcba9ac5 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
@@ -17,40 +17,42 @@
package org.apache.lucene.queryparser.surround.query;
/*
-SpanNearClauseFactory:
-
-Operations:
-
-- create for a field name and an indexreader.
-
-- add a weighted Term
- this should add a corresponding SpanTermQuery, or
- increase the weight of an existing one.
-
-- add a weighted subquery SpanNearQuery
-
-- create a clause for SpanNearQuery from the things added above.
- For this, create an array of SpanQuery's from the added ones.
- The clause normally is a SpanOrQuery over the added subquery SpanNearQuery
- the SpanTermQuery's for the added Term's
-*/
-
-/* When it is necessary to suppress double subqueries as much as possible:
- hashCode() and equals() on unweighted SpanQuery are needed (possibly via getTerms(),
- the terms are individually hashable).
- Idem SpanNearQuery: hash on the subqueries and the slop.
- Evt. merge SpanNearQuery's by adding the weights of the corresponding subqueries.
-*/
-
-/* To be determined:
- Are SpanQuery weights handled correctly during search by Lucene?
- Should the resulting SpanOrQuery be sorted?
- Could other SpanQueries be added for use in this factory:
- - SpanOrQuery: in principle yes, but it only has access to its terms
- via getTerms(); are the corresponding weights available?
- - SpanFirstQuery: treat similar to subquery SpanNearQuery. (ok?)
- - SpanNotQuery: treat similar to subquery SpanNearQuery. (ok?)
-*/
+ * SpanNearClauseFactory:
+ *
+ * Operations:
+ *
+ * - create for a field name and an indexreader.
+ *
+ * - add a weighted Term
+ * this should add a corresponding SpanTermQuery, or
+ * increase the weight of an existing one.
+ *
+ * - add a weighted subquery SpanNearQuery
+ *
+ * - create a clause for SpanNearQuery from the things added above.
+ * For this, create an array of SpanQuery's from the added ones.
+ * The clause normally is a SpanOrQuery over the added subquery SpanNearQuery
+ * the SpanTermQuery's for the added Term's
+ */
+
+/*
+ * When it is necessary to suppress double subqueries as much as possible:
+ * hashCode() and equals() on unweighted SpanQuery are needed (possibly via getTerms(),
+ * the terms are individually hashable).
+ * Idem SpanNearQuery: hash on the subqueries and the slop.
+ * Evt. merge SpanNearQuery's by adding the weights of the corresponding subqueries.
+ */
+
+/*
+ * To be determined:
+ * Are SpanQuery weights handled correctly during search by Lucene?
+ * Should the resulting SpanOrQuery be sorted?
+ * Could other SpanQueries be added for use in this factory:
+ * - SpanOrQuery: in principle yes, but it only has access to its terms
+ * via getTerms(); are the corresponding weights available?
+ * - SpanFirstQuery: treat similar to subquery SpanNearQuery. (ok?)
+ * - SpanNotQuery: treat similar to subquery SpanNearQuery. (ok?)
+ */
import java.io.IOException;
import java.util.HashMap;
diff --git a/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneContribQuery.dtd b/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneContribQuery.dtd
index 7e3d5ca5ccc..3f2edb3cb4c 100644
--- a/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneContribQuery.dtd
+++ b/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneContribQuery.dtd
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!--
@@ -24,17 +24,17 @@
The features added are:
<ul>
<li><a href="#LikeThisQuery">LikeThisQuery</a></li>
- Support for querying using large amounts of example text indicative of the users' general area of interest
+ Support for querying using large amounts of example text indicative of the users' general area of interest
<li><a href="#FuzzyLikeThisQuery">FuzzyLikeThisQuery</a></li>
- A style of fuzzy query which automatically looks for fuzzy variations on only the "interesting" terms
+ A style of fuzzy query which automatically looks for fuzzy variations on only the "interesting" terms
<li><a href="#BooleanFilter">BooleanFilter</a></li>
- Is to Filters what core Lucene's BooleanQuery is to Queries - allows mixing of clauses using Boolean logic
+ Is to Filters what core Lucene's BooleanQuery is to Queries - allows mixing of clauses using Boolean logic
<li><a href="#TermsFilter">TermsFilter</a></li>
- Constructs a filter from an arbitrary set of terms (unlike <a href="#RangeFilter">RangeFilter</a> which requires a contiguous range of terms)
+ Constructs a filter from an arbitrary set of terms (unlike <a href="#RangeFilter">RangeFilter</a> which requires a contiguous range of terms)
<li><a href="#DuplicateFilter">DuplicateFilter</a></li>
- Removes duplicated documents from results where "duplicate" means documents share a value for a particular field (e.g. a primary key)
+ Removes duplicated documents from results where "duplicate" means documents share a value for a particular field (e.g. a primary key)
<li><a href="#BoostingQuery">BoostingQuery</a></li>
- Influence score of a query's matches in a subtle way which can't be achieved using BooleanQuery
+ Influence score of a query's matches in a subtle way which can't be achieved using BooleanQuery
</ul>
@title Contrib Lucene
-->
@@ -60,14 +60,14 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
variants (typically misspellings) more highly. This can be a useful default search mode for processing user input where the end user
is not expected to know about the standard query operators for fuzzy, boolean or phrase logic found in UserQuery
@example
- <em>Search for information about the Sumitomo bank, where the end user has mis-spelt the name</em>
- %
- <FuzzyLikeThisQuery>
- <Field fieldName="contents">
- Sumitimo bank
- </Field>
- </FuzzyLikeThisQuery>
- %
+ <em>Search for information about the Sumitomo bank, where the end user has mis-spelt the name</em>
+ %
+ <FuzzyLikeThisQuery>
+ <Field fieldName="contents">
+ Sumitimo bank
+ </Field>
+ </FuzzyLikeThisQuery>
+ %
-->
<!ELEMENT FuzzyLikeThisQuery (Field)*>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -83,7 +83,7 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
additional IO required to read matching document ids-->
<!ATTLIST Field minSimilarity CDATA "2.0">
<!-- Controls the minimum number of characters at the start of fuzzy variant words that must exactly match the original.
- -->
+-->
<!ATTLIST Field prefixLength CDATA "1">
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST Field fieldName CDATA #IMPLIED>
@@ -94,27 +94,27 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
Cherry-picks "significant" terms from the example child text and queries using these words. By only using significant (read: rare) terms the
performance cost of the query is substantially reduced and large bodies of text can be used as example content.
@example
- <em>Use a block of text as an example of the type of content to be found, ignoring the "Reuters" word which
- appears commonly in the index.</em>
- %
- <LikeThisQuery percentTermsToMatch="5" stopWords="Reuters">
- IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
- positions they had initially occupied when they launched a new offensive near the southern port of
- Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
- and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
- (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
- unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
- assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
- their advance until they purge the last foothold" occupied by the Iranians, it said.
- (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
- The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
- during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
- Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
- offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
- the communique said. Reuters 3;
- </LikeThisQuery>
- %
- -->
+ <em>Use a block of text as an example of the type of content to be found, ignoring the "Reuters" word which
+ appears commonly in the index.</em>
+ %
+ <LikeThisQuery percentTermsToMatch="5" stopWords="Reuters">
+ IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
+ positions they had initially occupied when they launched a new offensive near the southern port of
+ Basra early yesterday. A High Command communique said Iraqi troops had won a significant victory
+ and were continuing to advance. Iraq said it had foiled a three-pronged thrust some 10 km
+ (six miles) from Basra, but admitted the Iranians had occupied ground held by the Mohammed al-Qassem
+ unit, one of three divisions attacked. The communique said Iranian Revolutionary Guards were under
+ assault from warplanes, helicopter gunships, heavy artillery and tanks. "Our forces are continuing
+ their advance until they purge the last foothold" occupied by the Iranians, it said.
+ (Iran said its troops had killed or wounded more than 4,000 Iraqis and were stabilising their new positions.)
+ The Baghdad communique said Iraqi planes also destroyed oil installations at Iran's southwestern Ahvaz field
+ during a raid today. It denied an Iranian report that an Iraqi jet was shot down.
+ Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an
+ offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal,
+ the communique said. Reuters 3;
+ </LikeThisQuery>
+ %
+-->
<!ELEMENT LikeThisQuery (#PCDATA)>
<!-- Optional boost for matches on this query. Values > 1 -->
<!ATTLIST LikeThisQuery boost CDATA "1.0">
@@ -134,25 +134,25 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
Requires matches on the "Query" element and optionally boosts by any matches on the "BoostQuery".
Unlike a regular BooleanQuery the boost can be less than 1 to produce a subtractive rather than additive result
on the match score.
- @example <em>Find documents about banks, preferably related to mergers, and preferably not about "World bank"</em>
- %
- <BoostingQuery>
- <Query>
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
+ @example
+ <em>Find documents about banks, preferably related to mergers, and preferably not about "World bank"</em>
+ %
+ <BoostingQuery>
+ <Query>
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
<TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="must">
+ </Clause>
+ <Clause occurs="must">
<TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
- </Query>
- <BoostQuery boost="0.01">
- <UserQuery>"world bank"</UserQuery>
- </BoostQuery>
- </BoostingQuery>
- %
-
+ </Clause>
+ </BooleanQuery>
+ </Query>
+ <BoostQuery boost="0.01">
+ <UserQuery>"world bank"</UserQuery>
+ </BoostQuery>
+ </BoostingQuery>
+ %
-->
<!ELEMENT BoostingQuery (Query,BoostQuery)>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -164,24 +164,25 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
<!ELEMENT BoostQuery (%queries;)>
<!-- Optional boost for matches on this query. A boost of >0 but <1
effectively demotes results from Query that match this BoostQuery.
- -->
+-->
<!ATTLIST BoostQuery boost CDATA "1.0">
<!-- Removes duplicated documents from results where "duplicate" means documents share a value for a particular field such as a primary key
- @example <em>Find the latest version of each web page that mentions "Lucene"</em>
- %
- <FilteredQuery>
- <Query>
- <TermQuery fieldName="text">lucene</TermQuery>
- </Query>
- <Filter>
- <DuplicateFilter fieldName="url" keepMode="last"/>
- </Filter>
- </FilteredQuery>
- %
- -->
+ @example
+ <em>Find the latest version of each web page that mentions "Lucene"</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <TermQuery fieldName="text">lucene</TermQuery>
+ </Query>
+ <Filter>
+ <DuplicateFilter fieldName="url" keepMode="last"/>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT DuplicateFilter EMPTY>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST DuplicateFilter fieldName CDATA #IMPLIED>
@@ -191,53 +192,53 @@ Improves on FuzzyQuery by rewarding all fuzzy variants of a term with the same I
while "fast" mode may perform faster but will also mark documents <em>without</em> the field as valid. The former approach starts by
assuming every document is a duplicate then finds the "master" documents to keep while the latter approach assumes all documents are
unique and unmarks those documents that are a copy.
- -->
+-->
<!ATTLIST DuplicateFilter processingMode (full | fast) "full">
<!-- Processes child text using a field-specific choice of Analyzer to produce a set of terms that are then used as a filter.
- @example <em>Find documents talking about Lucene written on a Monday or a Friday</em>
- %
- <FilteredQuery>
- <Query>
- <TermQuery fieldName="text">lucene</TermQuery>
- </Query>
- <Filter>
- <TermsFilter fieldName="dayOfWeek">monday friday</TermsFilter>
- </Filter>
- </FilteredQuery>
- %
-
- -->
+ @example
+ <em>Find documents talking about Lucene written on a Monday or a Friday</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <TermQuery fieldName="text">lucene</TermQuery>
+ </Query>
+ <Filter>
+ <TermsFilter fieldName="dayOfWeek">monday friday</TermsFilter>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT TermsFilter (#PCDATA)>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST TermsFilter fieldName CDATA #IMPLIED>
<!--
A Filter equivalent to BooleanQuery that applies Boolean logic to Clauses containing Filters.
Unlike BooleanQuery a BooleanFilter can contain a single "mustNot" clause.
- @example <em>Find documents from the first quarter of this year or last year that are not in "draft" status</em>
- %
- <FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
- <Filter>
- <BooleanFilter>
- <Clause occurs="should">
- <RangeFilter fieldName="date" lowerTerm="20070101" upperTerm="20070401"/>
- </Clause>
- <Clause occurs="should">
- <RangeFilter fieldName="date" lowerTerm="20060101" upperTerm="20060401"/>
- </Clause>
- <Clause occurs="mustNot">
- <TermsFilter fieldName="status">draft</TermsFilter>
- </Clause>
- </BooleanFilter>
- </Filter>
- </FilteredQuery>
- %
- -->
+ @example
+ <em>Find documents from the first quarter of this year or last year that are not in "draft" status</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+ <Filter>
+ <BooleanFilter>
+ <Clause occurs="should">
+ <RangeFilter fieldName="date" lowerTerm="20070101" upperTerm="20070401"/>
+ </Clause>
+ <Clause occurs="should">
+ <RangeFilter fieldName="date" lowerTerm="20060101" upperTerm="20060401"/>
+ </Clause>
+ <Clause occurs="mustNot">
+ <TermsFilter fieldName="status">draft</TermsFilter>
+ </Clause>
+ </BooleanFilter>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT BooleanFilter (Clause)+>
-
diff --git a/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneCoreQuery.dtd b/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneCoreQuery.dtd
index 15483d35466..691f5ec5706 100644
--- a/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneCoreQuery.dtd
+++ b/lucene/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneCoreQuery.dtd
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!--
@@ -89,21 +89,20 @@
BooleanQuerys implement Boolean logic which controls how multiple Clauses should be interpreted.
Some clauses may represent optional Query criteria while others represent mandatory criteria.
@example
- <em>Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo"</em>
- %
- <BooleanQuery fieldName="contents">
- <Clause occurs="should">
- <TermQuery>merger</TermQuery>
- </Clause>
- <Clause occurs="mustnot">
- <TermQuery>sumitomo</TermQuery>
- </Clause>
- <Clause occurs="must">
- <TermQuery>bank</TermQuery>
- </Clause>
- </BooleanQuery>
-
- %
+ <em>Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo"</em>
+ %
+ <BooleanQuery fieldName="contents">
+ <Clause occurs="should">
+ <TermQuery>merger</TermQuery>
+ </Clause>
+ <Clause occurs="mustnot">
+ <TermQuery>sumitomo</TermQuery>
+ </Clause>
+ <Clause occurs="must">
+ <TermQuery>bank</TermQuery>
+ </Clause>
+ </BooleanQuery>
+ %
-->
<!ELEMENT BooleanQuery (Clause)+>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -130,22 +129,21 @@
Queries that are cached as filters obviously retain none of the scoring information associated with results - they retain just
a Boolean yes/no record of which documents matched.
@example
- <em>Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
- RAM to eliminate the cost of building this filter from disk for every query</em>
- %
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <CachedFilter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </CachedFilter>
- </Filter>
- </FilteredQuery>
- %
-
- -->
+ <em>Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
+ RAM to eliminate the cost of building this filter from disk for every query</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <CachedFilter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </CachedFilter>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT CachedFilter (%queries;|%filters;)>
@@ -153,11 +151,10 @@
<!--
Passes content directly through to the standard LuceneQuery parser see "Lucene Query Syntax"
@example
- <em>Search for documents about John Smith or John Doe using standard LuceneQuerySyntax</em>
- %
- <UserQuery>"John Smith" OR "John Doe"</UserQuery>
- %
-
+ <em>Search for documents about John Smith or John Doe using standard LuceneQuerySyntax</em>
+ %
+ <UserQuery>"John Smith" OR "John Doe"</UserQuery>
+ %
-->
<!ELEMENT UserQuery (#PCDATA)>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -174,27 +171,26 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
</ol>
@example
- <em>Effectively use a Filter as a query </em>
- %
- <FilteredQuery>
- <Query>
- <MatchAllDocsQuery/>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
- </Filter>
- </FilteredQuery>
- %
-
+ <em>Effectively use a Filter as a query </em>
+ %
+ <FilteredQuery>
+ <Query>
+ <MatchAllDocsQuery/>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
+ </Filter>
+ </FilteredQuery>
+ %
-->
<!ELEMENT MatchAllDocsQuery EMPTY>
<!-- a single term query - no analysis is done of the child text
@example
- <em>Match on a primary key</em>
- %
- <TermQuery fieldName="primaryKey">13424</TermQuery>
- %
+ <em>Match on a primary key</em>
+ %
+ <TermQuery fieldName="primaryKey">13424</TermQuery>
+ %
-->
<!ELEMENT TermQuery (#PCDATA)>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -233,11 +229,11 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
Unlike UserQuery element, this does not parse any special characters to control fuzzy/phrase/boolean logic and as such is incapable
of producing a Query parse error given any user input
@example
- <em>Match on text from a database description (which may contain characters that
- are illegal characters in the standard Lucene Query syntax used in the UserQuery tag</em>
- %
- <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
- %
+ <em>Match on text from a database description (which may contain characters that
+ are illegal characters in the standard Lucene Query syntax used in the UserQuery tag</em>
+ %
+ <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
+ %
-->
<!ELEMENT TermsQuery (#PCDATA)>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -253,17 +249,17 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!--
Runs a Query and filters results to only those query matches that also match the Filter element.
@example
- <em>Find all documents about Lucene that have a status of "published"</em>
- %
- <FilteredQuery>
- <Query>
- <UserQuery>Lucene</UserQuery>
- </Query>
- <Filter>
- <TermsFilter fieldName="status">published</TermsFilter>
- </Filter>
- </FilteredQuery>
- %
+ <em>Find all documents about Lucene that have a status of "published"</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <UserQuery>Lucene</UserQuery>
+ </Query>
+ <Filter>
+ <TermsFilter fieldName="status">published</TermsFilter>
+ </Filter>
+ </FilteredQuery>
+ %
-->
<!ELEMENT FilteredQuery (Query,Filter)>
<!-- Optional boost for matches on this query. Values > 1 -->
@@ -276,18 +272,18 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!--
Filter used to limit query results to documents matching a range of field values
@example
- <em>Search for documents about banks from the last 10 years</em>
- %
- <FilteredQuery>
- <Query>
- <UserQuery>bank</UserQuery>
- </Query>
- <Filter>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </Filter>
- </FilteredQuery>
- %
- -->
+ <em>Search for documents about banks from the last 10 years</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <UserQuery>bank</UserQuery>
+ </Query>
+ <Filter>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT RangeFilter EMPTY>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST RangeFilter fieldName CDATA #IMPLIED>
@@ -303,11 +299,11 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!--
A Query that matches numeric values within a specified range.
@example
- <em>Search for documents about people who are aged 20-25</em>
- %
- <LegacyNumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
- %
- -->
+ <em>Search for documents about people who are aged 20-25</em>
+ %
+ <LegacyNumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
+ %
+-->
<!ELEMENT NumericRangeQuery EMPTY>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST NumericRangeQuery fieldName CDATA #IMPLIED>
@@ -327,18 +323,18 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!--
A Filter that only accepts numeric values within a specified range
@example
- <em>Search for documents about people who are aged 20-25</em>
- %
- <FilteredQuery>
- <Query>
- <UserQuery>person</UserQuery>
- </Query>
- <Filter>
- <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
- </Filter>
- </FilteredQuery>
- %
- -->
+ <em>Search for documents about people who are aged 20-25</em>
+ %
+ <FilteredQuery>
+ <Query>
+ <UserQuery>person</UserQuery>
+ </Query>
+ <Filter>
+ <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
+ </Filter>
+ </FilteredQuery>
+ %
+-->
<!ELEMENT NumericRangeFilter EMPTY>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST NumericRangeFilter fieldName CDATA #IMPLIED>
@@ -356,58 +352,60 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!ATTLIST NumericRangeFilter precisionStep CDATA "4">
<!-- A single term used in a SpanQuery. These clauses are the building blocks for more complex "span" queries which test word proximity
- @example <em>Find documents using terms close to each other about mining and accidents</em>
- %
+ @example
+ <em>Find documents using terms close to each other about mining and accidents</em>
+ %
<SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
</SpanNear>
- %
- -->
+ %
+-->
<!ELEMENT SpanTerm (#PCDATA)>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST SpanTerm fieldName CDATA #REQUIRED>
<!-- A field-specific analyzer is used here to parse the child text provided in this tag. The SpanTerms produced are ORed in terms of Boolean logic
- @example <em>Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
- using words describing a fatality near to references to miners</em>
- %
+ @example
+ <em>Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
+ using words describing a fatality near to references to miners</em>
+ %
<SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
- <SpanOrTerms>miner mining miners</SpanOrTerms>
+ <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
+ <SpanOrTerms>miner mining miners</SpanOrTerms>
</SpanNear>
- %
- -->
+ %
+-->
<!ELEMENT SpanOrTerms (#PCDATA)>
<!-- fieldName must be defined here or is taken from the most immediate parent XML element that defines a "fieldName" attribute -->
<!ATTLIST SpanOrTerms fieldName CDATA #REQUIRED>
<!-- Takes any number of child queries from the Span family
- @example <em>Find documents using terms close to each other about mining and accidents</em>
- %
+ @example
+ <em>Find documents using terms close to each other about mining and accidents</em>
+ %
<SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
</SpanNear>
- %
-
- -->
+ %
+-->
<!ELEMENT SpanOr (%spanQueries;)* >
<!-- Takes any number of child queries from the Span family and tests for proximity
@@ -415,37 +413,36 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
-->
<!ELEMENT SpanNear (%spanQueries;)* >
<!-- defines the maximum distance between Span elements where distance is expressed as word number, not byte offset
- @example <em>Find documents using terms within 8 words of each other talking about mining and accidents</em>
- %
+ @example
+ <em>Find documents using terms within 8 words of each other talking about mining and accidents</em>
+ %
<SpanNear slop="8" inOrder="false" fieldName="text">
- <SpanOr>
- <SpanTerm>killed</SpanTerm>
- <SpanTerm>died</SpanTerm>
- <SpanTerm>dead</SpanTerm>
- </SpanOr>
- <SpanOr>
- <SpanTerm>miner</SpanTerm>
- <SpanTerm>mining</SpanTerm>
- <SpanTerm>miners</SpanTerm>
- </SpanOr>
+ <SpanOr>
+ <SpanTerm>killed</SpanTerm>
+ <SpanTerm>died</SpanTerm>
+ <SpanTerm>dead</SpanTerm>
+ </SpanOr>
+ <SpanOr>
+ <SpanTerm>miner</SpanTerm>
+ <SpanTerm>mining</SpanTerm>
+ <SpanTerm>miners</SpanTerm>
+ </SpanOr>
</SpanNear>
- %
- -->
+ %
+-->
<!ATTLIST SpanNear slop CDATA #REQUIRED>
<!-- Controls if matching terms have to appear in the order listed or can be reversed -->
<!ATTLIST SpanNear inOrder (true | false) "true">
<!-- Looks for a SpanQuery match occuring near the beginning of a document
-
@example
- <em>Find letters where the first 50 words talk about a resignation:</em>
- %
- <SpanFirst end="50">
- <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
- </SpanFirst>
- %
-
- -->
+ <em>Find letters where the first 50 words talk about a resignation:</em>
+ %
+ <SpanFirst end="50">
+ <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
+ </SpanFirst>
+ %
+-->
<!ELEMENT SpanFirst (%spanQueries;) >
<!-- Controls the end of the region considered in a document's field (expressed in word number, not byte offset) -->
<!ATTLIST SpanFirst end CDATA #REQUIRED>
@@ -453,22 +450,22 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!ATTLIST SpanFirst boost CDATA "1.0">
<!-- Finds documents matching a SpanQuery but not if matching another SpanQuery
- @example <em>Find documents talking about social services but not containing the word "public"</em>
- %
- <SpanNot fieldName="text">
- <Include>
- <SpanNear slop="2" inOrder="true">
- <SpanTerm>social</SpanTerm>
- <SpanTerm>services</SpanTerm>
- </SpanNear>
- </Include>
- <Exclude>
- <SpanTerm>public</SpanTerm>
- </Exclude>
- </SpanNot>
- %
-
- -->
+ @example
+ <em>Find documents talking about social services but not containing the word "public"</em>
+ %
+ <SpanNot fieldName="text">
+ <Include>
+ <SpanNear slop="2" inOrder="true">
+ <SpanTerm>social</SpanTerm>
+ <SpanTerm>services</SpanTerm>
+ </SpanNear>
+ </Include>
+ <Exclude>
+ <SpanTerm>public</SpanTerm>
+ </Exclude>
+ </SpanNot>
+ %
+-->
<!ELEMENT SpanNot (Include,Exclude) >
<!-- The SpanQuery to find -->
<!ELEMENT Include (%spanQueries;) >
@@ -477,16 +474,14 @@ Passes content directly through to the standard LuceneQuery parser see "Lucene Q
<!-- a utility tag to wrap any filter as a query
- @example <em> Find all documents from the last 10 years </em>
- %
- <ConstantScoreQuery>
- <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
- </ConstantScoreQuery>
- %
- -->
+ @example
+ <em> Find all documents from the last 10 years </em>
+ %
+ <ConstantScoreQuery>
+ <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
+ </ConstantScoreQuery>
+ %
+-->
<!ELEMENT ConstantScoreQuery (%filters;)* >
<!-- Optional boost for matches on this query. Values > 1 -->
<!ATTLIST ConstantScoreQuery boost CDATA "1.0">
-
-
-
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
index 67c3e089e1b..065dc7ea621 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery fieldName="contents">
<Clause occurs="should">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
index 48974bb1bff..48002f18424 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BoostingQuery>
<!-- Find docs about banks, preferably merger info and preferably not "World bank" -->
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingTermQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingTermQuery.xml
index 65bbd618670..154fdc3c436 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingTermQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingTermQuery.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BoostingTermQuery fieldName="contents">sumitomo</BoostingTermQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
index 13cbc1b8af2..e73e325616b 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<ConstantScoreQuery>
<RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DOCTYPE_TermQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DOCTYPE_TermQuery.xml
index 28938ae7ed1..2e00430063b 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DOCTYPE_TermQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DOCTYPE_TermQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE TermQuery SYSTEM "foo://bar.xyz/mydtd">
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<TermQuery fieldName="contents">sumitomo</TermQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml
index 0c94b004a66..cd9ba5db71f 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/DisjunctionMaxQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<DisjunctionMaxQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ENTITY_TermQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ENTITY_TermQuery.xml
index dc596132590..eda039078a7 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ENTITY_TermQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/ENTITY_TermQuery.xml
@@ -5,19 +5,19 @@
<!ENTITY % myParameterEntity "foo://bar.xyz/param">
]>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<TermQuery fieldName="contents">&internalTerm;&externalTerm;</TermQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
index 82c91ceca48..379951ceecf 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<FuzzyLikeThisQuery>
<!-- Matches on misspelt "Sumitomo" bank -->
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
index 915ce3275dc..88f19f2cd48 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<LikeThisQuery percentTermsToMatch="5" stopWords="Reuter" minDocFreq="2">
IRAQI TROOPS REPORTED PUSHING BACK IRANIANS Iraq said today its troops were pushing Iranian forces out of
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
index d258393d508..d2f9911e5ae 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery>
<Clause occurs="must">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
index 857b03cbf3c..4721ad0c861 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+
<!--
This query was added to demonstrate nested boolean queries - there
was a bug in the XML parser which added ALL child <Clause> tags to
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQuery.xml
index f52c5a83545..4b230f65a78 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery fieldName="contents">
<Clause occurs="should">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutLowerTerm.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutLowerTerm.xml
index 5f87ca60ea1..3ca47f8e6d5 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutLowerTerm.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutLowerTerm.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery fieldName="contents">
<Clause occurs="should">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutRange.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutRange.xml
index ec5048d3ce9..9bc5f6c433f 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutRange.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutRange.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery fieldName="contents">
<Clause occurs="should">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutUpperTerm.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutUpperTerm.xml
index 9a626f9527f..b46c8c10e02 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutUpperTerm.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/PointRangeQueryWithoutUpperTerm.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery fieldName="contents">
<Clause occurs="should">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeQuery.xml
index 946fdf2f92f..c8709f4f73a 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeQuery.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<RangeQuery fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml
index 89dcc1e7bcd..98399579029 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanNearQueryWithoutSlop.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<SpanNear fieldName="contents" inOrder="false">
<SpanTerm>foo</SpanTerm>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanPositionRangeQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanPositionRangeQuery.xml
index ca4f74acacc..dc9a6ad0802 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanPositionRangeQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanPositionRangeQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<SpanPositionRange start="9" end="11">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
index 4a026a16b74..9fa3942f0a1 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<SpanOr fieldName="contents">
<SpanNear slop="8" inOrder="false" >
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQuery.xml
index 08ebddd7502..7a91b8aa28a 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQuery.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<TermQuery fieldName="contents">sumitomo</TermQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQueryEmpty.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQueryEmpty.xml
index 229a11221a9..0f3a570aab5 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQueryEmpty.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQueryEmpty.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<TermQuery fieldName="contents"></TermQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
index 477b90a1ca3..cca2752a715 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+TermsQuery uses an analyzer to tokenize text and creates a BooleanQuery with nested
+"should" TermQueries for each of the tokens encountered. This can be used for user input
+which may include content or characters that would otherwise be illegal query syntax when
+using the standard lucene query parser. Of course the downside is that none of the query
+operators (AND NOT ~ ^ : etc) will have an effect. For some scenarios queries are
+not formed by people familiar with Lucene query syntax and they can inadvertently type illegal
+query syntax so in these cases this is an appropriate and simple alternative
-->
- <!-- TermsQuery uses an analyzer to tokenize text and creates a BooleanQuery with nested
- "should" TermQueries for each of the tokens encountered. This can be used for user input
- which may include content or characters that would otherwise be illegal query syntax when
- using the standard lucene query parser. Of course the downside is that none of the query
- operators (AND NOT ~ ^ : etc) will have an effect. For some scenarios queries are
- not formed by people familiar with Lucene query syntax and they can inadvertently type illegal
- query syntax so in these cases this is an appropriate and simple alternative
- -->
<TermsQuery fieldName="contents">sumitomo bank</TermsQuery>
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
index f7b6cae8282..670745fab01 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<BooleanQuery>
<Clause occurs="must">
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQueryCustomField.xml b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQueryCustomField.xml
index 7b35a633960..388bee3b29f 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQueryCustomField.xml
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQueryCustomField.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<UserQuery fieldName="doesNotExist" boost="10">Bank^2</UserQuery>
diff --git a/lucene/replicator/src/java/overview.html b/lucene/replicator/src/java/overview.html
index e20f482c0ef..cc5849e17f2 100644
--- a/lucene/replicator/src/java/overview.html
+++ b/lucene/replicator/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
index 642f466bc03..c91bab4812b 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
@@ -40,13 +40,14 @@ import org.locationtech.spatial4j.shape.Shape;
* @lucene.experimental
*/
public class RecursivePrefixTreeStrategy extends PrefixTreeStrategy {
- /* Future potential optimizations:
-
- Each shape.relate(otherShape) result could be cached since much of the same relations will be invoked when
- multiple segments are involved. Do this for "complex" shapes, not cheap ones, and don't cache when disjoint to
- bbox because it's a cheap calc. This is one advantage TermQueryPrefixTreeStrategy has over RPT.
-
- */
+ /*
+ * Future potential optimizations:
+ *
+ * Each shape.relate(otherShape) result could be cached since much of the same relations will be invoked when
+ * multiple segments are involved. Do this for "complex" shapes, not cheap ones, and don't cache when disjoint to
+ * bbox because it's a cheap calc. This is one advantage TermQueryPrefixTreeStrategy has over RPT.
+ *
+ */
protected int prefixGridScanLevel;
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java
index dddf39dd7bc..d18dd468594 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java
@@ -41,22 +41,21 @@ import org.locationtech.spatial4j.shape.Shape;
public class DateRangePrefixTree extends NumberRangePrefixTree {
/*
- WARNING java.util.Calendar is tricky to work with:
- * If you "get" any field value, every field becomes "set". This can introduce a Heisenbug effect,
- when in a debugger in some cases. Fortunately, Calendar.toString() doesn't apply.
- * Beware Calendar underflow of the underlying long. If you create a Calendar from LONG.MIN_VALUE, and clear
- a field, it will underflow and appear close to LONG.MAX_VALUE (BC to AD).
-
- There are no doubt other reasons but those two were hard fought lessons here.
-
- TODO Improvements:
- * Make max precision configurable (i.e. to SECOND).
- * Make min & max year span configurable. Use that to remove pointless top levels of the SPT.
- If year span is > 10k, then add 1k year level. If year span is > 10k of 1k levels, add 1M level.
- * NumberRangePrefixTree: override getTreeCellIterator for optimized case where the shape isn't a date span; use
- FilterCellIterator of the cell stack.
-
- */
+ * WARNING java.util.Calendar is tricky to work with:
+ * - If you "get" any field value, every field becomes "set". This can introduce a Heisenbug effect,
+ * when in a debugger in some cases. Fortunately, Calendar.toString() doesn't apply.
+ * - Beware Calendar underflow of the underlying long. If you create a Calendar from LONG.MIN_VALUE, and clear
+ * a field, it will underflow and appear close to LONG.MAX_VALUE (BC to AD).
+ *
+ * There are no doubt other reasons but those two were hard fought lessons here.
+ *
+ * TODO Improvements:
+ * - Make max precision configurable (i.e. to SECOND).
+ * - Make min & max year span configurable. Use that to remove pointless top levels of the SPT.
+ * If year span is > 10k, then add 1k year level. If year span is > 10k of 1k levels, add 1M level.
+ * - NumberRangePrefixTree: override getTreeCellIterator for optimized case where the shape isn't a date span; use
+ * FilterCellIterator of the cell stack.
+ */
private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
diff --git a/lucene/spatial-extras/src/java/overview.html b/lucene/spatial-extras/src/java/overview.html
index 685d23ef273..00305761d02 100644
--- a/lucene/spatial-extras/src/java/overview.html
+++ b/lucene/spatial-extras/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
index b3585f2c98c..096d4b715a9 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
@@ -93,18 +93,18 @@ public class TestGeo3dShapeWGS84ModelRectRelation extends ShapeRectRelationTestC
@Test
public void testFailure3() {
/*
- [junit4] 1> S-R Rel: {}, Shape {}, Rectangle {} lap# {} [CONTAINS, Geo3dShape{planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, shape=GeoPath: {planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, width=1.53588974175501(87.99999999999999),
- points={[[X=0.12097657665150223, Y=-0.6754177666095532, Z=0.7265376136709238], [X=-0.3837892785614207, Y=0.4258049113530899, Z=0.8180007850434892]]}}},
- Rect(minX=4.0,maxX=36.0,minY=16.0,maxY=16.0), 6981](no slf4j subst; sorry)
- [junit4] FAILURE 0.59s | Geo3dWGS84ShapeRectRelationTest.testGeoPathRect <<<
- [junit4] > Throwable #1: java.lang.AssertionError: Geo3dShape{planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, shape=GeoPath: {planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, width=1.53588974175501(87.99999999999999),
- points={[[X=0.12097657665150223, Y=-0.6754177666095532, Z=0.7265376136709238], [X=-0.3837892785614207, Y=0.4258049113530899, Z=0.8180007850434892]]}}} intersect Pt(x=23.81626064835212,y=16.0)
- [junit4] > at __randomizedtesting.SeedInfo.seed([2595268DA3F13FEA:6CC30D8C83453E5D]:0)
- [junit4] > at org.apache.lucene.spatial.spatial4j.RandomizedShapeTestCase._assertIntersect(RandomizedShapeTestCase.java:168)
- [junit4] > at org.apache.lucene.spatial.spatial4j.RandomizedShapeTestCase.assertRelation(RandomizedShapeTestCase.java:153)
- [junit4] > at org.apache.lucene.spatial.spatial4j.RectIntersectionTestHelper.testRelateWithRectangle(RectIntersectionTestHelper.java:128)
- [junit4] > at org.apache.lucene.spatial.spatial4j.Geo3dWGS84ShapeRectRelationTest.testGeoPathRect(Geo3dWGS84ShapeRectRelationTest.java:265)
- */
+ * [junit4] 1> S-R Rel: {}, Shape {}, Rectangle {} lap# {} [CONTAINS, Geo3dShape{planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, shape=GeoPath: {planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, width=1.53588974175501(87.99999999999999),
+ * points={[[X=0.12097657665150223, Y=-0.6754177666095532, Z=0.7265376136709238], [X=-0.3837892785614207, Y=0.4258049113530899, Z=0.8180007850434892]]}}},
+ * Rect(minX=4.0,maxX=36.0,minY=16.0,maxY=16.0), 6981](no slf4j subst; sorry)
+ * [junit4] FAILURE 0.59s | Geo3dWGS84ShapeRectRelationTest.testGeoPathRect <<<
+ * [junit4] > Throwable #1: java.lang.AssertionError: Geo3dShape{planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, shape=GeoPath: {planetmodel=PlanetModel: {xyScaling=1.0011188180710464, zScaling=0.9977622539852008}, width=1.53588974175501(87.99999999999999),
+ * points={[[X=0.12097657665150223, Y=-0.6754177666095532, Z=0.7265376136709238], [X=-0.3837892785614207, Y=0.4258049113530899, Z=0.8180007850434892]]}}} intersect Pt(x=23.81626064835212,y=16.0)
+ * [junit4] > at __randomizedtesting.SeedInfo.seed([2595268DA3F13FEA:6CC30D8C83453E5D]:0)
+ * [junit4] > at org.apache.lucene.spatial.spatial4j.RandomizedShapeTestCase._assertIntersect(RandomizedShapeTestCase.java:168)
+ * [junit4] > at org.apache.lucene.spatial.spatial4j.RandomizedShapeTestCase.assertRelation(RandomizedShapeTestCase.java:153)
+ * [junit4] > at org.apache.lucene.spatial.spatial4j.RectIntersectionTestHelper.testRelateWithRectangle(RectIntersectionTestHelper.java:128)
+ * [junit4] > at org.apache.lucene.spatial.spatial4j.Geo3dWGS84ShapeRectRelationTest.testGeoPathRect(Geo3dWGS84ShapeRectRelationTest.java:265)
+ */
final GeoBBox rect =
GeoBBoxFactory.makeGeoBBox(
planetModel,
diff --git a/lucene/spatial-test-fixtures/src/java/overview.html b/lucene/spatial-test-fixtures/src/java/overview.html
index 08e16bcb80d..74bd5bb6498 100644
--- a/lucene/spatial-test-fixtures/src/java/overview.html
+++ b/lucene/spatial-test-fixtures/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/spatial3d/src/java/overview.html b/lucene/spatial3d/src/java/overview.html
index 293cc65aa60..5d28968cedb 100644
--- a/lucene/spatial3d/src/java/overview.html
+++ b/lucene/spatial3d/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
index e7c756d4064..12ac48a8691 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
@@ -596,26 +596,26 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testGeoConcaveRelationshipCase1() {
/*
- [junit4] 1> doc=906 matched but should not
- [junit4] 1> point=[lat=-0.9825762558001477, lon=2.4832136904725273]
- [junit4] 1> quantized=[X=-0.4505446160475436, Y=0.34850109186970535, Z=-0.8539966368663765]
-
- doc=906 added here:
-
- [junit4] 1> cycle: cell=107836 parentCellID=107835 x: -1147288468 TO -742350917, y: -1609508490 TO 1609508490, z: -2147483647 TO 2147483647, splits: 3 queue.size()=1
- [junit4] 1> minx=-0.6107484000858642 maxx=-0.39518364125756916 miny=-0.8568069517709872 maxy=0.8568069517709872 minz=-1.1431930485939341 maxz=1.1431930485939341
- [junit4] 1> GeoArea.CONTAINS: now addAll
-
- shape:
- [junit4] 1> TEST: iter=18 shape=GeoCompositeMembershipShape: {[GeoConvexPolygon: {
- planetmodel=PlanetModel(xyScaling=0.8568069516722363 zScaling=1.1431930483277637), points=
- [[lat=1.1577814487635816, lon=1.6283601832010004],
- [lat=0.6664570999069251, lon=2.0855825542851574],
- [lat=-0.23953537010974632, lon=1.8498724094352876]]}, GeoConcavePolygon: {planetmodel=PlanetModel(xyScaling=0.8568069516722363 zScaling=1.1431930483277637), points=
- [[lat=1.1577814487635816, lon=1.6283601832010004],
- [lat=-0.23953537010974632, lon=1.8498724094352876],
- [lat=-1.1766904875978805, lon=-2.1346828411344436]]}]}
- */
+ * [junit4] 1> doc=906 matched but should not
+ * [junit4] 1> point=[lat=-0.9825762558001477, lon=2.4832136904725273]
+ * [junit4] 1> quantized=[X=-0.4505446160475436, Y=0.34850109186970535, Z=-0.8539966368663765]
+ *
+ * doc=906 added here:
+ *
+ * [junit4] 1> cycle: cell=107836 parentCellID=107835 x: -1147288468 TO -742350917, y: -1609508490 TO 1609508490, z: -2147483647 TO 2147483647, splits: 3 queue.size()=1
+ * [junit4] 1> minx=-0.6107484000858642 maxx=-0.39518364125756916 miny=-0.8568069517709872 maxy=0.8568069517709872 minz=-1.1431930485939341 maxz=1.1431930485939341
+ * [junit4] 1> GeoArea.CONTAINS: now addAll
+ *
+ * shape:
+ * [junit4] 1> TEST: iter=18 shape=GeoCompositeMembershipShape: {[GeoConvexPolygon: {
+ * planetmodel=PlanetModel(xyScaling=0.8568069516722363 zScaling=1.1431930483277637), points=
+ * [[lat=1.1577814487635816, lon=1.6283601832010004],
+ * [lat=0.6664570999069251, lon=2.0855825542851574],
+ * [lat=-0.23953537010974632, lon=1.8498724094352876]]}, GeoConcavePolygon: {planetmodel=PlanetModel(xyScaling=0.8568069516722363 zScaling=1.1431930483277637), points=
+ * [[lat=1.1577814487635816, lon=1.6283601832010004],
+ * [lat=-0.23953537010974632, lon=1.8498724094352876],
+ * [lat=-1.1766904875978805, lon=-2.1346828411344436]]}]}
+ */
PlanetModel pm = new PlanetModel(0.8568069516722363, 1.1431930483277637);
// Build the polygon
GeoCompositeMembershipShape c = new GeoCompositeMembershipShape(pm);
@@ -650,29 +650,29 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testPolygonFactoryCase1() {
/*
- [junit4] 1> Initial points:
- [junit4] 1> [X=-0.17279348371564082, Y=0.24422965662722748, Z=0.9521675605930696]
- [junit4] 1> [X=-0.6385022730019092, Y=-0.6294493901210775, Z=0.4438687423720006]
- [junit4] 1> [X=-0.9519561011293354, Y=-0.05324061687857965, Z=-0.30423702782227385]
- [junit4] 1> [X=-0.30329807815178533, Y=-0.9447434167936289, Z=0.13262941042055737]
- [junit4] 1> [X=-0.5367607140926697, Y=0.8179452639396644, Z=0.21163783898691005]
- [junit4] 1> [X=0.39285411191111597, Y=0.6369575362013932, Z=0.6627439307500357]
- [junit4] 1> [X=-0.44715655239362595, Y=0.8332957749253644, Z=0.3273923501593971]
- [junit4] 1> [X=0.33024322515264537, Y=0.6945246730529289, Z=0.6387986432043298]
- [junit4] 1> [X=-0.1699323603224724, Y=0.8516746480592872, Z=0.4963385521664198]
- [junit4] 1> [X=0.2654788898359613, Y=0.7380222309164597, Z=0.6200740473100581]
- [junit4] 1> For start plane, the following points are in/out:
- [junit4] 1> [X=-0.17279348371564082, Y=0.24422965662722748, Z=0.9521675605930696] is: in
- [junit4] 1> [X=-0.6385022730019092, Y=-0.6294493901210775, Z=0.4438687423720006] is: in
- [junit4] 1> [X=-0.9519561011293354, Y=-0.05324061687857965, Z=-0.30423702782227385] is: out
- [junit4] 1> [X=-0.30329807815178533, Y=-0.9447434167936289, Z=0.13262941042055737] is: in
- [junit4] 1> [X=-0.5367607140926697, Y=0.8179452639396644, Z=0.21163783898691005] is: out
- [junit4] 1> [X=0.39285411191111597, Y=0.6369575362013932, Z=0.6627439307500357] is: in
- [junit4] 1> [X=-0.44715655239362595, Y=0.8332957749253644, Z=0.3273923501593971] is: out
- [junit4] 1> [X=0.33024322515264537, Y=0.6945246730529289, Z=0.6387986432043298] is: in
- [junit4] 1> [X=-0.1699323603224724, Y=0.8516746480592872, Z=0.4963385521664198] is: out
- [junit4] 1> [X=0.2654788898359613, Y=0.7380222309164597, Z=0.6200740473100581] is: out
- */
+ * [junit4] 1> Initial points:
+ * [junit4] 1> [X=-0.17279348371564082, Y=0.24422965662722748, Z=0.9521675605930696]
+ * [junit4] 1> [X=-0.6385022730019092, Y=-0.6294493901210775, Z=0.4438687423720006]
+ * [junit4] 1> [X=-0.9519561011293354, Y=-0.05324061687857965, Z=-0.30423702782227385]
+ * [junit4] 1> [X=-0.30329807815178533, Y=-0.9447434167936289, Z=0.13262941042055737]
+ * [junit4] 1> [X=-0.5367607140926697, Y=0.8179452639396644, Z=0.21163783898691005]
+ * [junit4] 1> [X=0.39285411191111597, Y=0.6369575362013932, Z=0.6627439307500357]
+ * [junit4] 1> [X=-0.44715655239362595, Y=0.8332957749253644, Z=0.3273923501593971]
+ * [junit4] 1> [X=0.33024322515264537, Y=0.6945246730529289, Z=0.6387986432043298]
+ * [junit4] 1> [X=-0.1699323603224724, Y=0.8516746480592872, Z=0.4963385521664198]
+ * [junit4] 1> [X=0.2654788898359613, Y=0.7380222309164597, Z=0.6200740473100581]
+ * [junit4] 1> For start plane, the following points are in/out:
+ * [junit4] 1> [X=-0.17279348371564082, Y=0.24422965662722748, Z=0.9521675605930696] is: in
+ * [junit4] 1> [X=-0.6385022730019092, Y=-0.6294493901210775, Z=0.4438687423720006] is: in
+ * [junit4] 1> [X=-0.9519561011293354, Y=-0.05324061687857965, Z=-0.30423702782227385] is: out
+ * [junit4] 1> [X=-0.30329807815178533, Y=-0.9447434167936289, Z=0.13262941042055737] is: in
+ * [junit4] 1> [X=-0.5367607140926697, Y=0.8179452639396644, Z=0.21163783898691005] is: out
+ * [junit4] 1> [X=0.39285411191111597, Y=0.6369575362013932, Z=0.6627439307500357] is: in
+ * [junit4] 1> [X=-0.44715655239362595, Y=0.8332957749253644, Z=0.3273923501593971] is: out
+ * [junit4] 1> [X=0.33024322515264537, Y=0.6945246730529289, Z=0.6387986432043298] is: in
+ * [junit4] 1> [X=-0.1699323603224724, Y=0.8516746480592872, Z=0.4963385521664198] is: out
+ * [junit4] 1> [X=0.2654788898359613, Y=0.7380222309164597, Z=0.6200740473100581] is: out
+ */
final List<GeoPoint> points = new ArrayList<>();
points.add(new GeoPoint(0.17279348371564082, 0.24422965662722748, 0.9521675605930696));
@@ -727,12 +727,12 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testPolygonFactoryCase3() throws Exception {
/*
- This one failed to be detected as convex:
-
- [junit4] 1> convex part = GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
- [[lat=0.39346633764155237, lon=1.306697331415816([X=0.24124272064589647, Y=0.8921189226448045, Z=0.3836311592666308])],
- [lat=-0.4252164254406539, lon=-1.0929282311747601([X=0.41916238097763436, Y=-0.8093435958043177, Z=-0.4127428785664968])],
- [lat=0.4654236264787552, lon=1.3013260557429494([X=0.2380080413677112, Y=0.8617612419312584, Z=0.4489988990508502])]], internalEdges={0, 1, 2}}
+ * This one failed to be detected as convex:
+ *
+ * [junit4] 1> convex part = GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
+ * [[lat=0.39346633764155237, lon=1.306697331415816([X=0.24124272064589647, Y=0.8921189226448045, Z=0.3836311592666308])],
+ * [lat=-0.4252164254406539, lon=-1.0929282311747601([X=0.41916238097763436, Y=-0.8093435958043177, Z=-0.4127428785664968])],
+ * [lat=0.4654236264787552, lon=1.3013260557429494([X=0.2380080413677112, Y=0.8617612419312584, Z=0.4489988990508502])]], internalEdges={0, 1, 2}}
*/
final GeoPoint p3 = new GeoPoint(PlanetModel.WGS84, 0.39346633764155237, 1.306697331415816);
final GeoPoint p2 = new GeoPoint(PlanetModel.WGS84, -0.4252164254406539, -1.0929282311747601);
@@ -793,21 +793,21 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testPolygonFactoryCase5() {
/*
- [junit4] 1> points=[[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
- [lat=0.8894380320379947, lon=-2.8993466885897496([X=-0.6109015457368775, Y=-0.1509528453728308, Z=0.7760109675775679])],
- [lat=-0.8298163536994994, lon=-0.1462586594666574([X=0.6673285226073522, Y=-0.09830454048435874, Z=-0.7372817203741138])],
- [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])],
- [lat=-0.7766317703682181, lon=3.141592653589793([X=-0.7128972529667801, Y=8.730473389667082E-17, Z=-0.7005064828988063])]]
-
- {[GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
- [[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
- [lat=0.8894380320379947, lon=-2.8993466885897496([X=-0.6109015457368775, Y=-0.1509528453728308, Z=0.7760109675775679])],
- [lat=-0.8298163536994994, lon=-0.1462586594666574([X=0.6673285226073522, Y=-0.09830454048435874, Z=-0.7372817203741138])],
- [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])]], internalEdges={3}},
- GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
- [[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
- [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])],
- [lat=-0.7766317703682181, lon=3.141592653589793([X=-0.7128972529667801, Y=8.730473389667082E-17, Z=-0.7005064828988063])]], internalEdges={0}}]}
+ * [junit4] 1> points=[[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
+ * [lat=0.8894380320379947, lon=-2.8993466885897496([X=-0.6109015457368775, Y=-0.1509528453728308, Z=0.7760109675775679])],
+ * [lat=-0.8298163536994994, lon=-0.1462586594666574([X=0.6673285226073522, Y=-0.09830454048435874, Z=-0.7372817203741138])],
+ * [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])],
+ * [lat=-0.7766317703682181, lon=3.141592653589793([X=-0.7128972529667801, Y=8.730473389667082E-17, Z=-0.7005064828988063])]]
+ *
+ * {[GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
+ * [[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
+ * [lat=0.8894380320379947, lon=-2.8993466885897496([X=-0.6109015457368775, Y=-0.1509528453728308, Z=0.7760109675775679])],
+ * [lat=-0.8298163536994994, lon=-0.1462586594666574([X=0.6673285226073522, Y=-0.09830454048435874, Z=-0.7372817203741138])],
+ * [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])]], internalEdges={3}},
+ * GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=
+ * [[lat=0.0425265613312593, lon=0.0([X=1.0002076326868337, Y=0.0, Z=0.042561051669501374])],
+ * [lat=0.0, lon=-1.7156310907312492E-12([X=1.0011188539924791, Y=-1.7175506314267352E-12, Z=0.0])],
+ * [lat=-0.7766317703682181, lon=3.141592653589793([X=-0.7128972529667801, Y=8.730473389667082E-17, Z=-0.7005064828988063])]], internalEdges={0}}]}
*/
final GeoPoint p1 = new GeoPoint(PlanetModel.WGS84, 0.0425265613312593, 0.0);
final GeoPoint p2 = new GeoPoint(PlanetModel.WGS84, 0.8894380320379947, -2.8993466885897496);
@@ -847,13 +847,13 @@ public class TestGeoPolygon extends LuceneTestCase {
// false);
/*
- final List<GeoPoint> p2List = new ArrayList<>();
- p2List.add(p1);
- p2List.add(p4);
- p2List.add(p5);
- final BitSet p2Internal = new BitSet();
- final GeoConvexPolygon poly2 = new GeoConvexPolygon(PlanetModel.WGS84, p2List, p2Internal, false);
- */
+ * final List<GeoPoint> p2List = new ArrayList<>();
+ * p2List.add(p1);
+ * p2List.add(p4);
+ * p2List.add(p5);
+ * final BitSet p2Internal = new BitSet();
+ * final GeoConvexPolygon poly2 = new GeoConvexPolygon(PlanetModel.WGS84, p2List, p2Internal, false);
+ */
// XYZBounds bounds1 = new XYZBounds();
// poly1.getBounds(bounds1);
@@ -863,12 +863,12 @@ public class TestGeoPolygon extends LuceneTestCase {
// bounds1.getMinimumZ(), bounds1.getMaximumZ());
/*
- XYZBounds bounds2 = new XYZBounds();
- poly2.getBounds(bounds2);
- XYZSolid solid2 = XYZSolidFactory.makeXYZSolid(PlanetModel.WGS84, bounds2.getMinimumX(), bounds2.getMaximumX(),
- bounds2.getMinimumY(), bounds2.getMaximumY(),
- bounds2.getMinimumZ(), bounds2.getMaximumZ());
- */
+ * XYZBounds bounds2 = new XYZBounds();
+ * poly2.getBounds(bounds2);
+ * XYZSolid solid2 = XYZSolidFactory.makeXYZSolid(PlanetModel.WGS84, bounds2.getMinimumX(), bounds2.getMaximumX(),
+ * bounds2.getMinimumY(), bounds2.getMaximumY(),
+ * bounds2.getMinimumZ(), bounds2.getMaximumZ());
+ */
final GeoPoint point = new GeoPoint(PlanetModel.WGS84, -0.41518838180529244, 3.141592653589793);
@@ -878,25 +878,25 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testLargePolygonFailureCase1() {
/*
- [junit4] > shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=65f193fc,
- testPoint=[lat=1.3005550159098878, lon=-2.4043250791032897([X=-0.1972404544647752, Y=-0.17911237095124333, Z=0.9617794725902562])],
- testPointInSet=false,
- shapes={
- {[lat=0.972005250702484, lon=-1.9776473855435277([X=-0.22278290030997686, Y=-0.5170266140533727, Z=0.8250470449472769])],
- [lat=0.5530477484903267, lon=2.5300578442038137([X=-0.6968439858923609, Y=0.4886310878468911, Z=0.5253825248638686])],
- [lat=1.5185372097372358, lon=-0.33848566616392867([X=0.04916162127975167, Y=-0.01730656055596007, Z=0.9964092501726799])]}}
- [junit4] > bounds=XYZBounds: [xmin=-1.0011188544924792 xmax=0.04916162177975167 ymin=-1.0011188544924792 ymax=1.0011188544924792 zmin=-5.0E-10 zmax=0.99766957331525]
- [junit4] > world bounds=( minX=-1.0011188539924791 maxX=1.0011188539924791 minY=-1.0011188539924791 maxY=1.0011188539924791 minZ=-0.9977622920221051 maxZ=0.9977622920221051
- [junit4] > quantized point=[X=0.32866145093230836, Y=0.21519085912590594, Z=0.9177348472123349] within shape? true within bounds? false
- [junit4] > unquantized point=[lat=1.166339260547107, lon=0.5797066870374205([X=0.3286614507856878, Y=0.21519085911319938, Z=0.9177348470779726])] within shape? true within bounds? false
- [junit4] > docID=10 deleted?=false
- [junit4] > query=PointInGeo3DShapeQuery: field=point: Shape: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=65f193fc, testPoint=[lat=1.3005550159098878, lon=-2.4043250791032897([X=-0.1972404544647752, Y=-0.17911237095124333, Z=0.9617794725902562])], testPointInSet=false, shapes={ {[lat=0.972005250702484, lon=-1.9776473855435277([X=-0.22278290030997686, Y=-0.5170266140533727, Z=0.8250470449472769])], [lat=0.5530477484903267, lon=2.5300578442038137( [...]
- [junit4] > explanation:
- [junit4] > target is in leaf _0(7.0.0):c13 of full reader StandardDirectoryReader(segments:3:nrt _0(7.0.0):c13)
- [junit4] > full BKD path to target doc:
- [junit4] > Cell(x=-0.9060562472023252 TO 1.0010658113048514 y=-0.5681445384324596 TO 0.7613281936331098 z=-0.43144274682272304 TO 0.9977622920582089); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true
- [junit4] > on cell Cell(x=-0.9060562472023252 TO 1.0010658113048514 y=-0.5681445384324596 TO 0.7613281936331098 z=-0.43144274682272304 TO 0.9977622920582089); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true, wrapped visitor returned CELL_CROSSES_QUERY
- [junit4] > leaf visit docID=10 x=0.32866145093230836 y=0.21519085912590594 z=0.9177348472123349
+ * [junit4] > shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=65f193fc,
+ * testPoint=[lat=1.3005550159098878, lon=-2.4043250791032897([X=-0.1972404544647752, Y=-0.17911237095124333, Z=0.9617794725902562])],
+ * testPointInSet=false,
+ * shapes={
+ * {[lat=0.972005250702484, lon=-1.9776473855435277([X=-0.22278290030997686, Y=-0.5170266140533727, Z=0.8250470449472769])],
+ * [lat=0.5530477484903267, lon=2.5300578442038137([X=-0.6968439858923609, Y=0.4886310878468911, Z=0.5253825248638686])],
+ * [lat=1.5185372097372358, lon=-0.33848566616392867([X=0.04916162127975167, Y=-0.01730656055596007, Z=0.9964092501726799])]}}
+ * [junit4] > bounds=XYZBounds: [xmin=-1.0011188544924792 xmax=0.04916162177975167 ymin=-1.0011188544924792 ymax=1.0011188544924792 zmin=-5.0E-10 zmax=0.99766957331525]
+ * [junit4] > world bounds=( minX=-1.0011188539924791 maxX=1.0011188539924791 minY=-1.0011188539924791 maxY=1.0011188539924791 minZ=-0.9977622920221051 maxZ=0.9977622920221051
+ * [junit4] > quantized point=[X=0.32866145093230836, Y=0.21519085912590594, Z=0.9177348472123349] within shape? true within bounds? false
+ * [junit4] > unquantized point=[lat=1.166339260547107, lon=0.5797066870374205([X=0.3286614507856878, Y=0.21519085911319938, Z=0.9177348470779726])] within shape? true within bounds? false
+ * [junit4] > docID=10 deleted?=false
+ * [junit4] > query=PointInGeo3DShapeQuery: field=point: Shape: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=65f193fc, testPoint=[lat=1.3005550159098878, lon=-2.4043250791032897([X=-0.1972404544647752, Y=-0.17911237095124333, Z=0.9617794725902562])], testPointInSet=false, shapes={ {[lat=0.972005250702484, lon=-1.9776473855435277([X=-0.22278290030997686, Y=-0.5170266140533727, Z=0.8250470449472769])], [lat=0.5530477484903267, lon=2.53005784420381 [...]
+ * [junit4] > explanation:
+ * [junit4] > target is in leaf _0(7.0.0):c13 of full reader StandardDirectoryReader(segments:3:nrt _0(7.0.0):c13)
+ * [junit4] > full BKD path to target doc:
+ * [junit4] > Cell(x=-0.9060562472023252 TO 1.0010658113048514 y=-0.5681445384324596 TO 0.7613281936331098 z=-0.43144274682272304 TO 0.9977622920582089); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true
+ * [junit4] > on cell Cell(x=-0.9060562472023252 TO 1.0010658113048514 y=-0.5681445384324596 TO 0.7613281936331098 z=-0.43144274682272304 TO 0.9977622920582089); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true, wrapped visitor returned CELL_CROSSES_QUERY
+ * [junit4] > leaf visit docID=10 x=0.32866145093230836 y=0.21519085912590594 z=0.9177348472123349
*/
final GeoPoint testPoint =
new GeoPoint(PlanetModel.WGS84, 1.3005550159098878, -2.4043250791032897);
@@ -946,32 +946,32 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testLargePolygonFailureCase2() {
/*
- [junit4] > Throwable #1: java.lang.AssertionError: FAIL: id=2 should have matched but did not
- [junit4] > shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=6eccd33b,
- testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964495, Y=0.8854242006628827, Z=0.0317369552646047])],
- testPointInSet=false,
- shapes={ {
- [lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])],
- [lat=0.05101544777239065, lon=1.031558236908661([X=0.5133835679471972, Y=0.8579350866926241, Z=0.051049928818862174])],
- [lat=-0.011222928649880962, lon=1.5851249038356199([X=-0.01434320835886277, Y=1.0009526216234983, Z=-0.011235244842183226])],
- [lat=-0.02571365137215876, lon=0.5627875521419741([X=0.8464356149277266, Y=0.5339650936800929, Z=-0.025739527171261035])],
- [lat=0.03833766792865358, lon=1.0082901344798614([X=0.5335096521470836, Y=0.8462411929752105, Z=0.03837097111317845])],
- [lat=0.1719054969347345, lon=0.9024290407832926([X=0.6111941952395734, Y=0.7740553755547761, Z=0.17123457719021212])],
- [lat=0.08180947807010808, lon=1.0107147265848113([X=0.5300590148023426, Y=0.8453039531721928, Z=0.08180784289673602])]}}
- [junit4] > bounds=XYZBounds: [xmin=-1.0011188544924792 xmax=1.0011188544924792
- ymin=-1.0011188544924792 ymax=1.0011188544924792
- zmin=-0.025739527671261034 zmax=0.9977622925221051]
- [junit4] > world bounds=( minX=-1.0011188539924791 maxX=1.0011188539924791 minY=-1.0011188539924791 maxY=1.0011188539924791 minZ=-0.9977622920221051 maxZ=0.9977622920221051
- [junit4] > quantized point=[X=-0.477874179571219, Y=0.5908091335156603, Z=-0.6495967142221521] within shape? true within bounds? false
- [junit4] > unquantized point=[lat=-0.7073124559987376, lon=2.2509085326629887([X=-0.47787417938801546, Y=0.5908091336704123, Z=-0.6495967140640758])] within shape? true within bounds? false
- [junit4] > docID=2 deleted?=false
- [junit4] > query=PointInGeo3DShapeQuery: field=point: Shape: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=6eccd33b, testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964495, Y=0.8854242006628827, Z=0.0317369552646047])], testPointInSet=false, shapes={ {[lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])], [lat=0.05101544777239065, lon=1.031558236908661 [...]
- [junit4] > explanation:
- [junit4] > target is in leaf _0(7.0.0):C11 of full reader StandardDirectoryReader(segments:3:nrt _0(7.0.0):C11)
- [junit4] > full BKD path to target doc:
- [junit4] > Cell(x=-0.8906255176936849 TO 1.0005089994430834 y=-0.6808995306272861 TO 0.9675171153117977 z=-0.997762292058209 TO 0.9939318087373729); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true
- [junit4] > on cell Cell(x=-0.8906255176936849 TO 1.0005089994430834 y=-0.6808995306272861 TO 0.9675171153117977 z=-0.997762292058209 TO 0.9939318087373729); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true, wrapped visitor returned CELL_CROSSES_QUERY
- [junit4] > leaf visit docID=2 x=-0.477874179571219 y=0.5908091335156603 z=-0.6495967142221521
+ * [junit4] > Throwable #1: java.lang.AssertionError: FAIL: id=2 should have matched but did not
+ * [junit4] > shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=6eccd33b,
+ * testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964495, Y=0.8854242006628827, Z=0.0317369552646047])],
+ * testPointInSet=false,
+ * shapes={ {
+ * [lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])],
+ * [lat=0.05101544777239065, lon=1.031558236908661([X=0.5133835679471972, Y=0.8579350866926241, Z=0.051049928818862174])],
+ * [lat=-0.011222928649880962, lon=1.5851249038356199([X=-0.01434320835886277, Y=1.0009526216234983, Z=-0.011235244842183226])],
+ * [lat=-0.02571365137215876, lon=0.5627875521419741([X=0.8464356149277266, Y=0.5339650936800929, Z=-0.025739527171261035])],
+ * [lat=0.03833766792865358, lon=1.0082901344798614([X=0.5335096521470836, Y=0.8462411929752105, Z=0.03837097111317845])],
+ * [lat=0.1719054969347345, lon=0.9024290407832926([X=0.6111941952395734, Y=0.7740553755547761, Z=0.17123457719021212])],
+ * [lat=0.08180947807010808, lon=1.0107147265848113([X=0.5300590148023426, Y=0.8453039531721928, Z=0.08180784289673602])]}}
+ * [junit4] > bounds=XYZBounds: [xmin=-1.0011188544924792 xmax=1.0011188544924792
+ * ymin=-1.0011188544924792 ymax=1.0011188544924792
+ * zmin=-0.025739527671261034 zmax=0.9977622925221051]
+ * [junit4] > world bounds=( minX=-1.0011188539924791 maxX=1.0011188539924791 minY=-1.0011188539924791 maxY=1.0011188539924791 minZ=-0.9977622920221051 maxZ=0.9977622920221051
+ * [junit4] > quantized point=[X=-0.477874179571219, Y=0.5908091335156603, Z=-0.6495967142221521] within shape? true within bounds? false
+ * [junit4] > unquantized point=[lat=-0.7073124559987376, lon=2.2509085326629887([X=-0.47787417938801546, Y=0.5908091336704123, Z=-0.6495967140640758])] within shape? true within bounds? false
+ * [junit4] > docID=2 deleted?=false
+ * [junit4] > query=PointInGeo3DShapeQuery: field=point: Shape: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=6eccd33b, testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964495, Y=0.8854242006628827, Z=0.0317369552646047])], testPointInSet=false, shapes={ {[lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])], [lat=0.05101544777239065, lon=1.031558236908 [...]
+ * [junit4] > explanation:
+ * [junit4] > target is in leaf _0(7.0.0):C11 of full reader StandardDirectoryReader(segments:3:nrt _0(7.0.0):C11)
+ * [junit4] > full BKD path to target doc:
+ * [junit4] > Cell(x=-0.8906255176936849 TO 1.0005089994430834 y=-0.6808995306272861 TO 0.9675171153117977 z=-0.997762292058209 TO 0.9939318087373729); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true
+ * [junit4] > on cell Cell(x=-0.8906255176936849 TO 1.0005089994430834 y=-0.6808995306272861 TO 0.9675171153117977 z=-0.997762292058209 TO 0.9939318087373729); Shape relationship = OVERLAPS; Quantized point within cell = true; Unquantized point within cell = true, wrapped visitor returned CELL_CROSSES_QUERY
+ * [junit4] > leaf visit docID=2 x=-0.477874179571219 y=0.5908091335156603 z=-0.6495967142221521
*/
final GeoPoint testPoint =
new GeoPoint(PlanetModel.WGS84, 0.03170690566178683, 1.0862414976732029);
@@ -999,17 +999,17 @@ public class TestGeoPolygon extends LuceneTestCase {
// System.err.println(p);
/*
- [junit4] 2> GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=dcf3e99,
- testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964506, Y=0.8854242006628825, Z=0.0317369552646047])],
- testPointInSet=false,
- shapes={ {
- [lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])],
- [lat=0.05101544777239065, lon=1.031558236908661([X=0.5133835679471972, Y=0.8579350866926241, Z=0.051049928818862174])],
- [lat=-0.011222928649880962, lon=1.5851249038356199([X=-0.01434320835886277, Y=1.0009526216234983, Z=-0.011235244842183226])],
- [lat=-0.02571365137215876, lon=0.5627875521419741([X=0.8464356149277266, Y=0.5339650936800929, Z=-0.025739527171261035])],
- [lat=0.03833766792865358, lon=1.0082901344798614([X=0.5335096521470836, Y=0.8462411929752105, Z=0.03837097111317845])],
- [lat=0.1719054969347345, lon=0.9024290407832926([X=0.6111941952395734, Y=0.7740553755547761, Z=0.17123457719021212])]}}
- [lat=0.08180947807010808, lon=1.0107147265848113([X=0.5300590148023426, Y=0.8453039531721928, Z=0.08180784289673602])],
+ * [junit4] 2> GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=dcf3e99,
+ * testPoint=[lat=0.03170690566178683, lon=1.0862414976732029([X=0.46609969117964506, Y=0.8854242006628825, Z=0.0317369552646047])],
+ * testPointInSet=false,
+ * shapes={ {
+ * [lat=1.0774842300167298, lon=-0.11534121538553185([X=0.46969930266058374, Y=-0.054417217622152375, Z=0.8794587218580684])],
+ * [lat=0.05101544777239065, lon=1.031558236908661([X=0.5133835679471972, Y=0.8579350866926241, Z=0.051049928818862174])],
+ * [lat=-0.011222928649880962, lon=1.5851249038356199([X=-0.01434320835886277, Y=1.0009526216234983, Z=-0.011235244842183226])],
+ * [lat=-0.02571365137215876, lon=0.5627875521419741([X=0.8464356149277266, Y=0.5339650936800929, Z=-0.025739527171261035])],
+ * [lat=0.03833766792865358, lon=1.0082901344798614([X=0.5335096521470836, Y=0.8462411929752105, Z=0.03837097111317845])],
+ * [lat=0.1719054969347345, lon=0.9024290407832926([X=0.6111941952395734, Y=0.7740553755547761, Z=0.17123457719021212])]}}
+ * [lat=0.08180947807010808, lon=1.0107147265848113([X=0.5300590148023426, Y=0.8453039531721928, Z=0.08180784289673602])],
*/
final XYZBounds referenceBounds = new XYZBounds();
pSanity.getBounds(referenceBounds);
@@ -1512,15 +1512,15 @@ public class TestGeoPolygon extends LuceneTestCase {
}
/*
- [lat=-0.63542308910253, lon=0.9853722928232957([X=0.4446759777403525, Y=0.6707549854468698, Z=-0.5934780737681111])],
- [lat=0.0, lon=0.0([X=1.0011188539924791, Y=0.0, Z=0.0])],
- [lat=0.45435018176633574, lon=3.141592653589793([X=-0.8989684544372841, Y=1.1009188402610632E-16, Z=0.4390846549572752])],
- [lat=-0.375870856827283, lon=2.9129132647718414([X=-0.9065744420970767, Y=0.21100590938346708, Z=-0.36732668582405886])],
- [lat=-1.2205765069413237, lon=3.141592653589793([X=-0.3424714964202101, Y=4.194066218902145E-17, Z=-0.9375649457139603])]}}
-
- [junit4] 1> unquantized=[lat=-3.1780051348770987E-74, lon=-3.032608859187692([X=-0.9951793580358298, Y=-0.1088898762907205, Z=-3.181560858610375E-74])]
- [junit4] 1> quantized=[X=-0.9951793580415914, Y=-0.10888987641797832, Z=-2.3309121299774915E-10]
- */
+ * [lat=-0.63542308910253, lon=0.9853722928232957([X=0.4446759777403525, Y=0.6707549854468698, Z=-0.5934780737681111])],
+ * [lat=0.0, lon=0.0([X=1.0011188539924791, Y=0.0, Z=0.0])],
+ * [lat=0.45435018176633574, lon=3.141592653589793([X=-0.8989684544372841, Y=1.1009188402610632E-16, Z=0.4390846549572752])],
+ * [lat=-0.375870856827283, lon=2.9129132647718414([X=-0.9065744420970767, Y=0.21100590938346708, Z=-0.36732668582405886])],
+ * [lat=-1.2205765069413237, lon=3.141592653589793([X=-0.3424714964202101, Y=4.194066218902145E-17, Z=-0.9375649457139603])]}}
+ *
+ * [junit4] 1> unquantized=[lat=-3.1780051348770987E-74, lon=-3.032608859187692([X=-0.9951793580358298, Y=-0.1088898762907205, Z=-3.181560858610375E-74])]
+ * [junit4] 1> quantized=[X=-0.9951793580415914, Y=-0.10888987641797832, Z=-2.3309121299774915E-10]
+ */
@Test
public void testLUCENE8227() throws Exception {
List<GeoPoint> points = new ArrayList<>();
@@ -1532,10 +1532,10 @@ public class TestGeoPolygon extends LuceneTestCase {
GeoPolygonFactory.PolygonDescription pd = new GeoPolygonFactory.PolygonDescription(points);
/*
- for (int i = 0; i < points.size(); i++) {
- System.out.println("Point "+i+": "+points.get(i));
- }
- */
+ * for (int i = 0; i < points.size(); i++) {
+ * System.out.println("Point "+i+": "+points.get(i));
+ * }
+ */
final GeoPoint unquantized =
new GeoPoint(PlanetModel.WGS84, -3.1780051348770987E-74, -3.032608859187692);
@@ -1559,22 +1559,22 @@ public class TestGeoPolygon extends LuceneTestCase {
}
/*
- [junit4] 1> doc=754 is contained by shape but is outside the returned XYZBounds
- [junit4] 1> unquantized=[lat=2.4043303687704734E-204, lon=3.1342447995980507([X=-1.0010918284309325, Y=0.007356008974104805, Z=2.4070204634028112E-204])]
- [junit4] 1> quantized=[X=-1.0010918285430614, Y=0.007356008812298254, Z=2.3309121299774915E-10]
-
- [junit4] 1> doc=3728 is contained by shape but is outside the returned XYZBounds
- [junit4] 1> unquantized=[lat=2.4457272005608357E-47, lon=-3.1404077424936307([X=-1.001118151199965, Y=-0.0011862365610909341, Z=2.448463612203698E-47])]
- [junit4] 1> quantized=[X=-1.0011181510675629, Y=-0.001186236379718708, Z=2.3309121299774915E-10]
-
- [junit4] 1> shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=7969cab3,
- testPoint=[X=-0.07416172733314662, Y=0.5686488061136892, Z=0.8178445379402641], testPointInSet=true, shapes={ {
- [lat=-1.5707963267948966, lon=-1.0755217966112058([X=2.903696886845155E-17, Y=-5.375400029710238E-17, Z=-0.997762292022105])],
- [lat=-1.327365682666958, lon=-2.9674513704178316([X=-0.23690293696956322, Y=-0.04167672037374933, Z=-0.9685334156912658])],
- [lat=0.32288591161895097, lon=3.141592653589793([X=-0.9490627533610154, Y=1.1622666630935417E-16, Z=0.3175519551883462])],
- [lat=0.0, lon=0.0([X=1.0011188539924791, Y=0.0, Z=0.0])],
- [lat=0.2839194570254642, lon=-1.2434404554202965([X=0.30893121415043073, Y=-0.9097632721627391, Z=0.2803596238536593])]}}
- */
+ * [junit4] 1> doc=754 is contained by shape but is outside the returned XYZBounds
+ * [junit4] 1> unquantized=[lat=2.4043303687704734E-204, lon=3.1342447995980507([X=-1.0010918284309325, Y=0.007356008974104805, Z=2.4070204634028112E-204])]
+ * [junit4] 1> quantized=[X=-1.0010918285430614, Y=0.007356008812298254, Z=2.3309121299774915E-10]
+ *
+ * [junit4] 1> doc=3728 is contained by shape but is outside the returned XYZBounds
+ * [junit4] 1> unquantized=[lat=2.4457272005608357E-47, lon=-3.1404077424936307([X=-1.001118151199965, Y=-0.0011862365610909341, Z=2.448463612203698E-47])]
+ * [junit4] 1> quantized=[X=-1.0011181510675629, Y=-0.001186236379718708, Z=2.3309121299774915E-10]
+ *
+ * [junit4] 1> shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=7969cab3,
+ * testPoint=[X=-0.07416172733314662, Y=0.5686488061136892, Z=0.8178445379402641], testPointInSet=true, shapes={ {
+ * [lat=-1.5707963267948966, lon=-1.0755217966112058([X=2.903696886845155E-17, Y=-5.375400029710238E-17, Z=-0.997762292022105])],
+ * [lat=-1.327365682666958, lon=-2.9674513704178316([X=-0.23690293696956322, Y=-0.04167672037374933, Z=-0.9685334156912658])],
+ * [lat=0.32288591161895097, lon=3.141592653589793([X=-0.9490627533610154, Y=1.1622666630935417E-16, Z=0.3175519551883462])],
+ * [lat=0.0, lon=0.0([X=1.0011188539924791, Y=0.0, Z=0.0])],
+ * [lat=0.2839194570254642, lon=-1.2434404554202965([X=0.30893121415043073, Y=-0.9097632721627391, Z=0.2803596238536593])]}}
+ */
@Test
public void testLUCENE8227_case2() {
List<GeoPoint> points = new ArrayList<>();
@@ -1635,28 +1635,28 @@ public class TestGeoPolygon extends LuceneTestCase {
0.9977622932859774);
/*
- [junit4] 1> individual planes
- [junit4] 1> notableMinXPoints=[
- [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
- [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796]]
- notableMaxXPoints=[
- [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481],
- [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
- notableMinYPoints=[
- [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
- [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481]]
- notableMaxYPoints=[
- [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796],
- [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
- notableMinZPoints=[]
- notableMaxZPoints=[]
-
- [junit4] 1> All edge points=[
- [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
- [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796],
- [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481],
- [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
-
+ * [junit4] 1> individual planes
+ * [junit4] 1> notableMinXPoints=[
+ * [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
+ * [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796]]
+ * notableMaxXPoints=[
+ * [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481],
+ * [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
+ * notableMinYPoints=[
+ * [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
+ * [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481]]
+ * notableMaxYPoints=[
+ * [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796],
+ * [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
+ * notableMinZPoints=[]
+ * notableMaxZPoints=[]
+ *
+ * [junit4] 1> All edge points=[
+ * [X=0.1845405855034623, Y=-1.398547277986495E-9, Z=0.9806642352600131],
+ * [X=0.1845405855034623, Y=0.020766291030223535, Z=0.9804458120424796],
+ * [X=0.2730694323646922, Y=-1.398547277986495E-9, Z=0.959928047174481],
+ * [X=0.2730694323646922, Y=0.020766291030223535, Z=0.9597049045335464]]
+ *
*/
final GeoPoint edge1 =
@@ -1707,15 +1707,15 @@ public class TestGeoPolygon extends LuceneTestCase {
final GeoPolygon largeShape = GeoPolygonFactory.makeLargeGeoPolygon(PlanetModel.WGS84, pdList);
/* This is the output:
- [junit4] 1> shape = GeoCompositePolygon: {[
- GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[
- [lat=-1.2267098126036888, lon=3.141592653589793([X=-0.33671029227864785, Y=4.123511816790159E-17, Z=-0.9396354281810864])],
- [lat=0.2892272352400239, lon=0.017453291479645996([X=0.9591279281485559, Y=0.01674163926221766, Z=0.28545251693892165])],
- [lat=-1.5707963267948966, lon=1.6247683074702402E-201([X=6.109531986173988E-17, Y=9.926573944611206E-218, Z=-0.997762292022105])]], internalEdges={2}},
- GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[
- [lat=-1.2267098126036888, lon=3.141592653589793([X=-0.33671029227864785, Y=4.123511816790159E-17, Z=-0.9396354281810864])],
- [lat=-1.5707963267948966, lon=1.6247683074702402E-201([X=6.109531986173988E-17, Y=9.926573944611206E-218, Z=-0.997762292022105])],
- [lat=0.6723906085905078, lon=-3.0261581679831E-12([X=0.7821883235431606, Y=-2.367025584191143E-12, Z=0.6227413298552851])]], internalEdges={0}}]}
+ * [junit4] 1> shape = GeoCompositePolygon: {[
+ * GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[
+ * [lat=-1.2267098126036888, lon=3.141592653589793([X=-0.33671029227864785, Y=4.123511816790159E-17, Z=-0.9396354281810864])],
+ * [lat=0.2892272352400239, lon=0.017453291479645996([X=0.9591279281485559, Y=0.01674163926221766, Z=0.28545251693892165])],
+ * [lat=-1.5707963267948966, lon=1.6247683074702402E-201([X=6.109531986173988E-17, Y=9.926573944611206E-218, Z=-0.997762292022105])]], internalEdges={2}},
+ * GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[
+ * [lat=-1.2267098126036888, lon=3.141592653589793([X=-0.33671029227864785, Y=4.123511816790159E-17, Z=-0.9396354281810864])],
+ * [lat=-1.5707963267948966, lon=1.6247683074702402E-201([X=6.109531986173988E-17, Y=9.926573944611206E-218, Z=-0.997762292022105])],
+ * [lat=0.6723906085905078, lon=-3.0261581679831E-12([X=0.7821883235431606, Y=-2.367025584191143E-12, Z=0.6227413298552851])]], internalEdges={0}}]}
*/
final GeoPoint quantized =
@@ -1731,10 +1731,10 @@ public class TestGeoPolygon extends LuceneTestCase {
// This fails because the point is within the shape but apparently shouldn't be.
// Instrumenting isWithin finds that the point is on three edge planes somehow:
/*
- [junit4] 1> localIsWithin start for point [0.2416235655409041,5.90945326539883E-48,0.9682657046994557]
- [junit4] 1> For edge [A=-1.224646799147353E-16, B=-1.0, C=-7.498798913309287E-33, D=0.0, side=1.0] the point evaluation is -2.959035261382389E-17
- [junit4] 1> For edge [A=-3.0261581679831E-12, B=-0.9999999999999999, C=-1.8529874570670608E-28, D=0.0, side=1.0] the point evaluation is -7.31191126438807E-13
- [junit4] 1> For edge [A=4.234084035470679E-12, B=1.0, C=-1.5172037954732973E-12, D=0.0, side=1.0] the point evaluation is -4.460019207463956E-13
+ * [junit4] 1> localIsWithin start for point [0.2416235655409041,5.90945326539883E-48,0.9682657046994557]
+ * [junit4] 1> For edge [A=-1.224646799147353E-16, B=-1.0, C=-7.498798913309287E-33, D=0.0, side=1.0] the point evaluation is -2.959035261382389E-17
+ * [junit4] 1> For edge [A=-3.0261581679831E-12, B=-0.9999999999999999, C=-1.8529874570670608E-28, D=0.0, side=1.0] the point evaluation is -7.31191126438807E-13
+ * [junit4] 1> For edge [A=4.234084035470679E-12, B=1.0, C=-1.5172037954732973E-12, D=0.0, side=1.0] the point evaluation is -4.460019207463956E-13
*/
// These are too close to parallel. The only solution is to prevent the poly from being
// created. Let's see if Geo3d thinks they are parallel.
@@ -2535,18 +2535,18 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testLUCENE8281() {
/*
- [junit4] > Standard polygon: GeoCompositePolygon: {[GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[[lat=-3.89514302068452E-6, lon=6.597839410815709E-6([X=1.0011188539630433, Y=6.605221429683868E-6, Z=-3.89950111699443E-6])], [lat=-2.8213942160840002E-6, lon=1.608008770581648E-5([X=1.0011188538590383, Y=1.60980789753873E-5, Z=-2.8245509442632E-6])], [lat=3.8977187534179774E-6, lon=1.9713406091526053E-5([X=1.0011188537902969, Y=1.973546251320774E-5, Z=3.902079731596721E-6 [...]
- [junit4] > Large polygon: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=d8738cf, testPoint=[lat=7.28355694648262E-7, lon=5.126509206005681E-6([X=1.0011188539790565, Y=5.13224502127445E-6, Z=7.291706183250984E-7])], testPointInSet=true, shapes={ {[lat=-1.261719663233924E-5, lon=-1.5701544210600105E-5([X=1.001118853788849, Y=-1.5719111944122703E-5, Z=-1.2631313432823314E-5])], [lat=-3.89514302068452E-6, lon=6.597839410815709E-6([X=1.0011188539630433, [...]
- [junit4] > Point: [lat=4.983019447098944E-6, lon=-3.0E-323([X=1.0011188539799663, Y=-3.0E-323, Z=4.98859471828087E-6])]
- [junit4] > WKT: POLYGON((
- 3.7802835214482185E-4 -2.2317525568506174E-4,
- 9.213211597434869E-4 -1.6165398092423463E-4,
- 0.0011294949688719308 2.233228342998425E-4,
- 2.3315178103634778E-4 0.0011348087623821073,
- 0.0 4.244E-321,
- -8.996322151054578E-4 -7.22912116319714E-4,
- 3.7802835214482185E-4 -2.2317525568506174E-4))
- [junit4] > WKT: POINT(-1.7E-321 2.855059835503825E-4)
+ * [junit4] > Standard polygon: GeoCompositePolygon: {[GeoConvexPolygon: {planetmodel=PlanetModel.WGS84, points=[[lat=-3.89514302068452E-6, lon=6.597839410815709E-6([X=1.0011188539630433, Y=6.605221429683868E-6, Z=-3.89950111699443E-6])], [lat=-2.8213942160840002E-6, lon=1.608008770581648E-5([X=1.0011188538590383, Y=1.60980789753873E-5, Z=-2.8245509442632E-6])], [lat=3.8977187534179774E-6, lon=1.9713406091526053E-5([X=1.0011188537902969, Y=1.973546251320774E-5, Z=3.902079731596721 [...]
+ * [junit4] > Large polygon: GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=d8738cf, testPoint=[lat=7.28355694648262E-7, lon=5.126509206005681E-6([X=1.0011188539790565, Y=5.13224502127445E-6, Z=7.291706183250984E-7])], testPointInSet=true, shapes={ {[lat=-1.261719663233924E-5, lon=-1.5701544210600105E-5([X=1.001118853788849, Y=-1.5719111944122703E-5, Z=-1.2631313432823314E-5])], [lat=-3.89514302068452E-6, lon=6.597839410815709E-6([X=1.00111885396304 [...]
+ * [junit4] > Point: [lat=4.983019447098944E-6, lon=-3.0E-323([X=1.0011188539799663, Y=-3.0E-323, Z=4.98859471828087E-6])]
+ * [junit4] > WKT: POLYGON((
+ * 3.7802835214482185E-4 -2.2317525568506174E-4,
+ * 9.213211597434869E-4 -1.6165398092423463E-4,
+ * 0.0011294949688719308 2.233228342998425E-4,
+ * 2.3315178103634778E-4 0.0011348087623821073,
+ * 0.0 4.244E-321,
+ * -8.996322151054578E-4 -7.22912116319714E-4,
+ * 3.7802835214482185E-4 -2.2317525568506174E-4))
+ * [junit4] > WKT: POINT(-1.7E-321 2.855059835503825E-4)
*/
final List<GeoPoint> points = new ArrayList<>();
points.add(
@@ -2601,17 +2601,17 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testLUCENE8280() {
/*
- [junit4] 1> unquantized=[lat=0.16367268756896675, lon=-3.141592653589793([X=-0.9876510422569805, Y=-1.2095236875745584E-16, Z=0.16311061810965483])]
- [junit4] 1> quantized=[X=-0.9876510423773649, Y=-2.3309121299774915E-10, Z=0.16311061829120332]
- [junit4] 1> shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=7fb785c7,
- testPoint=[lat=-1.3164421003439726, lon=-0.3852878798825553([X=0.23270178206383424, Y=-0.09437388649617809, Z=-0.9658649833483698])], testPointInSet=true,
- shapes={ {
- [lat=-0.914670478121684, lon=2.4457272005608357E-47([X=0.609446252447186, Y=1.4905392768899487E-47, Z=-0.7915752112532345])],
- [lat=-0.737919215699403, lon=-1.0814374159521924([X=0.34764272191418555, Y=-0.6527705659008658, Z=-0.6724777381306498])],
- [lat=-0.2581712131420987, lon=-3.141592653589793([X=-0.9677277372221494, Y=-1.1851246758352164E-16, Z=-0.2555423342455023])],
- [lat=-0.40516490647074055, lon=2.4457272005608357E-47([X=0.919584346757591, Y=2.2490524500750083E-47, Z=-0.39440489992508504])],
- [lat=2.4457272005608357E-47, lon=-0.6244585784444767([X=0.8121874885299789, Y=-0.5853122613567737, Z=2.448463612203698E-47])]}}
- [junit4] 1> bounds=XYZBounds: [xmin=-1.0011188549924792 xmax=1.0011188549924792 ymin=-0.6616249691360604 ymax=1.0E-9 zmin=-0.9977622930221051 zmax=1.0E-9]
+ * [junit4] 1> unquantized=[lat=0.16367268756896675, lon=-3.141592653589793([X=-0.9876510422569805, Y=-1.2095236875745584E-16, Z=0.16311061810965483])]
+ * [junit4] 1> quantized=[X=-0.9876510423773649, Y=-2.3309121299774915E-10, Z=0.16311061829120332]
+ * [junit4] 1> shape=GeoComplexPolygon: {planetmodel=PlanetModel.WGS84, number of shapes=1, address=7fb785c7,
+ * testPoint=[lat=-1.3164421003439726, lon=-0.3852878798825553([X=0.23270178206383424, Y=-0.09437388649617809, Z=-0.9658649833483698])], testPointInSet=true,
+ * shapes={ {
+ * [lat=-0.914670478121684, lon=2.4457272005608357E-47([X=0.609446252447186, Y=1.4905392768899487E-47, Z=-0.7915752112532345])],
+ * [lat=-0.737919215699403, lon=-1.0814374159521924([X=0.34764272191418555, Y=-0.6527705659008658, Z=-0.6724777381306498])],
+ * [lat=-0.2581712131420987, lon=-3.141592653589793([X=-0.9677277372221494, Y=-1.1851246758352164E-16, Z=-0.2555423342455023])],
+ * [lat=-0.40516490647074055, lon=2.4457272005608357E-47([X=0.919584346757591, Y=2.2490524500750083E-47, Z=-0.39440489992508504])],
+ * [lat=2.4457272005608357E-47, lon=-0.6244585784444767([X=0.8121874885299789, Y=-0.5853122613567737, Z=2.448463612203698E-47])]}}
+ * [junit4] 1> bounds=XYZBounds: [xmin=-1.0011188549924792 xmax=1.0011188549924792 ymin=-0.6616249691360604 ymax=1.0E-9 zmin=-0.9977622930221051 zmax=1.0E-9]
*/
final List<GeoPoint> points = new ArrayList<>();
points.add(new GeoPoint(PlanetModel.WGS84, -0.914670478121684, 2.4457272005608357E-47));
@@ -2648,16 +2648,16 @@ public class TestGeoPolygon extends LuceneTestCase {
@Test
public void testLUCENE8337() {
/*
- {planetmodel=PlanetModel.WGS84, number of shapes=1, address=c865f21d,
- testPoint=[lat=2.114284741800425E-5, lon=-3.141516973708951([X=-1.0011188509002849, Y=-7.57645554894811E-5, Z=2.1166503175641402E-5])], testPointInSet=true, shapes={
- {[lat=1.4379241972924144E-5, lon=-3.141520309370815([X=-1.0011188512685139, Y=-7.24251615257059E-5, Z=1.4395330244708275E-5])],
- [lat=-1.858900171939205E-5, lon=-3.1415059739464217([X=-1.001118850057461, Y=-8.677662511280753E-5, Z=-1.860980009708855E-5])],
- [lat=2.7071641284581073E-5, lon=-3.141469177092562([X=-1.001118845991408, Y=-1.2361464904363391E-4, Z=2.7101930495137982E-5])],
- [lat=8.285235549000288E-5, lon=-3.1414967545451287([X=-1.0011188459297669, Y=-9.600634121467467E-5, Z=8.29450550819143E-5])],
- [lat=-8.956596846349593E-303, lon=-3.1415926535897922([X=-1.0011188539924791, Y=-1.0117738616818362E-15, Z=-8.966617970490158E-303])]}}
-
- [junit4] > Point: [lat=-6.499661194605612E-10, lon=-2.0286460544410216([X=-0.4425148814082194, Y=-0.8980086522698344, Z=-6.506933366482957E-10])]
- */
+ * {planetmodel=PlanetModel.WGS84, number of shapes=1, address=c865f21d,
+ * testPoint=[lat=2.114284741800425E-5, lon=-3.141516973708951([X=-1.0011188509002849, Y=-7.57645554894811E-5, Z=2.1166503175641402E-5])], testPointInSet=true, shapes={
+ * {[lat=1.4379241972924144E-5, lon=-3.141520309370815([X=-1.0011188512685139, Y=-7.24251615257059E-5, Z=1.4395330244708275E-5])],
+ * [lat=-1.858900171939205E-5, lon=-3.1415059739464217([X=-1.001118850057461, Y=-8.677662511280753E-5, Z=-1.860980009708855E-5])],
+ * [lat=2.7071641284581073E-5, lon=-3.141469177092562([X=-1.001118845991408, Y=-1.2361464904363391E-4, Z=2.7101930495137982E-5])],
+ * [lat=8.285235549000288E-5, lon=-3.1414967545451287([X=-1.0011188459297669, Y=-9.600634121467467E-5, Z=8.29450550819143E-5])],
+ * [lat=-8.956596846349593E-303, lon=-3.1415926535897922([X=-1.0011188539924791, Y=-1.0117738616818362E-15, Z=-8.966617970490158E-303])]}}
+ *
+ * [junit4] > Point: [lat=-6.499661194605612E-10, lon=-2.0286460544410216([X=-0.4425148814082194, Y=-0.8980086522698344, Z=-6.506933366482957E-10])]
+ */
final List<GeoPoint> points = new ArrayList<>();
points.add(new GeoPoint(PlanetModel.WGS84, 1.4379241972924144E-5, -3.141520309370815));
diff --git a/lucene/suggest/src/java/overview.html b/lucene/suggest/src/java/overview.html
index 5d25f50514e..696aa7be1ea 100644
--- a/lucene/suggest/src/java/overview.html
+++ b/lucene/suggest/src/java/overview.html
@@ -1,18 +1,18 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head>
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java
index a7f62d5f7f8..6539423e702 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java
@@ -283,21 +283,21 @@ public class RandomCodec extends AssertingCodec {
// TODO: also test 4-bit quantization, but this must somehow be restricted to even-length
// fields
/*
- new Lucene99HnswScalarQuantizedVectorsFormat(TestUtil.nextInt(random, 5, 50),
- TestUtil.nextInt(random, 10, 50),
- 1,
- 4,
- random.nextBoolean(),
- randomConfidenceInterval(random),
- null),
- new Lucene99HnswScalarQuantizedVectorsFormat(TestUtil.nextInt(random, 5, 50),
- TestUtil.nextInt(random, 10, 50),
- TestUtil.nextInt(random, 2, 8),
- 4,
- random.nextBoolean(),
- randomConfidenceInterval(random),
- ForkJoinPool.commonPool()),
- */
+ * new Lucene99HnswScalarQuantizedVectorsFormat(TestUtil.nextInt(random, 5, 50),
+ * TestUtil.nextInt(random, 10, 50),
+ * 1,
+ * 4,
+ * random.nextBoolean(),
+ * randomConfidenceInterval(random),
+ * null),
+ * new Lucene99HnswScalarQuantizedVectorsFormat(TestUtil.nextInt(random, 5, 50),
+ * TestUtil.nextInt(random, 10, 50),
+ * TestUtil.nextInt(random, 2, 8),
+ * 4,
+ * random.nextBoolean(),
+ * randomConfidenceInterval(random),
+ * ForkJoinPool.commonPool()),
+ */
new AssertingKnnVectorsFormat());
Collections.shuffle(formats, random);
diff --git a/lucene/test-framework/src/java/overview.html b/lucene/test-framework/src/java/overview.html
index 250a652b098..9a362ba15cc 100644
--- a/lucene/test-framework/src/java/overview.html
+++ b/lucene/test-framework/src/java/overview.html
@@ -1,22 +1,22 @@
<html>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<head>
- <title>Apache Lucene Test Framework API</title>
+ <title>Apache Lucene Test Framework API</title>
</head>
<body>
<p>