diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java index 89ba69098..427c55424 100644 --- a/htroot/compare_yacy.java +++ b/htroot/compare_yacy.java @@ -48,11 +48,11 @@ public class compare_yacy { searchengines.put("metager2.de (web)", "http://www.metager2.de/search.php?ses=web&q="); searchengines.put("metager2.de (international)", "http://www.metager2.de/search.php?ses=international&q="); searchengines.put("yahoo.com", "http://search.yahoo.com/search?p="); - searchengines.put("romso.de", "http://romso.de/?q="); + //searchengines.put("romso.de", "http://romso.de/?q="); // no serach service 2016-01-02 searchengines.put("Wikipedia English", "http://en.wikipedia.org/wiki/"); searchengines.put("Wikipedia Deutsch", "http://de.wikipedia.org/wiki/"); searchengines.put("Sciencenet", "http://sciencenet.fzk.de:8080/yacysearch.html?verify=true&resource=global&nav=all&display=2&meanCount=5&query="); - searchengines.put("dbpedia", "http://dbpedia.neofonie.de/browse/~:"); + //searchengines.put("dbpedia", "http://dbpedia.neofonie.de/browse/~:"); // no search service 2016-01-02 searchengines.put("wolfram alpha", "http://www.wolframalpha.com/input/?i="); searchengines.put("OAIster@OCLC", "http://oaister.worldcat.org/search?q="); searchengines.put("oai.yacy.net", "http://oai.yacy.net/yacysearch.html?verify=true&resource=local&nav=all&display=2&meanCount=5&query="); diff --git a/htroot/portalsearch/yacy-portalsearch.js b/htroot/portalsearch/yacy-portalsearch.js index ed77cd46a..92ac6338f 100644 --- a/htroot/portalsearch/yacy-portalsearch.js +++ b/htroot/portalsearch/yacy-portalsearch.js @@ -294,7 +294,7 @@ function yacysearch(clear) { data.channels[0].items, function(i,item) { if (item) { - var favicon = ""; + var favicon = ""; var title = "

"+favicon+""+item.title+"

"; var url = "

"+item.link+"

" var desc = "

"+item.description+"

"; diff --git a/htroot/yacy/ui/js/yacyui-portalsearch.js b/htroot/yacy/ui/js/yacyui-portalsearch.js index dffd15e57..10d0a445c 100644 --- a/htroot/yacy/ui/js/yacyui-portalsearch.js +++ b/htroot/yacy/ui/js/yacyui-portalsearch.js @@ -264,7 +264,7 @@ function yacysearch(global, clear) { data.channels[0].items, function(i,item) { if (item) { - var favicon = ""; + var favicon = ""; var title = "

"+favicon+""+item.title+"

"; var url = "

"+item.link+"

" var desc = "

"+item.description+"

"; diff --git a/htroot/yacysearchitem.json b/htroot/yacysearchitem.json index a8bb2f413..0e3aa9664 100644 --- a/htroot/yacysearchitem.json +++ b/htroot/yacysearchitem.json @@ -9,7 +9,7 @@ "size": "#[size]#", "sizename": "#[sizename]#", "guid": "#[urlhash]#", - "faviconCode": "#[faviconCode]#", + "faviconUrl": "#[faviconUrl]#", "host": "#[host]#", "path": "#[path]#", "file": "#[file]#", diff --git a/installYaCyWindowsService.bat b/installYaCyWindowsService.bat index d91c9599d..a9248510d 100644 --- a/installYaCyWindowsService.bat +++ b/installYaCyWindowsService.bat @@ -26,7 +26,7 @@ Echo JRE Parameters:%javacmd% Echo Startpath %~dp0 REM Install YaCy as Windows Service -%exepath%\prunsrv.exe //IS//YaCy --Jvm=auto --StartMode=jvm --StartClass=net.yacy.yacy --Classpath=htroot;lib/yacycore.jar --StartPath=%~dp0 --JvmOptions=%javaopts% --Startup=auto --JvmMx=%jmx% --JvmMs=%jms% --StopMode=jvm --StopClass=net.yacy.yacy --StopParams=-shutdown --Description=%servicedesc% +%exepath%\prunsrv.exe //IS//YaCy --Jvm=auto --StartMode=jvm --StartClass=net.yacy.yacy --Classpath=lib/yacycore.jar --StartPath=%~dp0 --JvmOptions=%javaopts% --Startup=auto --JvmMx=%jmx% --JvmMs=%jms% --StopMode=jvm --StopClass=net.yacy.yacy --StopParams=-shutdown --Description=%servicedesc% if not errorlevel 1 goto installed Echo Failed installing YaCy service diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java index 24907b8d3..1d786dbcf 100644 --- a/source/net/yacy/cora/document/id/MultiProtocolURL.java +++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java @@ -2256,11 +2256,18 @@ public class MultiProtocolURL implements Serializable, Comparable