[PATCH Revision] This uses _ as the special character for cachefile names, / for file.separator, and fixes a minor bug in the previouspatch [Ed Knutson]

[Ed Knutson]

--- PersistentDocument.java     Thu Mar 23 03:46:46 2000
+++ P.java      Fri Mar 31 21:27:59 2000
@@ -152,9 +152,9 @@
         
         for ( int i = 0; i < files.length; ++i ) {
             
-            if ( files[i].indexOf("http.") == 0 )  {
+            if ( files[i].indexOf("http_") == 0 )  {
                 entries.addElement( new PersistentDocumentEntry( getCacheDirectory() 
+ 
-                                    System.getProperty("file.separator") + 
+                                   "/" +
                                     files[i] ) );
             }
             
@@ -263,18 +263,18 @@
         
         will be changed to:
         
-        http.www.apache.org...80.index..html
+        http_www.apache.org___80.index.html
         
-        - all "." are translated as ".."
-        - a ":" is translated as "..."
+        - all "_" are translated as "__"
+        - a "_" is translated as "___"
         
         */
         
         
-        url = Util.globalStringReplace( url, ".", ".." );
-        url = Util.globalStringReplace( url, "://", "." );
-        url = Util.globalStringReplace( url, "/", "." );
-        url = Util.globalStringReplace( url, ":", "..." );
+        url = Util.globalStringReplace( url, "_", "__" );
+        url = Util.globalStringReplace( url, "://", "_" );
+        url = Util.globalStringReplace( url, "/", "_" );
+        url = Util.globalStringReplace( url, ":", "___" );
 
         
         //NOTE:  get rid of any CGI params... if users are generating
@@ -292,20 +292,20 @@
         String url = "";
 
 
-        int start = cache.indexOf(".");
+        int start = cache.indexOf("_");
         
         String protocol = cache.substring( 0, start );
         
         String uri = cache.substring( start + 1, cache.length() );
 
 
-        uri = Util.globalStringReplace( uri, "...", ":" );
+        uri = Util.globalStringReplace( uri, "___", ":" );
 
-        uri = Util.globalStringReplace( uri, ".", "/" );
-        uri = Util.globalStringReplace( uri, ".", "/" );
+        uri = Util.globalStringReplace( uri, "_", "/" );
+        uri = Util.globalStringReplace( uri, "_", "/" );
         
-        //now the original ".." should be slashes so replace them with a single "."
-        uri = Util.globalStringReplace( uri, "//", "." );
+        //now the original "__" should be slashes so replace them with a single "_"
+        uri = Util.globalStringReplace( uri, "//", "_" );
       
         url = protocol + "://" + uri;
         
@@ -324,7 +324,7 @@
 
       url = getURLCacheName( url );
 
-      url = getCacheDirectory() + System.getProperty("file.separator") + url;
+      url = getCacheDirectory() + "/" + url;
 
       return url;
     }
--- PersistentDocument.java     Thu Mar 23 03:46:46 2000
+++ P.java      Fri Mar 31 21:37:12 2000
@@ -152,9 +152,9 @@
         
         for ( int i = 0; i < files.length; ++i ) {
             
-            if ( files[i].indexOf("http.") == 0 )  {
+            if ( files[i].indexOf("http_") == 0 )  {
                 entries.addElement( new PersistentDocumentEntry( getCacheDirectory() 
+ 
-                                    System.getProperty("file.separator") + 
+                                   "/" +
                                     files[i] ) );
             }
             
@@ -263,18 +263,19 @@
         
         will be changed to:
         
-        http.www.apache.org...80.index..html
-        
-        - all "." are translated as ".."
-        - a ":" is translated as "..."
+        http_www.apache.org___80.index.html
+
+       - all "/" are translated as "_"        
+        - all "_" are translated as "__"
+        - a ":" is translated as "___"
         
         */
         
         
-        url = Util.globalStringReplace( url, ".", ".." );
-        url = Util.globalStringReplace( url, "://", "." );
-        url = Util.globalStringReplace( url, "/", "." );
-        url = Util.globalStringReplace( url, ":", "..." );
+        url = Util.globalStringReplace( url, "_", "__" );
+        url = Util.globalStringReplace( url, "://", "_" );
+        url = Util.globalStringReplace( url, "/", "_" );
+        url = Util.globalStringReplace( url, ":", "___" );
 
         
         //NOTE:  get rid of any CGI params... if users are generating
@@ -292,20 +293,20 @@
         String url = "";
 
 
-        int start = cache.indexOf(".");
+        int start = cache.indexOf("_");
         
         String protocol = cache.substring( 0, start );
         
         String uri = cache.substring( start + 1, cache.length() );
 
 
-        uri = Util.globalStringReplace( uri, "...", ":" );
+        uri = Util.globalStringReplace( uri, "___", ":" );
 
-        uri = Util.globalStringReplace( uri, ".", "/" );
-        uri = Util.globalStringReplace( uri, ".", "/" );
+        uri = Util.globalStringReplace( uri, "_", "/" );
+        uri = Util.globalStringReplace( uri, "_", "/" );
         
-        //now the original ".." should be slashes so replace them with a single "."
-        uri = Util.globalStringReplace( uri, "//", "." );
+        //now the original "__" should be slashes so replace them with a single "_"
+        uri = Util.globalStringReplace( uri, "//", "_" );
       
         url = protocol + "://" + uri;
         
@@ -324,7 +325,7 @@
 
       url = getURLCacheName( url );
 
-      url = getCacheDirectory() + System.getProperty("file.separator") + url;
+      url = getCacheDirectory() + "/" + url;
 
       return url;
     }


--
--------------------------------------------------------------
Please read the FAQ! <http://java.apache.org/faq/>
To subscribe:        [EMAIL PROTECTED]
To unsubscribe:      [EMAIL PROTECTED]
Archives and Other:  <http://java.apache.org/main/mail.html>
Problems?:           [EMAIL PROTECTED]