Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed json search results from commit "Improved URLLicence reliability"

Browse Source
This commit is contained in:
luc 2016-02-05 08:29:41 +01:00
commit 480772c070
9 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htroot/compare_yacy.java
View File

@ -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=");

2
htroot/portalsearch/yacy-portalsearch.js
View File

@ -294,7 +294,7 @@ function yacysearch(clear) {
data.channels[0].items,
function(i,item) {
if (item) {
var favicon = "<img src='"+yconf.url+"/ViewImage.png?width=16&amp;height=16&amp;code="+item.faviconCode+"' class='favicon'/>";
var favicon = "<img src='"+item.faviconUrl+"' class='favicon'/>";
var title = "<h3 class='linktitle'>"+favicon+"<a href='"+item.link+"' target='_blank'>"+item.title+"</a></h3>";
var url = "<p class='url'><a href='"+item.link+"' target='_blank'>"+item.link+"</a></p>"
var desc = "<p class='desc'>"+item.description+"</p>";

2
htroot/yacy/ui/js/yacyui-portalsearch.js
View File

@ -264,7 +264,7 @@ function yacysearch(global, clear) {
data.channels[0].items,
function(i,item) {
if (item) {
var favicon = "<img src='"+yconf.url+"/ViewImage.png?width=16&amp;height=16&amp;code="+item.faviconCode+"' class='favicon'/>";
var favicon = "<img src='"+item.faviconUrl+"' class='favicon'/>";
var title = "<h3 class='linktitle'>"+favicon+"<a href='"+item.link+"' target='_blank'>"+item.title+"</a></h3>";
var url = "<p class='url'><a href='"+item.link+"' target='_blank'>"+item.link+"</a></p>"
var desc = "<p class='desc'>"+item.description+"</p>";

2
htroot/yacysearchitem.json
View File

@ -9,7 +9,7 @@
"size": "#[size]#",
"sizename": "#[sizename]#",
"guid": "#[urlhash]#",
"faviconCode": "#[faviconCode]#",
"faviconUrl": "#[faviconUrl]#",
"host": "#[host]#",
"path": "#[path]#",
"file": "#[file]#",

2
installYaCyWindowsService.bat
View File

@ -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

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

@ -2256,11 +2256,18 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
return null;
}
/**
* Get directory listing of file or smb url
* respects the hidden attribute of a directory (return null if hidden)
*
* @return names of files and directories or null
* @throws IOException
*/
public String[] list() throws IOException {
if (isFile()) return getFSFile().list();
if (isFile() && !isHidden()) return getFSFile().list();
if (isSMB()) try {
final SmbFile sf = getSmbFile();
if (!sf.isDirectory()) return null;
if (!sf.isDirectory() || sf.isHidden()) return null;
try {
return TimeoutRequest.list(sf, SMB_TIMEOUT);
} catch (final SmbException e) {

28
source/net/yacy/search/index/DocumentIndex.java
View File

@ -204,22 +204,24 @@ public class DocumentIndex extends Segment {
return;
}
final String[] s = start.list();
AnchorURL w;
for ( final String t : s ) {
try {
w = new AnchorURL(start, t);
if ( w.canRead() && !w.isHidden() ) {
if ( w.isDirectory() ) {
addConcurrent(w);
} else {
try {
this.queue.put(w);
} catch (final InterruptedException e ) {
if (s != null) {
AnchorURL w;
for ( final String t : s ) {
try {
w = new AnchorURL(start, t);
if ( w.canRead() && !w.isHidden() ) {
if ( w.isDirectory() ) {
addConcurrent(w);
} else {
try {
this.queue.put(w);
} catch (final InterruptedException e ) {
}
}
}
} catch (final MalformedURLException e1 ) {
ConcurrentLog.logException(e1);
}
} catch (final MalformedURLException e1 ) {
ConcurrentLog.logException(e1);
}
}
}

2
startYACY.bat
View File

@ -6,7 +6,7 @@ if not exist DATA md DATA
echo . >DATA\yacy.noconsole
Rem Setting the classpath
Set CLASSPATH=lib\yacycore.jar;htroot
Set CLASSPATH=lib\yacycore.jar
REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced"
set jmx=

2
stopYACY.bat
View File

@ -2,7 +2,7 @@
title YaCy
Rem Setting the classpath
Set CLASSPATH=lib\yacycore.jar;htroot
Set CLASSPATH=lib\yacycore.jar
Rem Stopping yacy
Echo Generated Classpath:%CLASSPATH%