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

upgrade to solr 4.2.1

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent 36202f27b0
commit cf0acd2cb4
27 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File

29
.classpath
Unescape View File

@ -50,23 +50,26 @@
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/> <classpathentry kind="lib" path="lib/jcl-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/zookeeper-3.4.5.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="lib" path="lib/guava-13.0.1.jar"/> <classpathentry kind="lib" path="lib/guava-13.0.1.jar"/>
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/> <classpathentry kind="lib" path="lib/wstx-asl-3.2.9.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/log4j-over-slf4j-1.7.2.jar"/> <classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.2.1.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"/>

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

@ -69,17 +69,20 @@
<string>$JAVAROOT/lib/jsch-0.1.42.jar</string> <string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.jar</string> <string>$JAVAROOT/lib/json-simple-1.1.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.1.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-common-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-classification-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-core-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-facet-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-grouping-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-highlighter-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-join-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-memory-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-misc-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.1.0.jar</string> <string>$JAVAROOT/lib/lucene-queries-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.2.1.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.2.1.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>
@ -89,8 +92,8 @@
<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-core-4.2.1.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.1.0.jar</string> <string>$JAVAROOT/lib/solr-solrj-4.2.1.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.9.jar</string> <string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>

29
build.xml
Unescape View File

@ -189,17 +189,20 @@
<pathelement location="${lib}/json-simple-1.1.jar" /> <pathelement location="${lib}/json-simple-1.1.jar" />
<pathelement location="${lib}/jsoup-1.6.3.jar" /> <pathelement location="${lib}/jsoup-1.6.3.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.1.0.jar" /> <pathelement location="${lib}/lucene-analyzers-common-4.2.1.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.1.0.jar" /> <pathelement location="${lib}/lucene-analyzers-phonetic-4.2.1.jar" />
<pathelement location="${lib}/lucene-core-4.1.0.jar" /> <pathelement location="${lib}/lucene-classification-4.2.1.jar" />
<pathelement location="${lib}/lucene-grouping-4.1.0.jar" /> <pathelement location="${lib}/lucene-core-4.2.1.jar" />
<pathelement location="${lib}/lucene-highlighter-4.1.0.jar" /> <pathelement location="${lib}/lucene-facet-4.2.1.jar" />
<pathelement location="${lib}/lucene-memory-4.1.0.jar" /> <pathelement location="${lib}/lucene-grouping-4.2.1.jar" />
<pathelement location="${lib}/lucene-misc-4.1.0.jar" /> <pathelement location="${lib}/lucene-highlighter-4.2.1.jar" />
<pathelement location="${lib}/lucene-queries-4.1.0.jar" /> <pathelement location="${lib}/lucene-join-4.2.1.jar" />
<pathelement location="${lib}/lucene-queryparser-4.1.0.jar" /> <pathelement location="${lib}/lucene-memory-4.2.1.jar" />
<pathelement location="${lib}/lucene-spatial-4.1.0.jar" /> <pathelement location="${lib}/lucene-misc-4.2.1.jar" />
<pathelement location="${lib}/lucene-suggest-4.1.0.jar" /> <pathelement location="${lib}/lucene-queries-4.2.1.jar" />
<pathelement location="${lib}/lucene-queryparser-4.2.1.jar" />
<pathelement location="${lib}/lucene-spatial-4.2.1.jar" />
<pathelement location="${lib}/lucene-suggest-4.2.1.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" />
@ -209,8 +212,8 @@
<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-core-4.2.1.jar" />
<pathelement location="${lib}/solr-solrj-4.1.0.jar" /> <pathelement location="${lib}/solr-solrj-4.2.1.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.9.jar" /> <pathelement location="${lib}/wstx-asl-3.2.9.jar" />

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

Binary file not shown.

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

Binary file not shown.

BIN
lib/lucene-classification-4.2.1.jar
View File

Binary file not shown.

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

Binary file not shown.

BIN
lib/lucene-facet-4.2.1.jar
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
lib/lucene-join-4.2.1.jar
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

4
source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java
Unescape View File

@ -37,7 +37,6 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter; import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.ResultContext; import org.apache.solr.response.ResultContext;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.DateField;
import org.apache.solr.schema.FieldType; import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField; import org.apache.solr.schema.SchemaField;
@ -177,6 +176,7 @@ public class EnhancedXMLResponseWriter implements QueryResponseWriter {
writer.write(lb); writer.write(lb);
} }
@SuppressWarnings("deprecation")
private static void writeField(final Writer writer, final FieldType type, final String name, final String value) throws IOException { private static void writeField(final Writer writer, final FieldType type, final String name, final String value) throws IOException {
String typeName = type.getTypeName(); String typeName = type.getTypeName();
if (typeName.equals(SolrType.text_general.printName()) || if (typeName.equals(SolrType.text_general.printName()) ||
@ -190,7 +190,7 @@ public class EnhancedXMLResponseWriter implements QueryResponseWriter {
} else if (typeName.equals(SolrType.num_long.printName())) { } else if (typeName.equals(SolrType.num_long.printName())) {
writeTag(writer, "long", name, value, true); writeTag(writer, "long", name, value, true);
} else if (typeName.equals(SolrType.date.printName())) { } else if (typeName.equals(SolrType.date.printName())) {
writeTag(writer, "date", name, DateField.formatExternal(new Date(Long.parseLong(value))), true); writeTag(writer, "date", name, org.apache.solr.schema.DateField.formatExternal(new Date(Long.parseLong(value))), true); // this is declared deprecated in solr 4.2.1 but is still used as done here
} else if (typeName.equals(SolrType.num_float.printName())) { } else if (typeName.equals(SolrType.num_float.printName())) {
writeTag(writer, "float", name, value, true); writeTag(writer, "float", name, value, true);
} else if (typeName.equals(SolrType.num_double.printName())) { } else if (typeName.equals(SolrType.num_double.printName())) {

4
source/net/yacy/search/query/QueryParams.java
Unescape View File

@ -38,6 +38,7 @@ import java.util.regex.PatternSyntaxException;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrQuery.ORDER; import org.apache.solr.client.solrj.SolrQuery.ORDER;
import org.apache.solr.client.solrj.SolrQuery.SortClause;
import net.yacy.cora.document.ASCII; import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.analysis.Classification; import net.yacy.cora.document.analysis.Classification;
@ -509,7 +510,8 @@ public final class QueryParams {
// set ranking // set ranking
if (this.ranking.coeff_date == RankingProfile.COEFF_MAX) { if (this.ranking.coeff_date == RankingProfile.COEFF_MAX) {
// set a most-recent ordering // set a most-recent ordering
params.setSortField(CollectionSchema.last_modified.getSolrFieldName(), ORDER.desc); params.setSort(new SortClause(CollectionSchema.last_modified.getSolrFieldName(), SolrQuery.ORDER.desc));
//params.setSortField(CollectionSchema.last_modified.getSolrFieldName(), ORDER.desc); // deprecated in Solr 4.2
} }
} }
if (fq.length() > 0) { if (fq.length() > 0) {

Write Preview
Loading…
Cancel
Save