pauldick 01/10/18 08:35:57
Modified: c/Tests/Harness FileUtility.cpp
Log:
Got rid of hardcoded references to analysis stylesheet.
Revision Changes Path
1.20 +15 -7 xml-xalan/c/Tests/Harness/FileUtility.cpp
Index: FileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FileUtility.cpp 2001/10/17 20:17:54 1.19
+++ FileUtility.cpp 2001/10/18 15:35:57 1.20
@@ -163,7 +163,7 @@
// Notes:
*/
-XalanDOMString FileUtility::GenerateFileName(const XalanDOMString&
theXMLFileName, char* suffix)
+XalanDOMString FileUtility::generateFileName(const XalanDOMString&
theXMLFileName, char* suffix)
{
XalanDOMString theResult;
int thePeriodIndex = -1;
@@ -199,7 +199,7 @@
// 03151046 is "Mar 15 10:46"
*/
-XalanDOMString FileUtility::GenerateUniqRunid()
+XalanDOMString FileUtility::generateUniqRunid()
{
struct tm *newtime;
@@ -1018,7 +1018,7 @@
// Returns: Void
*/
void
-FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString&
resultsFile)
+FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString&
base, const XalanDOMString& resultsFile)
{
XalanDOMString paramValue;
@@ -1028,12 +1028,20 @@
xalan.setStylesheetParam(XalanDOMString("testfile"), paramValue);
- int result = xalan.transform("\\xml-xalan\\c\\Tests\\cconf.xml",
-
"\\xml-xalan\\c\\Tests\\cconf.xsl",
-
"\\xml-xalan\\c\\Tests\\cconf.html");
+
+ const XalanDOMString theHTMLFile =
generateFileName(resultsFile,"html");
+ const XalanDOMString theStylesheet = base +
XalanDOMString("\cconf.xsl");
+ const XalanDOMString theXMLSource = base +
XalanDOMString("\cconf.xml");
+
+ const XSLTInputSource xslInputSource(c_wstr(theStylesheet));
+ const XSLTInputSource xmlInputSource(c_wstr(theXMLSource));
+ const XSLTResultTarget resultFile(theHTMLFile);
+
+
+ int result = xalan.transform(xmlInputSource, xslInputSource,
resultFile);
if (!result)
{
- system("\\xml-xalan\\c\\Tests\\cconf.html");
+ system(c_str(TranscodeToLocalCodePage(theHTMLFile)));
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
