[Exist-commits] eXist-1.0/src/org/exist/storage/serializers Serializer.java,1.26,1.27

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31942/src/org/exist/storage/serializers

Modified Files:
	Serializer.java 
Log Message:
Fixed: relative stylesheet paths containing .. were not resolved.

Index: Serializer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers/Serializer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Serializer.java	27 Jul 2004 16:38:01 -0000	1.26
--- Serializer.java	28 Jul 2004 08:28:04 -0000	1.27
***************
*** 698,705 ****
  				// if stylesheet is relative, add path to the
  				// current collection
! 				URI base = URI.create(doc.getCollection().getName() + "/");
! 				URI uri = URI.create(stylesheet);
! 				stylesheet = base.resolve(uri).toString();
! 
  				// load stylesheet from eXist
  				DocumentImpl xsl = null;
--- 698,707 ----
  				// if stylesheet is relative, add path to the
  				// current collection
! 				if(doc != null) {
! 					URI base = URI.create(doc.getCollection().getName() + "/");
! 					URI uri = URI.create(stylesheet);
! 					stylesheet = base.resolve(uri).toString();
! 				}
! 				
  				// load stylesheet from eXist
  				DocumentImpl xsl = null;