You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/03/06 22:08:15 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xslt Process.java
sboag 00/03/06 13:08:15
Modified: src/org/apache/xalan/xpath/xdom XercesLiaison.java
src/org/apache/xalan/xslt Process.java
Log:
Fixed dumb bug in -media handling.
Revision Changes Path
1.17 +2 -0 xml-xalan/src/org/apache/xalan/xpath/xdom/XercesLiaison.java
Index: XercesLiaison.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xdom/XercesLiaison.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XercesLiaison.java 2000/03/06 20:13:43 1.16
+++ XercesLiaison.java 2000/03/06 21:08:14 1.17
@@ -240,6 +240,8 @@
}
if(getUseValidation())
parser.setFeature("http://xml.org/sax/features/validation", true);
+ else
+ parser.setFeature("http://xml.org/sax/features/validation", false);
try
{
1.17 +6 -1 xml-xalan/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Process.java 2000/03/02 10:23:06 1.16
+++ Process.java 2000/03/06 21:08:15 1.17
@@ -508,10 +508,15 @@
}
else if(null != media)
{
- StylesheetSpec spec = processor.getAssociatedStylesheet(new XSLTInputSource("foo.xml"),
+ StylesheetSpec spec = processor.getAssociatedStylesheet(new XSLTInputSource(inFileName),
media, null);
if(null != spec)
{
+ if(spec.getSystemId() != null)
+ {
+ URL url = processor.getXMLProcessorLiaison().getURLFromString(spec.getSystemId(), inFileName);
+ spec.setSystemId(url.toExternalForm());
+ }
processor.process(new XSLTInputSource(inFileName),
spec,
new XSLTResultTarget(outputStream));