[Thaw-dev] r10690 - in trunk/apps/Thaw/src/thaw: core plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-10-22 19:15:33 +0000 (Sun, 22 Oct 2006)
New Revision: 10690

Modified:
   trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Take into consideration an index revision increase

Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-10-22 18:57:58 UTC 
(rev 10689)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-10-22 19:15:33 UTC 
(rev 10690)
@@ -178,5 +178,20 @@
                return key;
        }

+
+       public static int getUSKRevision(String key) {
+               String[] split;
+
+               if (key == null)
+                       return -1;
+
+               split = key.split("/");
+
+               if (split.length < 3)
+                       return -1;
+
+               return Integer.parseInt(split[2]);
+       }
+
 }


Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-10-22 18:57:58 UTC 
(rev 10689)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-10-22 19:15:33 UTC 
(rev 10690)
@@ -503,6 +503,8 @@

                                        if (rewriteKey)
                                                publicKey = 
transfer.getFileKey();
+                                       else
+                                               revision = 
FreenetURIHelper.getUSKRevision(transfer.getFileKey());

                                        Logger.info(this, "Most up-to-date key 
found: " + publicKey);