boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

update to Solr 4.1.0

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent d1cb4cbc84
commit 4323621a76
31 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File

28
.classpath
Unescape View File

@ -47,20 +47,6 @@
<classpathentry kind="lib" path="lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/> <classpathentry kind="lib" path="lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/> <classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/apache-solr-core-4.0.0.jar" sourcepath="/Users/admin/Development/sourcecode/apache-solr-4.0.0-src/src/java"/>
<classpathentry kind="lib" path="lib/apache-solr-solrj-4.0.0.jar" sourcepath="/Users/admin/Development/sourcecode/apache-solr-4.0.0-src/src/java"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.0.0.jar" sourcepath="/Users/admin/Development/sourcecode/apache-solr-4.0.0-src/src/java"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.0.0.jar" sourcepath="/Users/admin/Development/sourcecode/apache-solr-4.0.0-src/src/java"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.3.6.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/> <classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/> <classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/> <classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/>
@ -70,6 +56,20 @@
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/> <classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/> <classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/> <classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.5.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.1.0.jar" sourcepath="/Users/admin/Development/sourcecode/solr-4.1.0/src/java"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.1.0.jar" sourcepath="/Users/admin/Development/sourcecode/solr-4.1.0/src/java"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/> <classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/> <classpathentry kind="lib" path="lib/htmllexer.jar"/>

28
addon/YaCy.app/Contents/Info.plist
Unescape View File

@ -40,8 +40,6 @@
<string>$JAVAROOT/lib/J7Zip-modified.jar</string> <string>$JAVAROOT/lib/J7Zip-modified.jar</string>
<string>$JAVAROOT/lib/activation.jar</string> <string>$JAVAROOT/lib/activation.jar</string>
<string>$JAVAROOT/lib/apache-mime4j-0.6.jar</string> <string>$JAVAROOT/lib/apache-mime4j-0.6.jar</string>
<string>$JAVAROOT/lib/apache-solr-core-4.0.0.jar</string>
<string>$JAVAROOT/lib/apache-solr-solrj-4.0.0.jar</string>
<string>$JAVAROOT/lib/arq-2.8.7.jar</string> <string>$JAVAROOT/lib/arq-2.8.7.jar</string>
<string>$JAVAROOT/lib/bcmail-jdk15-145.jar</string> <string>$JAVAROOT/lib/bcmail-jdk15-145.jar</string>
<string>$JAVAROOT/lib/bcprov-jdk15-145.jar</string> <string>$JAVAROOT/lib/bcprov-jdk15-145.jar</string>
@ -74,17 +72,17 @@
<string>$JAVAROOT/lib/json-simple-1.1.jar</string> <string>$JAVAROOT/lib/json-simple-1.1.jar</string>
<string>$JAVAROOT/lib/log4j-1.2.17.jar</string> <string>$JAVAROOT/lib/log4j-1.2.17.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string> <string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-common-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-core-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-grouping-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-highlighter-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-memory-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-misc-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-queries-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-queryparser-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-spatial-4.1.0.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.0.0.jar</string> <string>$JAVAROOT/lib/lucene-suggest-4.1.0.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.4.0-beta-1.jar</string> <string>$JAVAROOT/lib/metadata-extractor-2.4.0-beta-1.jar</string>
<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string> <string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
<string>$JAVAROOT/lib/pdfbox-1.7.1.jar</string> <string>$JAVAROOT/lib/pdfbox-1.7.1.jar</string>
@ -94,13 +92,15 @@
<string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string> <string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.1.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.1.0.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string> <string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string> <string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.7.jar</string> <string>$JAVAROOT/lib/wstx-asl-3.2.7.jar</string>
<string>$JAVAROOT/lib/xercesImpl.jar</string> <string>$JAVAROOT/lib/xercesImpl.jar</string>
<string>$JAVAROOT/lib/xml-apis.jar</string> <string>$JAVAROOT/lib/xml-apis.jar</string>
<string>$JAVAROOT/lib/yacycore.jar</string> <string>$JAVAROOT/lib/yacycore.jar</string>
<string>$JAVAROOT/lib/zookeeper-3.3.6.jar</string> <string>$JAVAROOT/lib/zookeeper-3.4.5.jar</string>
</array> </array>
<key>Properties</key> <key>Properties</key>
<dict> <dict>

28
build.xml
Unescape View File

@ -159,8 +159,6 @@
<pathelement location="${lib}/J7Zip-modified.jar" /> <pathelement location="${lib}/J7Zip-modified.jar" />
<pathelement location="${lib}/activation.jar" /> <pathelement location="${lib}/activation.jar" />
<pathelement location="${lib}/apache-mime4j-0.6.jar" /> <pathelement location="${lib}/apache-mime4j-0.6.jar" />
<pathelement location="${lib}/apache-solr-core-4.0.0.jar" />
<pathelement location="${lib}/apache-solr-solrj-4.0.0.jar" />
<pathelement location="${lib}/arq-2.8.7.jar" /> <pathelement location="${lib}/arq-2.8.7.jar" />
<pathelement location="${lib}/bcmail-jdk15-145.jar" /> <pathelement location="${lib}/bcmail-jdk15-145.jar" />
<pathelement location="${lib}/bcprov-jdk15-145.jar" /> <pathelement location="${lib}/bcprov-jdk15-145.jar" />
@ -194,17 +192,17 @@
<pathelement location="${lib}/jsoup-1.6.3.jar" /> <pathelement location="${lib}/jsoup-1.6.3.jar" />
<pathelement location="${lib}/log4j-1.2.17.jar" /> <pathelement location="${lib}/log4j-1.2.17.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" /> <pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.0.0.jar" /> <pathelement location="${lib}/lucene-analyzers-common-4.1.0.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.0.0.jar" /> <pathelement location="${lib}/lucene-analyzers-phonetic-4.1.0.jar" />
<pathelement location="${lib}/lucene-core-4.0.0.jar" /> <pathelement location="${lib}/lucene-core-4.1.0.jar" />
<pathelement location="${lib}/lucene-grouping-4.0.0.jar" /> <pathelement location="${lib}/lucene-grouping-4.1.0.jar" />
<pathelement location="${lib}/lucene-highlighter-4.0.0.jar" /> <pathelement location="${lib}/lucene-highlighter-4.1.0.jar" />
<pathelement location="${lib}/lucene-memory-4.0.0.jar" /> <pathelement location="${lib}/lucene-memory-4.1.0.jar" />
<pathelement location="${lib}/lucene-misc-4.0.0.jar" /> <pathelement location="${lib}/lucene-misc-4.1.0.jar" />
<pathelement location="${lib}/lucene-queries-4.0.0.jar" /> <pathelement location="${lib}/lucene-queries-4.1.0.jar" />
<pathelement location="${lib}/lucene-queryparser-4.0.0.jar" /> <pathelement location="${lib}/lucene-queryparser-4.1.0.jar" />
<pathelement location="${lib}/lucene-spatial-4.0.0.jar" /> <pathelement location="${lib}/lucene-spatial-4.1.0.jar" />
<pathelement location="${lib}/lucene-suggest-4.0.0.jar" /> <pathelement location="${lib}/lucene-suggest-4.1.0.jar" />
<pathelement location="${lib}/metadata-extractor-2.4.0-beta-1.jar" /> <pathelement location="${lib}/metadata-extractor-2.4.0-beta-1.jar" />
<pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" /> <pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" />
<pathelement location="${lib}/pdfbox-1.7.1.jar" /> <pathelement location="${lib}/pdfbox-1.7.1.jar" />
@ -214,12 +212,14 @@
<pathelement location="${lib}/servlet-api-2.5-20081211.jar" /> <pathelement location="${lib}/servlet-api-2.5-20081211.jar" />
<pathelement location="${lib}/slf4j-api-1.7.2.jar" /> <pathelement location="${lib}/slf4j-api-1.7.2.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" /> <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
<pathelement location="${lib}/solr-core-4.1.0.jar" />
<pathelement location="${lib}/solr-solrj-4.1.0.jar" />
<pathelement location="${lib}/spatial4j-0.3.jar" /> <pathelement location="${lib}/spatial4j-0.3.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" /> <pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/wstx-asl-3.2.7.jar" /> <pathelement location="${lib}/wstx-asl-3.2.7.jar" />
<pathelement location="${lib}/xercesImpl.jar" /> <pathelement location="${lib}/xercesImpl.jar" />
<pathelement location="${lib}/xml-apis.jar" /> <pathelement location="${lib}/xml-apis.jar" />
<pathelement location="${lib}/zookeeper-3.3.6.jar" /> <pathelement location="${lib}/zookeeper-3.4.5.jar" />
</path> </path>
<target name="compile-core" depends="init" description="compile YaCy core"> <target name="compile-core" depends="init" description="compile YaCy core">

BIN
lib/apache-solr-core-4.0.0.jar
View File

Binary file not shown.

BIN
lib/apache-solr-solrj-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-common-4.0.0.jar → lib/lucene-analyzers-common-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-phonetic-4.0.0.jar → lib/lucene-analyzers-phonetic-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-core-4.0.0.jar → lib/lucene-core-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-misc-4.0.0.jar → lib/lucene-misc-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queryparser-4.0.0.jar → lib/lucene-queryparser-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.1.0.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.0.0.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.1.0.jar
View File

Binary file not shown.

0
lib/apache-solr-core-4.0.0.License → lib/solr-core-4.1.0.License
Unescape View File

BIN
lib/solr-core-4.1.0.jar
View File

Binary file not shown.

0
lib/apache-solr-solrj-4.0.0.License → lib/solr-solrj-4.1.0.License
Unescape View File

BIN
lib/solr-solrj-4.1.0.jar
View File

Binary file not shown.

BIN
lib/zookeeper-3.3.6.jar
View File

Binary file not shown.

BIN
lib/zookeeper-3.4.5.jar
View File

Binary file not shown.

6
source/net/yacy/cora/federate/solr/SolrServlet.java
Unescape View File

@ -45,8 +45,8 @@ import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.request.ServletSolrParams;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.QueryResponseWriter; import org.apache.solr.response.QueryResponseWriter;
@ -55,6 +55,7 @@ import org.apache.solr.response.XMLResponseWriter;
import org.apache.solr.search.DocIterator; import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList; import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.servlet.SolrRequestParsers;
import org.apache.solr.servlet.cache.HttpCacheHeaderUtil; import org.apache.solr.servlet.cache.HttpCacheHeaderUtil;
import org.apache.solr.servlet.cache.Method; import org.apache.solr.servlet.cache.Method;
import org.apache.solr.util.FastWriter; import org.apache.solr.util.FastWriter;
@ -126,7 +127,8 @@ public class SolrServlet implements Filter {
// prepare request to solr // prepare request to solr
hrequest.setAttribute("org.apache.solr.CoreContainer", core); hrequest.setAttribute("org.apache.solr.CoreContainer", core);
req = connector.request(new ServletSolrParams(hrequest)); MultiMapSolrParams mmsp = SolrRequestParsers.parseQueryString(hrequest.getQueryString());
req = connector.request(mmsp);
SolrQueryResponse rsp = connector.query(req); SolrQueryResponse rsp = connector.query(req);

17
source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java
Unescape View File

@ -24,8 +24,6 @@ package net.yacy.cora.federate.solr.connector;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import net.yacy.cora.federate.solr.SolrServlet; import net.yacy.cora.federate.solr.SolrServlet;
import net.yacy.cora.federate.solr.YaCySchema; import net.yacy.cora.federate.solr.YaCySchema;
import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.logging.Log;
@ -50,7 +48,6 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
import org.xml.sax.SAXException;
import com.google.common.io.Files; import com.google.common.io.Files;
@ -97,17 +94,11 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
} }
} }
try { this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
if (this.cores == null) {
// try again
System.gc();
this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml")); this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
if (this.cores == null) {
// try again
System.gc();
this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
}
} catch (ParserConfigurationException e) {
throw new IOException(e.getMessage(), e);
} catch (SAXException e) {
throw new IOException(e.getMessage(), e);
} }
this.defaultCoreName = this.cores.getDefaultCoreName(); this.defaultCoreName = this.cores.getDefaultCoreName();
this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1" this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1"

5
source/net/yacy/search/index/Fulltext.java
Unescape View File

@ -65,10 +65,10 @@ import net.yacy.kelondro.util.MemoryControl;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
import org.apache.commons.httpclient.util.DateUtil; import org.apache.commons.httpclient.util.DateUtil;
import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.apache.lucene.util.Version;
public final class Fulltext { public final class Fulltext {
@ -155,9 +155,10 @@ public final class Fulltext {
if (commitWithin >= 0) esc.setCommitWithinMs(commitWithin); if (commitWithin >= 0) esc.setCommitWithinMs(commitWithin);
Version luceneVersion = esc.getConfig().getLuceneVersion("luceneMatchVersion"); Version luceneVersion = esc.getConfig().getLuceneVersion("luceneMatchVersion");
String lvn = luceneVersion.name(); String lvn = luceneVersion.name();
Log.logInfo("Fulltext", "using lucene version " + lvn);
int p = lvn.indexOf('_'); int p = lvn.indexOf('_');
assert SOLR_PATH.endsWith(lvn.substring(p)) : "luceneVersion = " + lvn + ", solrPath = " + SOLR_PATH + ", p = " + p + ", check defaults/solr/solrconfig.xml"; assert SOLR_PATH.endsWith(lvn.substring(p)) : "luceneVersion = " + lvn + ", solrPath = " + SOLR_PATH + ", p = " + p + ", check defaults/solr/solrconfig.xml";
Log.logInfo("MetadataRepository", "connected solr in " + solrLocation.toString() + ", lucene version " + lvn); Log.logInfo("Fulltext", "connected solr in " + solrLocation.toString() + ", lucene version " + lvn);
this.solr.connect0(esc); this.solr.connect0(esc);
} }

Write Preview
Loading…
Cancel
Save