You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@locus.apache.org on 2000/05/11 23:32:01 UTC

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

dbertoni    00/05/11 14:32:01

  Modified:    c/src/XSLT FunctionDocument.cpp
  Log:
  Removed bogus code that was changed the URL of the document.
  
  Revision  Changes    Path
  1.7       +2 -29     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FunctionDocument.cpp	2000/04/12 19:41:00	1.6
  +++ FunctionDocument.cpp	2000/05/11 21:32:01	1.7
  @@ -192,33 +192,6 @@
   			base = executionContext.getPrefixResolver()->getURI();
   		}
   
  -		// Chop off the file name part of the URI, this includes the
  -		// trailing separator
  -		XalanDOMString newBase;
  -
  -		if (length(base) > 0)
  -		{
  -			const unsigned int	theLength = length(base);
  -
  -			unsigned int		indexOfSlash = lastIndexOf(base, '/');
  -#if defined(WIN32)				
  -			const unsigned int	indexOfBackSlash = lastIndexOf(base, '\\');
  -
  -			if(indexOfBackSlash > indexOfSlash && indexOfBackSlash < theLength)
  -			{
  -				indexOfSlash = indexOfBackSlash;
  -			}
  -#endif
  -			if (indexOfSlash < theLength)
  -			{
  -				newBase = substring(base, 0, indexOfSlash + 1);
  -			}
  -			else
  -			{
  -				newBase = base;
  -			}
  -		}
  -
   		MutableNodeRefList		mnl(executionContext.createMutableNodeRefList());
   
   		const int				nRefs = XObject::eTypeNodeSet == arg->getType() ?
  @@ -264,10 +237,10 @@
   				if(indexOfColon < theLength && indexOfSlash < theLength && indexOfColon < indexOfSlash)
   				{
   					// The url (or filename, for that matter) is absolute.
  -					newBase = XalanDOMString();
  +					base = XalanDOMString();
   				}
   
  -				XalanDocument* const	newDoc = getDoc(executionContext, ref, newBase);
  +				XalanDocument* const	newDoc = getDoc(executionContext, ref, base);
   
   				if(newDoc != 0)
   				{