lenya/src/java/org/apache/lenya/cms/publication PageEnvelope.java,1.11,1.12

Update of /repository/lenya/src/java/org/apache/lenya/cms/publication
In directory erbium:/tmp/cvs-serv19726/src/java/org/apache/lenya/cms/publication

Modified Files:
	PageEnvelope.java 
Log Message:
No longer trim "index" from the document-id.


Index: PageEnvelope.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/publication/PageEnvelope.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PageEnvelope.java	8 May 2003 13:40:57 -0000	1.11
--- PageEnvelope.java	14 May 2003 08:35:46 -0000	1.12
***************
*** 97,103 ****
       * before and including "area" and after and including '.'
       *
-      * Also if the requestURI contains a "foo/index" we assume that
-      * the document-id is foo, i.e. we also trin "index"
-      *
       * @param requestURI a <code>String</code> value
       * @return a <code>String</code> value
--- 97,100 ----
***************
*** 121,132 ****
  	    documentIds.set(documentIds.size()-1, lastPartOfDocumentId.substring(0, startOfSuffix));
  	    log.debug("w/oSuffix: " + lastPartOfDocumentId.substring(0, startOfSuffix));
- 	}
- 
- 	// Another part of the heuristics is that if the last part of
- 	// the document-id is "index" it is to be removed.
- 	lastPartOfDocumentId = (String)documentIds.get(documentIds.size()-1);
- 	int startOfIndex = lastPartOfDocumentId.indexOf("index");
- 	if (startOfIndex >= 0) {
- 	    documentIds.set(documentIds.size()-1, lastPartOfDocumentId.substring(0, startOfIndex));
  	}
  
--- 118,121 ----