Author: jflesch
Date: 2006-07-18 18:39:55 +0000 (Tue, 18 Jul 2006)
New Revision: 9654
Modified:
trunk/apps/Thaw/src/thaw/core/Main.java
trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
Log:
Should fix non-started insertion resuming
Modified: trunk/apps/Thaw/src/thaw/core/Main.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Main.java 2006-07-18 17:43:23 UTC (rev
9653)
+++ trunk/apps/Thaw/src/thaw/core/Main.java 2006-07-18 18:39:55 UTC (rev
9654)
@@ -10,7 +10,7 @@
*/
public class Main {
- public final static String VERSION="0.1 Beta";
+ public final static String VERSION="0.2 WIP";
/**
* Look & feel use by GUI front end
Modified: trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-07-18 17:43:23 UTC
(rev 9653)
+++ trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-07-18 18:39:55 UTC
(rev 9654)
@@ -152,7 +152,7 @@
private static Element saveQuery(FCPTransferQuery query, Document
xmlDoc) {
- if(query.isPersistent())
+ if(query.isPersistent() && (query.isRunning() ||
query.isFinished()))
return null;
HashMap params = query.getParameters();
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-18 17:43:23 UTC
(rev 9653)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-18 18:39:55 UTC
(rev 9654)
@@ -733,8 +733,10 @@
result.put("keyType", ((new Integer(keyType)).toString()));
result.put("Revision", ((new Integer(rev)).toString()));
result.put("Name", name);
- result.put("privateKey", privateKey);
- result.put("publicKey", publicKey);
+ if(privateKey != null)
+ result.put("privateKey", privateKey);
+ if(publicKey != null)
+ result.put("publicKey", publicKey);
result.put("priority", ((new Integer(priority)).toString()));
result.put("global", ((new Boolean(global)).toString()));
result.put("persistence", (new
Integer(persistence)).toString());
@@ -744,7 +746,8 @@
result.put("status", status);
result.put("attempt", (new Integer(attempt)).toString());
- result.put("identifier", identifier);
+ if(identifier != null)
+ result.put("identifier", identifier);
result.put("running", ((new Boolean(running)).toString()));
result.put("successful", ((new
Boolean(successful)).toString()));
result.put("finished", ((new Boolean(finished)).toString()));
@@ -761,15 +764,26 @@
keyType = (new
Integer((String)parameters.get("keyType"))).intValue();
rev = (new
Integer((String)parameters.get("Revision"))).intValue();
name = (String)parameters.get("name");
+
privateKey = (String)parameters.get("privateKey");
+ if(privateKey == null || privateKey.equals(""))
+ privateKey = null;
+
publicKey = (String)parameters.get("publicKey");
+ if(privateKey == null || publicKey.equals(""))
+ publicKey = null;
+
priority = ((new
Integer((String)parameters.get("priority"))).intValue());
global = ((new
Boolean((String)parameters.get("global"))).booleanValue());
persistence = ((new
Integer((String)parameters.get("persistence"))).intValue());
progress = ((new
Integer((String)parameters.get("progress"))).intValue());
status = (String)parameters.get("status");
attempt = ((new
Integer((String)parameters.get("attempt"))).intValue());
+
identifier = (String)parameters.get("identifier");
+ if(identifier == null || identifier.equals(""))
+ identifier = null;
+
running = ((new
Boolean((String)parameters.get("running"))).booleanValue());
successful = ((new
Boolean((String)parameters.get("successful"))).booleanValue());
finished = ((new
Boolean((String)parameters.get("finished"))).booleanValue());
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-18 17:43:23 UTC
(rev 9653)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-18 18:39:55 UTC
(rev 9654)
@@ -98,7 +98,7 @@
}
if(isAlreadyPresent(query)) {
- Logger.notice(this, "Key was already in one of the
queues");
+ Logger.notice(this, "Key was already in one of the
queues : "+query.getFilename());
return false;
}
@@ -204,13 +204,21 @@
private boolean isTheSame(FCPTransferQuery queryA,
FCPTransferQuery queryB) {
- if(queryA.getIdentifier() != null && queryB.getIdentifier() !=
null)
+ if(queryA.getIdentifier() != null && queryB.getIdentifier() !=
null) {
+ Logger.debug(this, "isTheSame(): Identifier");
return
queryA.getIdentifier().equals(queryB.getIdentifier());
+ }
- if(queryA.getFileKey() != null && queryB.getFileKey() != null)
+ if(queryA.getFileKey() != null && queryB.getFileKey() != null) {
+ Logger.debug(this, "isTheSame(): FileKey");
return queryA.getFileKey().equals(queryB.getFileKey());
-
- return queryA.getFilename().equals(queryB.getFilename());
+ }
+
+ if(queryA.getFilename().equals(queryB.getFilename())) {
+ Logger.debug(this, "isTheSame(): Filename");
+ return true;
+ }
+ return false;
}
@@ -329,6 +337,8 @@
public void run() {
+ Thread.sleep(5000);
+
while(true) {
try {
Thread.sleep(500);
