[Thaw-dev] r12886 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-23 00:04:24 +0000 (Mon, 23 Apr 2007)
New Revision: 12886

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
Log:
Fix index name extraction

Modified: trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java  2007-04-22 23:18:24 UTC 
(rev 12885)
+++ trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java  2007-04-23 00:04:24 UTC 
(rev 12886)
@@ -54,15 +54,20 @@

        public static String getFilenameFromKey(final String key) {
                String filename;
-               final String cutcut[] = key.split("/");
+               final String cutcut[];

                if (key == null)
                        return null;

-               if(!key.endsWith("/")) {
+               cutcut = key.split("/");
+
+               if ( (!key.startsWith("USK@")) || cutcut.length >= 4) {
                        filename = cutcut[cutcut.length-1];
                } else {
-                       filename = "index.html";
+                       if (cutcut.length >= 2)
+                               filename = cutcut[cutcut.length-2];
+                       else
+                               filename = cutcut[cutcut.length-1];
                }

                return filename;