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

Merge branch 'master' of git@github.com:yacy/yacy_search_server.git

Browse Source
pull/45/head
Michael Peter Christen 9 years ago
parent a6bf0b1649 7b02cacb12
commit ef2cc4f690
26 changed files with 2050 additions and 40 deletions
Show Stats Download Patch File Download Diff File

28
.classpath
Unescape View File

@ -50,20 +50,20 @@
<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
<classpathentry kind="lib" path="lib/chardet.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.2.14.v20151106.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.1.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>

28
build.xml
Unescape View File

@ -193,20 +193,20 @@
<pathelement location="${lib}/jcifs-1.3.17.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.13.jar" />
<pathelement location="${lib}/jempbox-1.8.11.jar" />
<pathelement location="${lib}/jetty-client-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-continuation-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-deploy-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-http-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-io-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-jmx-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-proxy-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-security-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-server-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-servlet-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-servlets-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-util-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-webapp-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-xml-9.2.14.v20151106.jar" />
<pathelement location="${lib}/jetty-client-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-continuation-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-deploy-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-http-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-io-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-jmx-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-proxy-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-security-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-server-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-servlet-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-servlets-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-util-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-webapp-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-xml-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jsch-0.1.53.jar" />
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.8.3.jar" />

3
htroot/ConfigBasic.html
Unescape View File

@ -33,13 +33,14 @@
<li>
<img src="env/grafics/ok.png" height="16" width="16" alt="ok" />&nbsp;Select a language for the interface:<br />
<fieldset>
<input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(lang_en)#::checked="checked"#(/lang_en)# /><label for="lang_en">English</label>
<input type="radio" name="language" value="de" id="lang_de" onchange="this.form.submit()" #(lang_de)#::checked="checked"#(/lang_de)# /><label for="lang_de">Deutsch</label>&nbsp;
<input type="radio" name="language" value="fr" id="lang_fr" onchange="this.form.submit()" #(lang_fr)#::checked="checked"#(/lang_fr)# /><label for="lang_fr">Fran&ccedil;ais</label>&nbsp;
<input type="radio" name="language" value="cn" id="lang_cn" onchange="this.form.submit()" #(lang_cn)#::checked="checked"#(/lang_cn)# /><label for="lang_cn">&#27721;&#35821;/&#28450;&#35486</label>
<input type="radio" name="language" value="ru" id="lang_ru" onchange="this.form.submit()" #(lang_ru)#::checked="checked"#(/lang_ru)# /><label for="lang_ru">&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;</label>
<input type="radio" name="language" value="uk" id="lang_uk" onchange="this.form.submit()" #(lang_uk)#::checked="checked"#(/lang_uk)# /><label for="lang_uk">&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;</label>
<input type="radio" name="language" value="hi" id="lang_hi" onchange="this.form.submit()" #(lang_hi)#::checked="checked"#(/lang_hi)# /><label for="lang_hi">&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;</label>
<input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(lang_en)#::checked="checked"#(/lang_en)# /><label for="lang_en">English</label>
<input type="radio" name="language" value="ja" id="lang_ja" onchange="this.form.submit()" #(lang_ja)#::checked="checked"#(/lang_ja)# /><label for="lang_ja">&#26085;&#26412;&#35486;</label>
</fieldset>
</li>
<!-- take care that no other items are changed, but also change the former if no js is enabled -->

1
htroot/ConfigBasic.java
Unescape View File

@ -275,6 +275,7 @@ public class ConfigBasic {
prop.put("lang_ru", "0");
prop.put("lang_uk", "0");
prop.put("lang_en", "0");
prop.put("lang_jp", "0");
if ("default".equals(lang)) {
prop.put("lang_en", "1");
} else {

6
htroot/WebStructurePicture_p.java
Unescape View File

@ -117,7 +117,11 @@ public class WebStructurePicture_p {
for (int i = 0; i < hostlist.length; i++) {
String host = hostlist[i];
String hash = null;
try {hash = ASCII.String((new DigestURL("http://" + host)).hash(), 6, 6);} catch (final MalformedURLException e) {ConcurrentLog.logException(e);}
try {
hash = ASCII.String((new DigestURL("http://" + host)).hash(), 6, 6);
} catch (final MalformedURLException e) {
continue;
}
Map.Entry<String, String> centernode = new AbstractMap.SimpleEntry<String, String>(hash, host);
double angle = 2.0d * i * Math.PI / hostlist.length;
if (hostlist.length == 3) angle -= Math.PI / 2;

0
lib/jetty-9.2.14.v20151106.License → lib/jetty-9.2.15.v20160210.License
Unescape View File

BIN
lib/jetty-client-9.2.14.v20151106.jar → lib/jetty-client-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-continuation-9.2.14.v20151106.jar → lib/jetty-continuation-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-deploy-9.2.14.v20151106.jar → lib/jetty-deploy-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-http-9.2.14.v20151106.jar → lib/jetty-http-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-io-9.2.14.v20151106.jar → lib/jetty-io-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-jmx-9.2.14.v20151106.jar → lib/jetty-jmx-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-proxy-9.2.14.v20151106.jar → lib/jetty-proxy-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-security-9.2.14.v20151106.jar → lib/jetty-security-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-server-9.2.14.v20151106.jar → lib/jetty-server-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-servlet-9.2.14.v20151106.jar → lib/jetty-servlet-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-servlets-9.2.14.v20151106.jar → lib/jetty-servlets-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-util-9.2.14.v20151106.jar → lib/jetty-util-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-webapp-9.2.14.v20151106.jar → lib/jetty-webapp-9.2.15.v20160210.jar
View File

Binary file not shown.

BIN
lib/jetty-xml-9.2.14.v20151106.jar → lib/jetty-xml-9.2.15.v20160210.jar
View File

Binary file not shown.

2009
locales/ja.lng
View File

File diff suppressed because it is too large Load Diff

2
nbproject/project.xml
Unescape View File

@ -83,7 +83,7 @@
<compilation-unit>
<package-root>source</package-root>
<package-root>htroot</package-root>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.1.jar;lib/lucene-analyzers-phonetic-5.4.1.jar;lib/lucene-backward-codecs-5.4.1.jar;lib/lucene-classification-5.4.1.jar;lib/lucene-codecs-5.4.1.jar;lib/lucene-core-5.4.1.jar;lib/lucene-facet-5.4.1.jar;lib/lucene-grouping-5.4.1.jar;lib/lucene-highlighter-5.4.1.jar;lib/lucene-join-5.4.1.jar;lib/lucene-memory-5.4.1.jar;lib/lucene-misc-5.4.1.jar;lib/lucene-queries-5.4.1.jar;lib/lucene-queryparser-5.4.1.jar;lib/lucene-spatial-5.4.1.jar;lib/lucene-suggest-5.4.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.1.jar;lib/solr-solrj-5.4.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.4.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.15.v20160210.jar;lib/jetty-continuation-9.2.15.v20160210.jar;lib/jetty-deploy-9.2.15.v20160210.jar;lib/jetty-http-9.2.15.v20160210.jar;lib/jetty-io-9.2.15.v20160210.jar;lib/jetty-jmx-9.2.15.v20160210.jar;lib/jetty-proxy-9.2.15.v20160210.jar;lib/jetty-security-9.2.15.v20160210.jar;lib/jetty-server-9.2.15.v20160210.jar;lib/jetty-servlet-9.2.15.v20160210.jar;lib/jetty-servlets-9.2.15.v20160210.jar;lib/jetty-util-9.2.15.v20160210.jar;lib/jetty-webapp-9.2.15.v20160210.jar;lib/jetty-xml-9.2.15.v20160210.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.1.jar;lib/lucene-analyzers-phonetic-5.4.1.jar;lib/lucene-backward-codecs-5.4.1.jar;lib/lucene-classification-5.4.1.jar;lib/lucene-codecs-5.4.1.jar;lib/lucene-core-5.4.1.jar;lib/lucene-facet-5.4.1.jar;lib/lucene-grouping-5.4.1.jar;lib/lucene-highlighter-5.4.1.jar;lib/lucene-join-5.4.1.jar;lib/lucene-memory-5.4.1.jar;lib/lucene-misc-5.4.1.jar;lib/lucene-queries-5.4.1.jar;lib/lucene-queryparser-5.4.1.jar;lib/lucene-spatial-5.4.1.jar;lib/lucene-suggest-5.4.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.1.jar;lib/solr-solrj-5.4.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.4.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<built-to>lib/yacycore.jar</built-to>
<source-level>1.7</source-level>
</compilation-unit>

2
pom.xml
Unescape View File

@ -36,7 +36,7 @@
<!-- the Solr version used in dependency section for all related dependencies -->
<solr.version>5.4.1</solr.version>
<!-- the Jetty version used in dependency section for all related dependencies -->
<jetty.version>9.2.14.v20151106</jetty.version>
<jetty.version>9.2.15.v20160210</jetty.version>
<!-- properties used for filtering yacyBuildProperties.java -->
<REPL_DATE>${DSTAMP}</REPL_DATE>

5
source/net/yacy/cora/document/id/AnchorURL.java
Unescape View File

@ -168,9 +168,4 @@ public class AnchorURL extends DigestURL {
">" + this.textBody + "</a>";
}
@Override
public String toString() {
return this.toNormalform(false);
}
}

1
source/net/yacy/cora/document/id/MultiProtocolURL.java
Unescape View File

@ -967,7 +967,6 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
@Override
public String toString() {
assert false; // this shall not be used to avoid confusion with AnchorURL.toString
return toNormalform(false);
}

5
source/net/yacy/http/servlets/SolrSelectServlet.java
Unescape View File

@ -39,7 +39,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.federate.solr.Ranking;
import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
import net.yacy.cora.federate.solr.connector.SolrConnector;
@ -50,6 +49,7 @@ import net.yacy.cora.federate.solr.responsewriter.HTMLResponseWriter;
import net.yacy.cora.federate.solr.responsewriter.OpensearchResponseWriter;
import net.yacy.cora.federate.solr.responsewriter.SnapshotImagesReponseWriter;
import net.yacy.cora.federate.solr.responsewriter.YJsonResponseWriter;
import net.yacy.data.UserDB;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;
import net.yacy.search.query.AccessTracker;
@ -122,7 +122,8 @@ public class SolrSelectServlet extends HttpServlet {
MultiMapSolrParams mmsp = SolrRequestParsers.parseQueryString(hrequest.getQueryString());
Switchboard sb = Switchboard.getSwitchboard();
boolean authenticated = true;
// TODO: isUserInRole needs a login to jetty container (not done automatically on admin from localhost)
boolean authenticated = hrequest.isUserInRole(UserDB.AccessRight.ADMIN_RIGHT.toString());;
// count remote searches if this was part of a p2p search
if (mmsp.getMap().containsKey("partitions")) {

Write Preview
Loading…
Cancel
Save