- fixed a bug in parser (directory paths had not been recognized)

- no access check when a search is made only local without snippet fetch
- added comment and status message in resourceObserver (this takes very long at startup time!)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4911 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 17 years ago
parent 48f87db7f1
commit f5ef7f222e

@ -8,8 +8,6 @@
<classpathentry kind="src" path="htroot/yacy/ui"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/tar.jar"/>
<classpathentry kind="lib" path="libx/axis-ant.jar"/>
<classpathentry kind="lib" path="libx/axis.jar"/>
<classpathentry kind="lib" path="libx/bzip2.jar"/>
<classpathentry kind="lib" path="libx/commons-discovery.jar"/>
<classpathentry kind="lib" path="libx/commons-jxpath-1.1.jar"/>

@ -66,7 +66,6 @@
<input type="hidden" name="count" value="#[count]#" />
<input type="hidden" name="offset" value="#[offset]#" />
<input type="hidden" name="resource" value="#[resource]#" />
<input type="hidden" name="time" value="#[time]#" />
<input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
<input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
<input type="hidden" name="depth" value="#[depth]#" />

@ -179,6 +179,8 @@ public class yacysearch {
TreeSet<Long> trackerHandles = sb.localSearchTracker.get(client);
if (trackerHandles == null) trackerHandles = new TreeSet<Long>();
boolean block = false;
if (global || fetchSnippets) {
// in case that we do a global search or we want to fetch snippets, we check for DoS cases
if (trackerHandles.tailSet(new Long(System.currentTimeMillis() - 3000)).size() > 1) try {
Thread.sleep(3000);
block = true;
@ -191,6 +193,7 @@ public class yacysearch {
Thread.sleep(30000);
block = true;
} catch (InterruptedException e) { e.printStackTrace(); }
}
if ((!block) && (post == null || post.get("cat", "href").equals("href"))) {

@ -372,6 +372,9 @@ dc_rights
} else {
hyperlinks.put(url, entry.getValue());
}
} else {
// a path to a directory
hyperlinks.put(url, entry.getValue());
}
}
}

@ -276,6 +276,7 @@ nextLine:
String dir;
for (int i = 0; i < fileList.length; i++) {
// ATTENTION! THIS LOOP NEEDS A TIME-OUT
if (fileList[i].isDirectory()) {
try {
dir = fileList[i].getCanonicalPath();

@ -70,6 +70,7 @@ public final class resourceObserver {
public resourceObserver(plasmaSwitchboard sb) {
this.sb = sb;
this.log.logInfo("initializing the resource observer");
du = new diskUsage(sb);
if (!du.getUsable ())

Loading…
Cancel
Save