From e91bf4c8cccf445f9d9b2dcf536f6ac5dd39ac60 Mon Sep 17 00:00:00 2001 From: orbiter Date: Sat, 24 May 2008 21:30:22 +0000 Subject: [PATCH] - fix for bad reset of index / bad index location after deletion - some modification of rssTerminal window location and size git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4850 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Status.html | 6 +++--- htroot/terminal_p.html | 6 +++--- source/de/anomic/kelondro/kelondroAbstractRA.java | 5 +++++ source/de/anomic/kelondro/kelondroAbstractRecords.java | 3 ++- source/de/anomic/kelondro/kelondroCachedRA.java | 1 + source/de/anomic/kelondro/kelondroFileRA.java | 1 + source/de/anomic/kelondro/kelondroNIOFileRA.java | 1 + source/de/anomic/kelondro/kelondroRA.java | 2 ++ 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/htroot/Status.html b/htroot/Status.html index d8da33c67..da128da09 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -36,9 +36,9 @@
-

Welcome to YaCy!


-
banner
diff --git a/htroot/terminal_p.html b/htroot/terminal_p.html index 7c0fa3608..44495a484 100755 --- a/htroot/terminal_p.html +++ b/htroot/terminal_p.html @@ -42,7 +42,7 @@ function init() { <Search Form>     <Crawl Start>     <Status Page>         -<Shutdown>
@@ -52,8 +52,8 @@ function init() {
Event Terminal
-
diff --git a/source/de/anomic/kelondro/kelondroAbstractRA.java b/source/de/anomic/kelondro/kelondroAbstractRA.java index 1bea5439f..7c92f857a 100644 --- a/source/de/anomic/kelondro/kelondroAbstractRA.java +++ b/source/de/anomic/kelondro/kelondroAbstractRA.java @@ -47,6 +47,7 @@ package de.anomic.kelondro; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.util.HashMap; @@ -59,9 +60,13 @@ abstract class kelondroAbstractRA implements kelondroRA { // logging support protected String name = null; + protected File file = null; public String name() { return name; } + public File file() { + return file; + } // pseudo-native methods: abstract public long length() throws IOException; diff --git a/source/de/anomic/kelondro/kelondroAbstractRecords.java b/source/de/anomic/kelondro/kelondroAbstractRecords.java index 3a4c75209..b329409e1 100644 --- a/source/de/anomic/kelondro/kelondroAbstractRecords.java +++ b/source/de/anomic/kelondro/kelondroAbstractRecords.java @@ -405,7 +405,8 @@ public abstract class kelondroAbstractRecords implements kelondroRecords { public void clear() throws IOException { kelondroRA ra = this.entryFile.getRA(); - File f = new File(ra.name()); + File f = ra.file(); + assert f != null; this.entryFile.close(); f.delete(); ra = new kelondroFileRA(f); diff --git a/source/de/anomic/kelondro/kelondroCachedRA.java b/source/de/anomic/kelondro/kelondroCachedRA.java index 1cd2a80c6..9b27d8e6f 100644 --- a/source/de/anomic/kelondro/kelondroCachedRA.java +++ b/source/de/anomic/kelondro/kelondroCachedRA.java @@ -58,6 +58,7 @@ public class kelondroCachedRA extends kelondroAbstractRA implements kelondroRA { public kelondroCachedRA(kelondroRA ra, int cachesize, int elementsize) { this.ra = ra; this.name = ra.name(); + this.file = ra.file(); this.cacheMemory = new HashMap(); this.cacheScore = new kelondroMScoreCluster(); this.cacheElementSize = elementsize; diff --git a/source/de/anomic/kelondro/kelondroFileRA.java b/source/de/anomic/kelondro/kelondroFileRA.java index 98c4e4722..a543185fe 100644 --- a/source/de/anomic/kelondro/kelondroFileRA.java +++ b/source/de/anomic/kelondro/kelondroFileRA.java @@ -57,6 +57,7 @@ public final class kelondroFileRA extends kelondroAbstractRA implements kelondro public kelondroFileRA(File file) throws IOException, FileNotFoundException { this.name = file.getName(); + this.file = file; RAFile = new RandomAccessFile(file, "rw"); } diff --git a/source/de/anomic/kelondro/kelondroNIOFileRA.java b/source/de/anomic/kelondro/kelondroNIOFileRA.java index ee51d6b6e..e3defea9c 100644 --- a/source/de/anomic/kelondro/kelondroNIOFileRA.java +++ b/source/de/anomic/kelondro/kelondroNIOFileRA.java @@ -65,6 +65,7 @@ public class kelondroNIOFileRA extends kelondroAbstractRA implements kelondroRA public kelondroNIOFileRA(File file, boolean mapBody, long tailMaxSize) throws IOException { this.name = file.getName(); + this.file = file; this.seekPos = 0; this.bodyOffset = headSize; if (bodyOffset >= file.length()) { diff --git a/source/de/anomic/kelondro/kelondroRA.java b/source/de/anomic/kelondro/kelondroRA.java index 3b045220b..d8788ed63 100644 --- a/source/de/anomic/kelondro/kelondroRA.java +++ b/source/de/anomic/kelondro/kelondroRA.java @@ -50,6 +50,7 @@ package de.anomic.kelondro; +import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -58,6 +59,7 @@ public interface kelondroRA { // logging support public String name(); + public File file(); // pseudo-native methods: public long length() throws IOException;