Author: jflesch
Date: 2006-09-29 15:47:15 +0000 (Fri, 29 Sep 2006)
New Revision: 10567
Modified:
trunk/apps/Thaw/src/thaw/core/Logger.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
Log:
Thaw uses now the argument TargetFilename of PersistentPut
Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java 2006-09-29 13:48:54 UTC (rev
10566)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java 2006-09-29 15:47:15 UTC (rev
10567)
@@ -94,10 +94,10 @@
* As it. Similar to verbose()
*/
public static void asIt(Object o, String msg) {
- //if(LOG_LEVEL >= 5) {
+ if(LOG_LEVEL >= 5) {
System.out.println(msg);
notifyLogListeners(msg);
- //}
+ }
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-09-29 13:48:54 UTC
(rev 10566)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-09-29 15:47:15 UTC
(rev 10567)
@@ -123,7 +123,7 @@
*/
public FCPClientPut(String identifier, String publicKey,
int priority, int persistence, boolean global,
- String filePath, String status, int progress,
+ String filePath, String fileName, String status,
int progress,
long fileSize, FCPQueueManager queueManager) {
@@ -175,7 +175,7 @@
}
- if(this.name.equals("null")) {
+ if(this.name.equals("null") ||
this.name.equals("CHK@")) {
Logger.warning(this, "The node returns \"null\"
as filename. Using id !");
Logger.warning(this, "( URI="+publicKey +" )");
Logger.warning(this, "(
Identifier="+identifier+" )");
@@ -194,10 +194,12 @@
}
-
-
}
+
+ if (fileName != null) { /* We want to force the filename */ /*
See PersistentPut.TargetFilename */
+ this.name = fileName;
+ }
this.publicKey = null;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2006-09-29 13:48:54 UTC
(rev 10566)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2006-09-29 15:47:15 UTC
(rev 10567)
@@ -114,7 +114,7 @@
FCPClientPut clientPut = new
FCPClientPut(msg.getValue("Identifier"),
msg.getValue("URI"), // key
priority,
persistence, global,
- filePath,
+ filePath,
msg.getValue("TargetFilename"),
"Inserting",
0, fileSize,
queueManager);
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2006-09-29 13:48:54 UTC
(rev 10566)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2006-09-29 15:47:15 UTC
(rev 10567)
@@ -190,8 +190,8 @@
thaw.plugin.index.editor=Vos fichiers partag?s
thaw.plugin.index.browser=Navigateur d'index
-thaw.plugin.index.yourIndexes=Vos indexs
-thaw.plugin.index.indexes=Indexs
+thaw.plugin.index.yourIndexes=Vos indexes
+thaw.plugin.index.indexes=Indexes
thaw.plugin.index.addIndex=Add a file index
thaw.plugin.index.createIndex=Cr?er a file index
