cvs commit: xml-xalan/c/src/XSLT FunctionDocument.cpp

[jdonohue]

jdonohue    00/03/20 12:22:08

  Modified:    c/src/XSLT FunctionDocument.cpp
  Log:
  Removed filename part of base uri
  
  Revision  Changes    Path
  1.3       +8 -3      xml-xalan/c/src/XSLT/FunctionDocument.cpp
  
  Index: FunctionDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FunctionDocument.cpp      2000/03/07 16:16:27     1.2
  +++ FunctionDocument.cpp      2000/03/20 20:22:07     1.3
  @@ -93,10 +93,10 @@
   {
        DOMString               localURI(uri);
   
  -    DOM_Document     newDoc = executionContext.getSourceDocument(localURI);
  +     DOM_Document    newDoc = executionContext.getSourceDocument(localURI);
   
  -    if(newDoc == 0)
  -    {
  +     if(newDoc == 0)
  +     {
                if(length(localURI) == 0)
                {
                        assert(executionContext.getPrefixResolver() != 0);
  @@ -186,6 +186,11 @@
   
                        base = executionContext.getPrefixResolver()->getURI();
                }
  +
  +             // Chop off the file name part of the URI, this does not 
include the
  +             // trailing separator
  +             int ix = lastIndexOf(base, '/');
  +             base = substring(base, 0, ix);
   
                MutableNodeRefList              
mnl(executionContext.createMutableNodeRefList());