cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/dom LoadDocument.java

[ilene]

ilene       2003/06/30 11:45:38

  Modified:    java/src/org/apache/xalan/xsltc/dom LoadDocument.java
  Log:
  Fix for 3 trax.localPath failures.
  
  Revision  Changes    Path
  1.23      +4 -9      
xml-xalan/java/src/org/apache/xalan/xsltc/dom/LoadDocument.java
  
  Index: LoadDocument.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/LoadDocument.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- LoadDocument.java 25 Jun 2003 19:55:45 -0000      1.22
  +++ LoadDocument.java 30 Jun 2003 18:45:38 -0000      1.23
  @@ -105,7 +105,9 @@
               //System.err.println("arg2FirstNode name: "
               //                   + dom.getNodeName(arg2FirstNode )+"["
               //                   +Integer.toHexString(arg2FirstNode )+"]");
  -            baseURI = getBaseFromURI(dom.getDocumentURI(arg2FirstNode)); 
  +            baseURI = dom.getDocumentURI(arg2FirstNode);
  +            if (!SystemIDResolver.isAbsoluteURI(baseURI))
  +               baseURI = 
SystemIDResolver.getAbsoluteURIFromRelative(baseURI);
           }
         
           try {
  @@ -318,11 +320,4 @@
           return new SingletonIterator(newdom.getDocument(), true);
       }
    
  -    private static String getBaseFromURI( String uri){
  -        final int backwardSep = uri.lastIndexOf('\\') + 1;
  -        final int forwardSep = uri.lastIndexOf('/') + 1;
  -
  -        return uri.substring(0, Math.max(backwardSep, forwardSep));
  -    }
  -
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]