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

Merge remote-tracking branch 'origin/master' into docker

Browse Source
pull/55/head
luccioman 9 years ago
parent bae3c9bc4b 64a40c48d0
commit 3dfa7cdcec
20 changed files with 11217 additions and 35 deletions
Show Stats Download Patch File Download Diff File

14
.classpath
Unescape View File

@ -28,10 +28,10 @@
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.18.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.18.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.18.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.4.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.21.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.21.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.21.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xmpcore-5.1.2.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
@ -39,14 +39,14 @@
<classpathentry kind="lib" path="lib/spatial4j-0.5.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.6.jar"/>
<classpathentry kind="lib" path="lib/org.restlet.jar"/>
<classpathentry kind="lib" path="lib/fontbox-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-2.0.2.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-2.0.2.jar"/>
<classpathentry kind="lib" path="lib/bcmail-jdk15-1.46.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15-1.46.jar"/>
<classpathentry kind="lib" path="lib/poi-3.14-20160307.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.14-20160307.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.18.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.21.jar"/>
<classpathentry kind="lib" path="lib/chardet.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.2.17.v20160517.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.2.17.v20160517.jar"/>

14
build.xml
Unescape View File

@ -173,11 +173,11 @@
<pathelement location="${lib}/commons-jxpath-1.3.jar" />
<pathelement location="${lib}/commons-lang-2.6.jar" />
<pathelement location="${lib}/commons-logging-1.2.jar" />
<pathelement location="${lib}/fontbox-2.0.1.jar" />
<pathelement location="${lib}/fontbox-2.0.2.jar" />
<pathelement location="${lib}/guava-18.0.jar" />
<pathelement location="${lib}/htmllexer.jar" />
<pathelement location="${lib}/httpclient-4.5.2.jar" />
<pathelement location="${lib}/httpcore-4.4.4.jar" />
<pathelement location="${lib}/httpcore-4.4.5.jar" />
<pathelement location="${lib}/httpmime-4.5.2.jar" />
<pathelement location="${lib}/icu4j-57_1.jar" />
<pathelement location="${lib}/imageio-bmp-3.2.1.jar" />
@ -189,7 +189,7 @@
<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
<pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
<pathelement location="${lib}/jcifs-1.3.17.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.18.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.21.jar" />
<pathelement location="${lib}/jetty-client-9.2.17.v20160517.jar" />
<pathelement location="${lib}/jetty-continuation-9.2.17.v20160517.jar" />
<pathelement location="${lib}/jetty-deploy-9.2.17.v20160517.jar" />
@ -207,7 +207,7 @@
<pathelement location="${lib}/jsch-0.1.53.jar" />
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.9.2.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.18.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.21.jar" />
<pathelement location="${lib}/lucene-analyzers-common-5.5.1.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-5.5.1.jar" />
<pathelement location="${lib}/lucene-backward-codecs-5.5.1.jar" />
@ -229,11 +229,11 @@
<pathelement location="${lib}/metadata-extractor-2.9.1.jar" />
<pathelement location="${lib}/noggit-0.5.jar" />
<pathelement location="${lib}/org.restlet.jar" />
<pathelement location="${lib}/pdfbox-2.0.1.jar" />
<pathelement location="${lib}/pdfbox-2.0.2.jar" />
<pathelement location="${lib}/poi-3.14-20160307.jar" />
<pathelement location="${lib}/poi-scratchpad-3.14-20160307.jar" />
<pathelement location="${lib}/slf4j-api-1.7.18.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.18.jar" />
<pathelement location="${lib}/slf4j-api-1.7.21.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.21.jar" />
<pathelement location="${lib}/solr-core-5.5.1.jar" />
<pathelement location="${lib}/solr-solrj-5.5.1.jar" />
<pathelement location="${lib}/spatial4j-0.5.jar" />

16
htroot/Translator_p.java
Unescape View File

@ -62,10 +62,22 @@ public class Translator_p {
filename = post.get("sourcefile", filename);
}
// prepare filename list for drop-down list
Iterator<String> filenameit = origTrans.keySet().iterator();
final boolean filteruntranslated = post == null ? false : post.getBoolean("filteruntranslated");
while (filenameit.hasNext()) {
String tmp = filenameit.next();
if (filteruntranslated) { // filter filenames with untranslated entries
Map<String, String> tmptrans = origTrans.get(tmp);
boolean hasuntrans = false;
for (String x : tmptrans.values()) {
if (x == null || x.isEmpty()) {
hasuntrans = true;
break;
}
}
if (!hasuntrans) continue;
}
prop.put("filelist_" + i + "_filename", tmp);
prop.put("filelist_" + i + "_selected", tmp.equals(filename));
i++;
@ -76,11 +88,9 @@ public class Translator_p {
Map<String, String> origTextList = origTrans.get(filename);
i = 0;
boolean filteruntranslated = false;
boolean editapproved = false; // to switch already approved translation in edit mode
int textlistid = -1;
if (post != null) {
filteruntranslated = post.getBoolean("filteruntranslated");
prop.put("filter.checked", filteruntranslated); // remember filter setting
textlistid = post.getInt("approve", -1);
if (post.containsKey("editapproved")) {

3
htroot/env/templates/metas.template vendored
Unescape View File

@ -5,6 +5,9 @@
<meta name="description" content="Software HTTP Freeware Home Page" />
<meta name="copyright" content="Michael Christen et al." />
<!-- Ensure proper rendering and touch zooming on mobile devices -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Bootstrap core CSS -->
<link href="/env/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="/env/bootstrap/css/bootstrap-switch.min.css" rel="stylesheet">

0
lib/fontbox-2.0.1.License → lib/fontbox-2.0.2.License
Unescape View File

BIN
lib/fontbox-2.0.1.jar → lib/fontbox-2.0.2.jar
View File

Binary file not shown.

BIN
lib/httpcore-4.4.4.jar
View File

Binary file not shown.

0
lib/httpcore-4.4.4.License → lib/httpcore-4.4.5.License
Unescape View File

BIN
lib/httpcore-4.4.5.jar
View File

Binary file not shown.

BIN
lib/jcl-over-slf4j-1.7.18.jar → lib/jcl-over-slf4j-1.7.21.jar
View File

Binary file not shown.

BIN
lib/log4j-over-slf4j-1.7.18.jar → lib/log4j-over-slf4j-1.7.21.jar
View File

Binary file not shown.

0
lib/pdfbox-2.0.1.License → lib/pdfbox-2.0.2.License
Unescape View File

BIN
lib/pdfbox-2.0.1.jar → lib/pdfbox-2.0.2.jar
View File

Binary file not shown.

BIN
lib/slf4j-api-1.7.18.jar
View File

Binary file not shown.

BIN
lib/slf4j-api-1.7.21.jar
View File

Binary file not shown.

BIN
lib/slf4j-jdk14-1.7.18.jar → lib/slf4j-jdk14-1.7.21.jar
View File

Binary file not shown.

15
locales/de.lng
Unescape View File

@ -131,7 +131,7 @@ Delete selected pattern(s)==Lösche gewählten Eintrag
Move selected pattern(s) to==Verschiebe gewählten Eintrag zu
#You can select them here for deletion==Sie können sie einzeln zum Löschen wählen
Add new pattern:==Neuen Eintrag hinzufügen:
"Add URL pattern"=="URL hinzufügen"
Add URL pattern==URL hinzufügen
The right '*', after the '/', can be replaced by a==Der rechte Asterisk '*', nach dem '/', kann ersetzt werden durch einen
>regular expression<==>regulären Ausdruck<
domain.net/fullpath<==domain.de/vollerpfad<
@ -447,7 +447,7 @@ Your peer can be reached by other peers==Ihr Peer kann von anderen Peers erreich
Peer Port:==Peer-Port:
with SSL== mit SSL
https enabled==https aktiviert
on port == auf Port
on port==auf Port
Configure your router for YaCy using UPnP:==Ihren Router für YaCy konfigurieren, via UPnP:
Configuration was not successful. This may take a moment.==Die Konfiguration war nicht erfolgreich. Dies kann einen Moment dauern.
Set Configuration==Konfiguration speichern
@ -557,6 +557,8 @@ Unable to get URL:==Nicht möglich die angegebene Datei von folgender URL zu ins
Error saving the language file.==Es trat ein Fehler beim Speichern der Sprachdatei auf.
Make sure that you only download data from trustworthy sources. The new language file==Stellen Sie sicher, dass Sie nur Dateien aus vertrauenswürdigen Quellen herunterladen.
might overwrite existing data if a file of the same name exists already.==Achtung, existiert bereits eine Datei mit gleichem Namen, wird diese überschrieben !
Simple Editor==Einfacher Editor
to add untranslated text==zum bearbeiten unübersetzter Texte
#-----------------------------
#File: ConfigLiveSearch.html
@ -1059,7 +1061,7 @@ Load<==Auslastung<
#File: CrawlProfileEditor_p.html
#---------------------------
>Crawl Profile Editor<==>Crawl Profil Editor<
Crawl Profile Editor==Crawl Profil Editor
>Crawler Steering<==>Crawler Steuerung<
>Crawl Scheduler<==>Crawl Planer<
>Scheduled Crawls can be modified in this table<==>Geplante Crawls können in dieser Tabelle geändert werden<
@ -1184,7 +1186,7 @@ Other already visited URLs are sorted out as "double", if they are not allowed u
>From Link-List of URL<==>Von Linkliste der URL<
From Sitemap<==Von Sitemap<
From Sitemap==Von Sitemap
From File (enter a path<br/>within your local file system)==Von Datei (Verwende Pfad einer Datei<br/>auf dem lokalen Dateisystem)
A web crawl performs a double-check on all links found in the internet against the internal database. If the same url is found again,==Ein Web Crawl führt eine Dubletten Prüfung anhand einer internen Datenbank gegen alle im Internet gefunden Links durch. Wenn dieselbe URL wieder gefunden wird,
@ -2828,6 +2830,7 @@ Message Forwarding (optional)==Nachrichten Weiterleitung (optional)
#File: Settings_Crawler.inc
#---------------------------
>Crawler Settings<==>Crawler Einstellungen<
Generic Crawler Settings==Allgemeine Crawler Einstellungen
Connection timeout in ms==Verbindungs-Timeout in ms
means unlimited==schaltet die Begrenzung ab
@ -3938,7 +3941,7 @@ DHT Transfer==DHT-Verteilung
Proxy Use==Proxy Benutzung
Local Crawling</a>==Lokales Crawlen</a>
Global Crawling</a>==Globales Crawlen</a>
Surrogate Import</a>==Surrogat Import</a>
Surrogate Import==Surrogat Import
Processing Monitor==Prozess Monitor
Loader<==Lade Puffer<
Rejected URLs==Abgelehnte URLs
@ -3962,7 +3965,7 @@ Parser Configuration==Parser Konfiguration
#-----------------------------
>Appearance==>Erscheinungsbild
>Language==>Sprache
>Search Page Layout==>Suchseitenlayout
Search Page Layout==Suchseitenlayout
#-----------------------------
#File: env/templates/submenuIndexControl.template

24
locales/fr.lng
Unescape View File

@ -37,7 +37,7 @@ not shared::shared==non partag&eacute;::partag&eacute;
New list:==Nouvelle liste:
"create"=="cr&eacute;er"
Settings for this list==Param&egrave;tres de cette liste
Save==Sauvegarder
"Save"=="Sauvegarder"
Share/don't share this list==Partager/ne pas partager cette liste
Delete this list==Supprimer cette liste
Edit this list==&eacute;diter cette liste
@ -208,7 +208,7 @@ Your peer can be reached by other peers==Votre noeud est joignable par les autre
Peer Port:==Port logiciel du noeud:
with SSL==avec SSL
(https enabled#==(https activ&eacute;#
: on port <==: sur le port <
on port==sur le port
Configure your router for YaCy using UPnP:==Configurer votre routeur pour YaCy en utilisant UPnP:
Configuration was not successful. This may take a moment.== &Eacute;chec de la configuration. Cela peut prendre un moment.
Set Configuration==Sauver la configuration
@ -230,7 +230,7 @@ You did not open a port in your firewall or your router does not forward the ser
This is needed if you want to fully participate in the YaCy network.==Cela est n&eacute;cessaire pour participer pleinement au r&eacute;seau YaCy.
You can also use your peer without opening it, but this is not recomended.==Vous pouvez aussi utiliser votre pair sans l'ouvrir, mais cela n'est pas recommand&eacute;.
The peer port was changed successfully. Your browser will be redirected to the new ==Le port logiciel du noeud a &eacute;t&eacute; correctement modifi&eacute;. Votre navigateur sera redirig&eacute; vers la nouvelle
in 5 seconds.==dans 5 secondes
in 5 seconds.==dans 5 secondes.
#-----------------------------
#File: ConfigLanguage_p.html
@ -264,7 +264,7 @@ eMail==courriel
#Yahoo!==Yahoo!
#MSN==MSN
Comment==Commentaire
"Save"==Sauvegarder
"Save"=="Sauvegarder"
You can use==Vous pouvez utiliser
here.==ici.
#-----------------------------
@ -291,8 +291,8 @@ Error saving the skin.==Erreur en sauvegardant le th&egrave;me.
Release will be installed. Please wait.==La version va &ecirc;tre install&eacute;e. Veuillez patienter.
This servlet can only be used on operation systems that are currently supported for deploy functions.==Cette servlet ne peut &ecirc;tre utilis&eacute;e que sur les syst&egrave;mes d'exploitation actuellement support&eacute;s pour les fonctions de d&eacute;ploiement.
If you see this message this means that your operation system is not supported.==Si vous voyez ce message, &ccedil;a signifie que votre syst&egrave;me d'exploitation n'est pas support&eacute;.
>Manual System Update==>Mise &agrave; jour manuelle du syst&egrave;me
>Current installed Release==>Version actuellement install&eacute;e
Manual System Update==Mise &agrave; jour manuelle du syst&egrave;me
Current installed Release==Version actuellement install&eacute;e
>Available Releases==>Versions disponibles
>changelog<==>journal des changements<
> and <==> et <
@ -1083,6 +1083,11 @@ Attributes==Attributs
"#(page)#::Process All News::Delete All News::Abort Publication of All News::Delete All News#(/page)#"==#(page)#::Traiter toutes les nouvelles::Supprimer toutes les nouvelles::Annuler la publication de toutes les nouvelles::Supprimer toutes les nouvelles#(/page)#
#-----------------------------
#File: Performance_p.html
#---------------------------
Performance Settings==Param&egrave;tres de performance
#-----------------------------
#File: PerformanceQueues_p.html
#---------------------------
Performance Settings of Queues and Processes==Param&egrave;tres de performance des files et des processus
@ -1303,7 +1308,6 @@ Page.==page.
#File: QuickCrawlLink_p.html
#---------------------------
YaCy '#[clientname]#': Quick Crawl Link==YaCy '#[clientname]#''#[clientname]#': Schnell-Crawl-Link
Quick Crawl Link==Lien d'exploration rapide
Quickly adding Bookmarks:==Ajouter rapidement aux favoris:
Simply drag and drop the link shown below to your Browsers Toolbar/Link-Bar.==Il suffit de glisser le lien ci-dessous vers votre barre d'outils/barre de liens.
@ -2251,6 +2255,12 @@ Site Crawling==Balayage de sites
Parser Configuration==Configuration de l'analyseur syntaxique
#-----------------------------
#File: env/templates/submenuDesign.template
#-----------------------------
>Appearance==>Apparence
>Language==>Langue
#-----------------------------
#File: env/templates/submenuIndexControl.template
#---------------------------
Index Control Menu==Menu contr&ocirc;le d'index

11151
locales/master.lng.xlf
View File

File diff suppressed because it is too large Load Diff

15
pom.xml
Unescape View File

@ -368,7 +368,8 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
<version>4.4.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@ -408,7 +409,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.18</version>
<version>1.7.21</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
@ -433,7 +435,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.18</version>
<version>1.7.21</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@ -453,7 +456,8 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@ -548,7 +552,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.18</version>
<version>1.7.21</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>pt.tumba</groupId>

Write Preview
Loading…
Cancel
Save