Search for usks - INCOMPATIBLE CHANGE REQUIRES MATCHING UPDATE IN plugin-Library

.classpath

@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/fred"/>
-	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
 	<classpathentry kind="lib" path="/fred/lib/freenet/freenet-ext.jar" sourcepath="/Contrib/db4o/src/db4oj"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

src/plugins/Spider/LibraryBuffer.java

@@ -97,7 +97,7 @@ public synchronized int bufferUsageEstimate() {
 	public void start() {
 		// Do in a transaction so it gets committed separately.
 		spider.db.beginThreadTransaction(Storage.EXCLUSIVE_TRANSACTION);
-		spider.resetPages(Status.NOT_PUSHED, Status.QUEUED);
+		spider.resetPages(Status.NOT_PUSHED, Status.NEW);
 		spider.db.endThreadTransaction();
 	}
 
@@ -161,13 +161,12 @@ private void sendBuffer(int bufferUsageEstimated) {
 		long tStart = System.currentTimeMillis();
 		try {
 			Logger.normal(this, "Sending buffer of estimated size " + bufferUsageEstimated + " bytes to Library");
-			long totalPagesIndexed = spider.getRoot().getPageCount(Status.INDEXED);
 			Bucket bucket = pr.getNode().clientCore.tempBucketFactory.makeBucket(3000000);
-			writeToPush(totalPagesIndexed, bucket);
+			writeToPush(totalPagesIndexed(), bucket);
 			innerSend(bucket);
 			Logger.normal(this, "Buffer successfully sent to Library, size = "+bucket.size());
 			// Not a separate transaction, commit with the index updates.
-			spider.resetPages(Status.NOT_PUSHED, Status.INDEXED);
+			spider.donePages();
 		} catch (IOException ex) {
 			Logger.error(this, "Could not make bucket to transfer buffer", ex);
 		}
@@ -186,6 +185,12 @@ private void sendBuffer(int bufferUsageEstimated) {
 			System.out.println("Restored data from last time from "+SAVE_FILE);
 		}
 	}
+
+	private long totalPagesIndexed() {
+		return spider.getRoot().getPageCount(Status.DONE)
+				+ spider.getRoot().getPageCount(Status.PROCESSED_KSK)
+				+ spider.getRoot().getPageCount(Status.PROCESSED_USK);
+	}
 
 	private synchronized Bucket writeToPush(long totalPagesIndexed, Bucket bucket) throws IOException {
 		OutputStream os = bucket.getOutputStream();
@@ -271,7 +276,7 @@ public void terminate() {
 		FileBucket bucket = new FileBucket(SAVE_FILE, false, false, false, false);
 		long totalPagesIndexed;
 		try {
-			totalPagesIndexed = spider.getRoot().getPageCount(Status.INDEXED);
+			totalPagesIndexed = totalPagesIndexed();
 		} catch (Throwable t) {
 			totalPagesIndexed = -1;
 			// FIXME I don't understand why this (ClassNotFoundException) happens, we have not closed the class loader yet.