diff --git a/htroot/CrawlMonitorRemoteStart.java b/htroot/CrawlMonitorRemoteStart.java
index 8accaf87fd..906de0ea5a 100644
--- a/htroot/CrawlMonitorRemoteStart.java
+++ b/htroot/CrawlMonitorRemoteStart.java
@@ -61,8 +61,8 @@ record = recordIterator.next();
prop.put("otherCrawlStartInProgress_" + showedCrawl + "_dark", dark ? "1" : "0");
prop.put("otherCrawlStartInProgress_" + showedCrawl + "_cre", record.created().toString());
prop.put("otherCrawlStartInProgress_" + showedCrawl + "_peername", peername);
- prop.put("otherCrawlStartInProgress_" + showedCrawl + "_startURL", record.attributes().get("startURL").toString());
- prop.put("otherCrawlStartInProgress_" + showedCrawl + "_intention", record.attributes().get("intention").toString());
+ prop.put("otherCrawlStartInProgress_" + showedCrawl + "_startURL", record.attributes().get("startURL"));
+ prop.put("otherCrawlStartInProgress_" + showedCrawl + "_intention", record.attributes().get("intention"));
prop.put("otherCrawlStartInProgress_" + showedCrawl + "_generalDepth", record.attributes().get("generalDepth"));
prop.put("otherCrawlStartInProgress_" + showedCrawl + "_crawlingQ", ("true".equals(record.attributes().get("crawlingQ"))) ? "1" : "0");
showedCrawl++;
@@ -88,8 +88,8 @@ record = recordIterator.next();
prop.put("otherCrawlStartFinished_" + showedCrawl + "_dark", dark ? "1" : "0");
prop.put("otherCrawlStartFinished_" + showedCrawl + "_cre", record.created().toString());
prop.putHTML("otherCrawlStartFinished_" + showedCrawl + "_peername", peername);
- prop.putHTML("otherCrawlStartFinished_" + showedCrawl + "_startURL", record.attributes().get("startURL").toString());
- prop.put("otherCrawlStartFinished_" + showedCrawl + "_intention", record.attributes().get("intention").toString());
+ prop.putHTML("otherCrawlStartFinished_" + showedCrawl + "_startURL", record.attributes().get("startURL"));
+ prop.put("otherCrawlStartFinished_" + showedCrawl + "_intention", record.attributes().get("intention"));
prop.put("otherCrawlStartFinished_" + showedCrawl + "_generalDepth", record.attributes().get("generalDepth"));
prop.put("otherCrawlStartFinished_" + showedCrawl + "_crawlingQ", ("true".equals(record.attributes().get("crawlingQ"))) ? "1" : "0");
showedCrawl++;
diff --git a/htroot/Crawler_p.java b/htroot/Crawler_p.java
index 4f440a0acb..c964596e8b 100644
--- a/htroot/Crawler_p.java
+++ b/htroot/Crawler_p.java
@@ -594,6 +594,9 @@ public static serverObjects respond(final RequestHeader header, final serverObje
m.remove("generalFilter");
m.remove("specificFilter");
m.put("intention", post.get("intention", "").replace(',', '/'));
+ if (successurls.size() > 0) { // just include at least one of the startURL's in case of multiple for the news service
+ m.put("startURL", successurls.iterator().next().toNormalform(true));
+ }
sb.peers.newsPool.publishMyNews(sb.peers.mySeed(), NewsPool.CATEGORY_CRAWL_START, m);
}
} else {
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index f00bba3756..fd8e604e11 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -60,9 +60,7 @@
import net.yacy.data.DidYouMean;
import net.yacy.data.UserDB;
import net.yacy.data.ymark.YMarkTables;
-import net.yacy.document.Document;
import net.yacy.document.LibraryProvider;
-import net.yacy.document.Parser;
import net.yacy.document.Tokenizer;
import net.yacy.kelondro.data.meta.URIMetadataNode;
import net.yacy.kelondro.util.Bitfield;
@@ -73,7 +71,6 @@
import net.yacy.peers.EventChannel;
import net.yacy.peers.NewsPool;
import net.yacy.peers.graphics.ProfilingGraph;
-import net.yacy.repository.Blacklist.BlacklistType;
import net.yacy.search.EventTracker;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;
@@ -195,6 +192,7 @@ public static serverObjects respond(
prop.put("geoinfo", "0");
prop.put("rss_queryenc", "");
prop.put("meanCount", 5);
+ prop.put("eventID",""); // mandatory parameter for yacysearchtrailer/yacysearchitem includes
return prop;
}
diff --git a/libbuild/GitRevMavenTask/src/GitRevMavenTask.java b/libbuild/GitRevMavenTask/src/GitRevMavenTask.java
index ebee6b1dba..0775905e45 100644
--- a/libbuild/GitRevMavenTask/src/GitRevMavenTask.java
+++ b/libbuild/GitRevMavenTask/src/GitRevMavenTask.java
@@ -87,7 +87,7 @@ public void execute() throws MojoExecutionException {
break;
}
}
- if (lastTag != null || distance++ > 999) {
+ if (lastTag != null || distance++ > 90999) {
break;
}
}
diff --git a/libbuild/GitRevTask/GitRevTask.java b/libbuild/GitRevTask/GitRevTask.java
index 959e0b50fc..8834a87bf3 100644
--- a/libbuild/GitRevTask/GitRevTask.java
+++ b/libbuild/GitRevTask/GitRevTask.java
@@ -79,7 +79,7 @@ public void execute() {
break;
}
}
- if (lastTag != null || distance++ > 999) break;
+ if (lastTag != null || distance++ > 90999) break;
}
walk.dispose();
if (lastTag == null) {
diff --git a/locales/cn.lng b/locales/cn.lng
index 98b01c6fef..a200bd6e20 100644
--- a/locales/cn.lng
+++ b/locales/cn.lng
@@ -1069,7 +1069,7 @@ Network Scanner==网络扫描器
YaCy can scan a network segment for available http, ftp and smb server.==YaCy可扫描http, ftp 和smb服务器.
You must first select a IP range and then, after this range is scanned,==须先指定IP范围, 再进行扫描,
it is possible to select servers that had been found for a full-site crawl.==才有可能选择主机并将其作为全站crawl的服务器.
-No servers had been detected in the given IP range #[iprange]#.
+#No servers had been detected in the given IP range==
Please enter a different IP range for another scan.==未检测到可用服务器, 请重新指定IP范围.
Please wait...==请稍候...
>Scan the network<==>扫描网络<
@@ -2952,7 +2952,6 @@ New Password is empty.==新密码为空.
#File: ViewFile.html
#---------------------------
-YaCy '#[clientname]#': View URL Content==YaCy '#[clientname]#': 查看文件内容
View URL Content==查看链接内容
>Get URL Viewer<==>获取链接浏览器<
>URL Metadata<==>链接元数据<
diff --git a/locales/de.lng b/locales/de.lng
index f03046679e..8de7210a6d 100644
--- a/locales/de.lng
+++ b/locales/de.lng
@@ -1334,7 +1334,7 @@ Network Scanner==Netzwerk Scanner
YaCy can scan a network segment for available http, ftp and smb server.==YaCy kann ein Netzwerksegment auf verfügbare HTTP, FTP und SMB Server hin absuchen.
You must first select a IP range and then, after this range is scanned,==Sie müssen zuerst einen IP Bereich festlegen und dann, nachdem dieser Bereich gescannt wurde,
it is possible to select servers that had been found for a full-site crawl.==ist es möglich einen gefunden Server für eine volle Seiten Suche crawlen zu lassen.
-No servers had been detected in the given IP range #[iprange]#.
+No servers had been detected in the given IP range==Es wurde kein Server im angegebenen IP Bereich gefunden
Please enter a different IP range for another scan.==Bitte geben Sie einen anderen IP Bereich ein für einen weiteren Scan.
Please wait...==Bitte warten...
>Scan the network<==>Das Netzwerk Scannen<
@@ -3147,7 +3147,7 @@ For community support, please visit our==Für Unterstützung aus der Community,
#File: Status_p.inc
#---------------------------
-#System Status==System Status
+System Status==Systemstatus
Unknown==unbekannt
YaCy version:==YaCy Version:
Uptime:==Online seit:
@@ -3493,7 +3493,6 @@ New Password is empty.==Das neue Passwort ist leer.
#File: ViewFile.html
#---------------------------
-YaCy '#[clientname]#': View URL Content==YaCy '#[clientname]#': Zeige URL Inhalte
View URL Content==Zeige URL Inhalte
>Get URL Viewer<==>URL Betrachter<
"Show Metadata"=="Metadaten anzeigen"
diff --git a/locales/gr.lng b/locales/gr.lng
index fa73b2581e..bccae501d2 100644
--- a/locales/gr.lng
+++ b/locales/gr.lng
@@ -101,7 +101,7 @@ You do not need to provide any personal data here, but if you want to distribute
#Yahoo!==Yahoo!
#MSN=MSN
Comment==Σχόλιο
-"Save"==Αποθήκευση
+"Save"=="Αποθήκευση"
#-----------------------------
#File: Connections_p.html
diff --git a/locales/hi.lng b/locales/hi.lng
index 5c69825cea..3f2f7774eb 100644
--- a/locales/hi.lng
+++ b/locales/hi.lng
@@ -1077,7 +1077,7 @@ Network Scanner==नेटवर्क स्कैनर
YaCy can scan a network segment for available http, ftp and smb server.==YaCy उपलब्ध HTTP, FTP और किसी सर्वर के लिए एक नेटवर्क खंड स्कैन कर सकते हैं.
You must first select a IP range and then, after this range is scanned,==इस श्रृंखला स्कैन के बाद आप पहली बार, तो एक आईपी श्रेणी का चयन करना चाहिए
it is possible to select servers that had been found for a full-site crawl.==यह एक पूरी साइट क्रॉल के लिए पाया गया था कि सर्वर का चयन करने के लिए संभव है.
-No servers had been detected in the given IP range #[iprange]#.
+#No servers had been detected in the given IP range==
Please enter a different IP range for another scan.==एक और स्कैन के लिए एक अलग आईपी रेंज दर्ज करें.
Please wait...==कृपया प्रतीक्षा करें ...
>Scan the network<==>नेटवर्क स्कैन<
diff --git a/locales/it.lng b/locales/it.lng
index aa0777d405..4fb128405e 100644
--- a/locales/it.lng
+++ b/locales/it.lng
@@ -97,7 +97,7 @@ You do not need to provide any personal data here, but if you want to distribute
#Yahoo!==Yahoo!
#MSN=MSN
Comment==Commento
-"Save"==Salva
+"Save"=="Salva"
#-----------------------------
#File: Connections_p.html
diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf
index 2d2e5b2ce5..294c984de8 100644
--- a/locales/master.lng.xlf
+++ b/locales/master.lng.xlf
@@ -1587,9 +1587,6 @@
-
-
-