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/07/29 17:39:37 UTC

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

andreas     2003/07/29 08:39:37

  Modified:    src/java/org/apache/lenya/cms/publication
                        DefaultDocumentBuilder.java DefaultDocument.java
  Log:
  using original URL as document-url
  
  Revision  Changes    Path
  1.7       +4 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultDocumentBuilder.java	29 Jul 2003 14:23:10 -0000	1.6
  +++ DefaultDocumentBuilder.java	29 Jul 2003 15:39:37 -0000	1.7
  @@ -93,6 +93,8 @@
           String area = publicationURI.split("/")[1];
   
           String documentUrl = publicationURI.substring(("/" + area).length());
  +        
  +        String originalUrl = documentUrl;
   
           String extension = getExtension(documentUrl);
           String fullExtension = "".equals(extension) ? "" : ("." + extension);
  @@ -116,6 +118,7 @@
   
           DefaultDocument document = new DefaultDocument(publication, documentId, area, language);
           document.setExtension(extension);
  +        document.setDocumentUrl(originalUrl);
   
           return document;
       }
  
  
  
  1.18      +14 -5     cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
  
  Index: DefaultDocument.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocument.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DefaultDocument.java	28 Jul 2003 20:07:07 -0000	1.17
  +++ DefaultDocument.java	29 Jul 2003 15:39:37 -0000	1.18
  @@ -253,14 +253,23 @@
           this.extension = extension;
       }
   
  +    private String documentUrl;
  +    
  +    /**
  +     * Sets the document URL.
  +     * @param url The document URL (without publication ID and area).
  +     */
  +    public void setDocumentUrl(String url) {
  +        assert url != null;
  +        this.documentUrl = url;
  +    }
  +    
       /**
        * @see org.apache.lenya.cms.publication.Document#getDocumentUrl()
        */
       public String getDocumentUrl() {
  -        String languageSuffix = "".equals(getLanguage()) ? "" : ("_" + getLanguage());
  -        String extensionSuffix = "".equals(getExtension()) ? "" : ("." + getExtension());
  -
  -        return getId() + languageSuffix + extensionSuffix;
  +        return documentUrl;
       }
  +    
       
   }
  
  
  

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