cvs commit: xml-xalan/java/src/org/apache/xml/utils SystemIDResolver.java

[sboag]

sboag       00/12/09 11:40:49

  Modified:    java/src/org/apache/xml/utils SystemIDResolver.java
  Log:
  Tweak file:xxx munging.  Wish I didn't have to do this.
  
  Revision  Changes    Path
  1.4       +8 -5      
xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java
  
  Index: SystemIDResolver.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SystemIDResolver.java     2000/12/01 22:01:15     1.3
  +++ SystemIDResolver.java     2000/12/09 19:40:49     1.4
  @@ -119,14 +119,18 @@
       }
   
       // bit of a hack here.  Need to talk to URI person to see if this can be 
fixed.
  -    /*
  -    bad hack -sb
       if ((null != base) && urlString.startsWith("file:")
               && (urlString.charAt(5) != '/'))
       {
  -      urlString = urlString.substring(5);
  +      if(base.equals(urlString))
  +      {
  +        base = "";
  +      }
  +      else
  +      {
  +        urlString = urlString.substring(5);
  +      }
       }   
  -    */                
   
       // This is probably a bad idea, we should at least check for quotes...
       if (null != base && (base.indexOf('\\') > -1))
  @@ -156,7 +160,6 @@
       }
   
       String uriStr = uri.toString();
  -
       return uriStr;
     }
   }