Author: jflesch
Date: 2006-10-04 20:20:32 +0000 (Wed, 04 Oct 2006)
New Revision: 10601
Modified:
trunk/apps/Thaw/src/thaw/core/Logger.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java
Log:
Fix index key creations / downloads
Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java 2006-10-04 20:02:47 UTC (rev
10600)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java 2006-10-04 20:20:32 UTC (rev
10601)
@@ -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/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-10-04 20:02:47 UTC
(rev 10600)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-10-04 20:20:32 UTC
(rev 10601)
@@ -132,16 +132,12 @@
status = "Waiting";
- if(key.indexOf('/') == key.length()-1) {
- filename = "index.html";
- } else {
- String cutcut[] = key.split("/");
-
- //if(!key.startsWith("USK@")) {
+ String cutcut[] = key.split("/");
+
+ if(!key.endsWith("/")) {
filename = cutcut[cutcut.length-1];
- //} else {
- //filename = cutcut[cutcut.length-2];
- //}
+ } else {
+ filename = "index.html";
}
Logger.debug(this, "Query for getting "+key+" created");
@@ -519,13 +515,9 @@
return false;
}
- if (globalQueue) { /* If not global, we need to remain on the
same socket */
- duplicatedQueryManager =
queueManager.getQueryManager().duplicate(identifier);
- duplicatedQueryManager.addObserver(this);
- } else
- duplicatedQueryManager = queueManager.getQueryManager();
+ duplicatedQueryManager =
queueManager.getQueryManager().duplicate(identifier);
+ duplicatedQueryManager.addObserver(this);
-
Logger.info(this, "Waiting for socket avaibility ...");
status = "Waiting for socket avaibility ...";
progress = 99;
@@ -542,7 +534,11 @@
}
public synchronized boolean continueSaveFileTo(String dir) {
- Logger.debug(this, "Asking file to the node...");
+ try {
+ Thread.sleep(20000);
+ } catch(java.lang.InterruptedException e){
+ }
+ Logger.info(this, "Asking file '"+filename+"' to the node...");
destinationDir = dir;
@@ -565,9 +561,7 @@
else
getRequestStatus.setValue("Global", "false");
getRequestStatus.setValue("OnlyData", "true");
-
-
duplicatedQueryManager.writeMessage(getRequestStatus, false);
return true;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-10-04 20:02:47 UTC
(rev 10600)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-10-04 20:20:32 UTC
(rev 10601)
@@ -71,6 +71,9 @@
setNodePort(port);
setMaxUploadSpeed(maxUploadSpeed);
setDuplicationAllowed(duplicationAllowed);
+
+ lockWriting = false;
+ lockReading = false;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-10-04 20:02:47 UTC
(rev 10600)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-10-04 20:20:32 UTC
(rev 10601)
@@ -310,7 +310,7 @@
public String getKey() {
if(modifiable)
- return publicKey.replaceFirst("SSK@",
"USK@")+realName+"/"+revision+"/";
+ return publicKey.replaceFirst("SSK@",
"USK@")+realName+"/"+revision+"/"+realName+".xml";
else
return publicKey;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-10-04
20:02:47 UTC (rev 10600)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-10-04
20:20:32 UTC (rev 10601)
@@ -257,7 +257,8 @@
try {
String[] cutcut = publicKey.split("/");
- name = cutcut[cutcut.length-2];
+ name = cutcut[cutcut.length-1];
+ name = name.replaceAll(".xml", "");
} catch(Exception exc) {
Logger.warning(this, "Error while
parsing index key: "+publicKey+" because: "+exc.toString() );
name = publicKey;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java 2006-10-04
20:02:47 UTC (rev 10600)
+++ trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java 2006-10-04
20:20:32 UTC (rev 10601)
@@ -79,7 +79,7 @@
sendQuery(db,
"CREATE CACHED TABLE links ("
- + "id INTEGER IDENTIFY NOT NULL,"
+ + "id INTEGER IDENTITY NOT NULL,"
+ "publicKey VARCHAR(350) NOT NULL," // key ~= 100 +
filename == 255 max
+ "mark INTEGER NOT NULL,"
+ "comment VARCHAR(512) NOT NULL,"
