Commit 9e31ef69820c29e678de396b9709567c83aa2922
1 parent
422a1007
Fix ignoreItem maximum
Showing
3 changed files
with
5 additions
and
4 deletions
docker/Dockerfile
1 | 1 | # Automatically generated Dockerfile |
2 | -# - Build 2017-03-31 06:10 | |
2 | +# - Build 2017-04-13 05:28 | |
3 | 3 | # - Lucene/Solr version 6.5.0 |
4 | 4 | # - Mtas release 20170331 |
5 | 5 | # |
... | ... | @@ -70,7 +70,7 @@ RUN service apache2 stop && \ |
70 | 70 | chmod -R 755 /var/www/html && \ |
71 | 71 | printf "echo\n" >> /start.sh && \ |
72 | 72 | printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \ |
73 | - printf "echo \" Timestamp 2017-03-31 06:10\"\n" >> /start.sh && \ | |
73 | + printf "echo \" Timestamp 2017-04-13 05:28\"\n" >> /start.sh && \ | |
74 | 74 | printf "echo \" Lucene/Solr version 6.5.0\"\n" >> /start.sh && \ |
75 | 75 | printf "echo \" Mtas release 20170331\"\n" >> /start.sh && \ |
76 | 76 | printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh && \ |
... | ... |
src/mtas/search/spans/MtasSpanSequenceQuery.java
... | ... | @@ -16,6 +16,7 @@ import org.apache.lucene.search.IndexSearcher; |
16 | 16 | import org.apache.lucene.search.spans.SpanWeight; |
17 | 17 | import org.apache.lucene.search.spans.Spans; |
18 | 18 | |
19 | +import mtas.search.spans.util.MtasIgnoreItem; | |
19 | 20 | import mtas.search.spans.util.MtasSpanQuery; |
20 | 21 | |
21 | 22 | /** |
... | ... | @@ -72,7 +73,7 @@ public class MtasSpanSequenceQuery extends MtasSpanQuery { |
72 | 73 | if (ignoreQuery.getField() == null |
73 | 74 | || field.equals(ignoreQuery.getField())) { |
74 | 75 | this.ignoreQuery = ignoreQuery; |
75 | - this.maximumIgnoreLength = maximumIgnoreLength == null ? 1 | |
76 | + this.maximumIgnoreLength = maximumIgnoreLength == null ? MtasIgnoreItem.DEFAULT_MAXIMUM_IGNORE_LENGTH | |
76 | 77 | : maximumIgnoreLength; |
77 | 78 | } else { |
78 | 79 | throw new IllegalArgumentException( |
... | ... |
src/mtas/search/spans/util/MtasIgnoreItem.java
... | ... | @@ -12,7 +12,7 @@ import org.apache.lucene.search.spans.Spans; |
12 | 12 | public class MtasIgnoreItem { |
13 | 13 | |
14 | 14 | /** The Constant DEFAULT_MAXIMUM_IGNORE_LENGTH. */ |
15 | - static final int DEFAULT_MAXIMUM_IGNORE_LENGTH = 10; | |
15 | + public static final int DEFAULT_MAXIMUM_IGNORE_LENGTH = 10; | |
16 | 16 | |
17 | 17 | /** The ignore spans. */ |
18 | 18 | Spans ignoreSpans; |
... | ... |