diff --git a/mozilla/extensions/transformiix/source/main/transformiix.cpp b/mozilla/extensions/transformiix/source/main/transformiix.cpp index 0453a2b55bd..6faf31d3c7b 100644 --- a/mozilla/extensions/transformiix/source/main/transformiix.cpp +++ b/mozilla/extensions/transformiix/source/main/transformiix.cpp @@ -18,10 +18,15 @@ * (C) 1999 Keith Visco. All Rights Reserved. * * Contributor(s): + * * Keith Visco, kvisco@ziplink.net * -- original author. * - * $Id: transformiix.cpp,v 1.4 2000-04-06 07:44:35 kvisco%ziplink.net Exp $ + * Nathan Pride, npride@wavo.com + * -- fixed document base when stylesheet is specified, + * it was defaulting to the XML document. + * + * $Id: transformiix.cpp,v 1.5 2000-04-20 10:13:22 kvisco%ziplink.net Exp $ */ @@ -95,9 +100,7 @@ int main(int argc, char** argv) { ifstream xmlInput(xmlFilename->toCharArray(chars), ios::in); delete chars; - //-- create document base String documentBase; - URIUtils::getDocumentBase(*xmlFilename, documentBase); //-- handle output stream ostream* resultOutput = &cout; @@ -114,6 +117,8 @@ int main(int argc, char** argv) { } //-- process if ( !xsltFilename ) { + //-- use xml document to obtain a document base + URIUtils::getDocumentBase(*xmlFilename, documentBase); xsltProcessor.process(xmlInput, *resultOutput, documentBase); } else { @@ -121,6 +126,8 @@ int main(int argc, char** argv) { chars = new char[xsltFilename->length()+1]; ifstream xsltInput(xsltFilename->toCharArray(chars), ios::in); delete chars; + // obtain document base from XSLT stylesheet + URIUtils::getDocumentBase(*xmlFilename, documentBase); xsltProcessor.process(xmlInput, xsltInput, *resultOutput, documentBase); } resultFileStream.close(); @@ -138,7 +145,7 @@ void printHelp() { } void printUsage() { cout << endl; - cout << "usage:"; + cout << "usage: "; cout << "transfrmx -i xml-file [-s xslt-file] [-o output-file]"<