You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/09/25 10:21:39 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication DefaultDocumentBuilder.java

andreas     2003/09/25 01:21:39

  Modified:    src/java/org/apache/lenya/cms/publication
                        DefaultDocumentBuilder.java
  Log:
  removing all extensions from the URL
  
  Revision  Changes    Path
  1.17      +16 -3     cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
  
  Index: DefaultDocumentBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultDocumentBuilder.java	17 Sep 2003 15:17:22 -0000	1.16
  +++ DefaultDocumentBuilder.java	25 Sep 2003 08:21:39 -0000	1.17
  @@ -95,8 +95,7 @@
           String originalURL = documentURL;
   
           String extension = getExtension(documentURL);
  -        String fullExtension = "".equals(extension) ? "" : ("." + extension);
  -        documentURL = documentURL.substring(0, documentURL.length() - fullExtension.length());
  +        documentURL = removeExtensions(documentURL);
   
           String language = getLanguage(documentURL);
           String fullLanguage = "".equals(language) ? "" : ("_" + language);
  @@ -146,6 +145,20 @@
   */
   
           return document;
  +    }
  +    
  +    /**
  +     * Removes all "."-separated extensions from a URL
  +     * (e.g., <code>/foo.print.html</code> is transformed to <code>/foo</code>).
  +     * @param url The URL to trim.
  +     * @return A URL string.
  +     */
  +    protected String removeExtensions(String url) {
  +        int dotIndex = url.indexOf(".");
  +        if (dotIndex > -1) {
  +            url = url.substring(0, dotIndex);
  +        }
  +        return url;
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org