From jflesch at freenetproject.org Sat Feb 3 14:35:28 2007 From: jflesch at freenetproject.org (jflesch at freenetproject.org) Date: Sat, 3 Feb 2007 14:35:28 +0000 (UTC) Subject: [Thaw-dev] r11656 - in trunk/apps/Thaw/src/thaw: fcp plugins/index Message-ID: <20070203143528.6B1289BC28@emu.freenetproject.org> Author: jflesch Date: 2007-02-03 14:34:58 +0000 (Sat, 03 Feb 2007) New Revision: 11656 Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java Log: Fix PersistentPut reading Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java =================================================================== --- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-02-03 14:32:33 UTC (rev 11655) +++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-02-03 14:34:58 UTC (rev 11656) @@ -152,60 +152,60 @@ this.publicKey = publicKey; - if((filePath != null) && filePath.startsWith("thaw")) { + if (fileName != null) + name = fileName; + /*else { - final String[] plop = filePath.split(File.separator.replaceAll("\\\\", "\\\\\\\\")); - name = plop[plop.length-1]; + if((filePath != null) && filePath.startsWith("thaw")) { - localFile = new File(filePath); - if(localFile.length() > 0) - this.fileSize = localFile.length(); + final String[] plop = filePath.split(File.separator.replaceAll("\\\\", "\\\\\\\\")); + name = plop[plop.length-1]; - } else { + localFile = new File(filePath); + if(localFile.length() > 0) + this.fileSize = localFile.length(); + } else { - String[] plop = publicKey.split("/"); - name = plop[plop.length-1]; - if(keyType != 0) { - plop = name.split("\\-"); - if(plop.length >= 2) { - name = ""; - for(int i = 0 ; i < plop.length-1; i++) { - name = name + plop[i]; - if(i < plop.length-2) - name = name +"-"; + String[] plop = publicKey.split("/"); + name = plop[plop.length-1]; + + if(keyType != 0) { + plop = name.split("\\-"); + if(plop.length >= 2) { + name = ""; + for(int i = 0 ; i < plop.length-1; i++) { + name = name + plop[i]; + if(i < plop.length-2) + name = name +"-"; + } } } - } - if("null".equals( name ) || "CHK@".equals( name )) { - Logger.warning(this, "The node returns \"null\" as filename. Using id !"); - Logger.warning(this, "( URI="+publicKey +" )"); - Logger.warning(this, "( Identifier="+identifier+" )"); + if("null".equals( name ) || "CHK@".equals( name )) { + Logger.warning(this, "The node returns \"null\" as filename. Using id !"); + Logger.warning(this, "( URI="+publicKey +" )"); + Logger.warning(this, "( Identifier="+identifier+" )"); - plop = this.identifier.split("\\-"); + plop = this.identifier.split("\\-"); - if(plop.length >= 2) { - name = ""; - for(int i = 1 ; i < plop.length; i++) { - if(i != 1) - name = name +"-"; - name = name + plop[i]; + if(plop.length >= 2) { + name = ""; + for(int i = 1 ; i < plop.length; i++) { + if(i != 1) + name = name +"-"; + name = name + plop[i]; + } } } - } - } + }*/ - if (fileName != null) { /* We want to force the filename */ /* See PersistentPut.TargetFilename */ - name = fileName; - } - this.publicKey = null; this.priority = priority; Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java =================================================================== --- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2007-02-03 14:32:33 UTC (rev 11655) +++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2007-02-03 14:34:58 UTC (rev 11656) @@ -69,10 +69,10 @@ final FCPClientGet clientGet = new FCPClientGet(msg.getValue("Identifier"), - msg.getValue("URI"), // key - priority, persistence, global, - destinationDir, "Fetching", 0, - -1, queueManager); + msg.getValue("URI"), // key + priority, persistence, global, + destinationDir, "Fetching", 0, + -1, queueManager); if(queueManager.addQueryToTheRunningQueue(clientGet, false)) queueManager.getQueryManager().addObserver(clientGet); @@ -109,11 +109,12 @@ filePath = msg.getValue("ClientToken"); final FCPClientPut clientPut = new FCPClientPut(msg.getValue("Identifier"), - msg.getValue("URI"), // key - priority, persistence, global, - filePath, msg.getValue("TargetFilename"), - "Inserting", 0, fileSize, - queueManager); + msg.getValue("URI"), // key + priority, persistence, global, + filePath, + msg.getValue("TargetFilename"), + "Inserting", 0, fileSize, + queueManager); if(queueManager.addQueryToTheRunningQueue(clientPut, false)) Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java =================================================================== --- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-02-03 14:32:33 UTC (rev 11655) +++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-02-03 14:34:58 UTC (rev 11656) @@ -205,7 +205,8 @@ if (FreenetURIHelper.isAKey(fileKey)) keyTable.put(FreenetURIHelper.getComparablePart(fileKey), query); - filenameTable.put(filename, query); + if (filename != null) + filenameTable.put(filename, query); setChanged(); Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java =================================================================== --- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-02-03 14:32:33 UTC (rev 11655) +++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-02-03 14:34:58 UTC (rev 11656) @@ -238,7 +238,7 @@ * the target child must be in the database */ public void insert(MutableTreeNode child, int index) { - Logger.notice(this, "Inserting node at "+Integer.toString(index)+" in node "+Integer.toString(id)+" ("+toString()+")"); + Logger.info(this, "Inserting node at "+Integer.toString(index)+" in node "+Integer.toString(id)+" ("+toString()+")"); if (children != null) { @@ -337,7 +337,7 @@ } - Logger.notice(this, "Removing obj pos "+Integer.toString(pos)); + Logger.info(this, "Removing obj pos "+Integer.toString(pos)); synchronized(db.dbLock) { try { From jflesch at freenetproject.org Sat Feb 3 14:41:38 2007 From: jflesch at freenetproject.org (jflesch at freenetproject.org) Date: Sat, 3 Feb 2007 14:41:38 +0000 (UTC) Subject: [Thaw-dev] r11657 - trunk/apps/Thaw/src/thaw/fcp Message-ID: <20070203144138.BFD9A9BC28@emu.freenetproject.org> Author: jflesch Date: 2007-02-03 14:41:37 +0000 (Sat, 03 Feb 2007) New Revision: 11657 Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java Log: Oops, I forgot to remove the commented part Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java =================================================================== --- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-02-03 14:34:58 UTC (rev 11656) +++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-02-03 14:41:37 UTC (rev 11657) @@ -154,58 +154,7 @@ if (fileName != null) name = fileName; - /*else { - if((filePath != null) && filePath.startsWith("thaw")) { - - final String[] plop = filePath.split(File.separator.replaceAll("\\\\", "\\\\\\\\")); - name = plop[plop.length-1]; - - localFile = new File(filePath); - if(localFile.length() > 0) - this.fileSize = localFile.length(); - - } else { - - - String[] plop = publicKey.split("/"); - name = plop[plop.length-1]; - - if(keyType != 0) { - plop = name.split("\\-"); - if(plop.length >= 2) { - name = ""; - for(int i = 0 ; i < plop.length-1; i++) { - name = name + plop[i]; - if(i < plop.length-2) - name = name +"-"; - } - } - } - - - if("null".equals( name ) || "CHK@".equals( name )) { - Logger.warning(this, "The node returns \"null\" as filename. Using id !"); - Logger.warning(this, "( URI="+publicKey +" )"); - Logger.warning(this, "( Identifier="+identifier+" )"); - - plop = this.identifier.split("\\-"); - - if(plop.length >= 2) { - name = ""; - for(int i = 1 ; i < plop.length; i++) { - if(i != 1) - name = name +"-"; - name = name + plop[i]; - - } - } - } - - } - - }*/ - this.publicKey = null; this.priority = priority;