Skip to content
Snippets Groups Projects
Commit ccc4dba6 authored by Greg DiCristofaro's avatar Greg DiCristofaro
Browse files

solr by default in upgrade

parent 556c89f0
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
public final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings { public final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final boolean DEFAULT_INDEX_TO_SOLR = true;
private final HashSet<String> namesOfEnabledKeywordLists; private final HashSet<String> namesOfEnabledKeywordLists;
private HashSet<String> namesOfDisabledKeywordLists; // Added in version 1.1 private HashSet<String> namesOfDisabledKeywordLists; // Added in version 1.1
...@@ -42,7 +43,8 @@ public final class KeywordSearchJobSettings implements IngestModuleIngestJobSett ...@@ -42,7 +43,8 @@ public final class KeywordSearchJobSettings implements IngestModuleIngestJobSett
private boolean ocrOnly; private boolean ocrOnly;
private boolean indexToSolr; // use object boolean so older settings missing this setting will deserialize to null.
private Boolean indexToSolr;
/** /**
* Constructs ingest job settings for the keywords search module. * Constructs ingest job settings for the keywords search module.
...@@ -202,7 +204,7 @@ private void upgradeFromOlderVersions() { ...@@ -202,7 +204,7 @@ private void upgradeFromOlderVersions() {
} }
boolean isIndexToSolrEnabled() { boolean isIndexToSolrEnabled() {
return indexToSolr; return indexToSolr == null ? DEFAULT_INDEX_TO_SOLR : indexToSolr;
} }
void setIndexToSolrEnabled(boolean enabled){ void setIndexToSolrEnabled(boolean enabled){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment