Version 2.9 candidate

[TestXSLT.git] / Workset.m

diff --git a/Workset.m b/Workset.m
index bf6d67f..7d3b3bb 100644 (file)
--- a/Workset.m
+++ b/Workset.m
@@ -16,7 +16,7 @@
        if (self = [super init]) {
                xmlCode = [[NSString stringWithFormat:@"<text>\nPut your XML code here.\nPut your XSLT code under the XSLT tab.\nThen click on the Process button.\n</text>"] retain];
                xsltCode = [[NSString stringWithFormat:@"<?xml version='1.0' encoding='iso-8859-1'?>\n\n<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>\n\n<xsl:output method='html' version='1.0' encoding='iso-8859-1' indent='no'/>\n\n</xsl:stylesheet>"] retain];
-               result = [[NSString alloc] init];
+               result = [[NSData alloc] init];
                parameterSet = [[ParameterSet alloc] init];
                xmlFilename = nil;
                xsltFilename = nil;
@@ -109,7 +109,7 @@
                return FALSE;
        }
        
-       [[self xmlCode] writeToFile:[self xmlFilename] atomically:NO];
+       [[XMLUtils getDataWithEncodingFromString:[self xmlCode]] writeToFile:[self xmlFilename] atomically:NO];
        [self updateXmlFileModificationDate];
 
        return YES;
@@ -154,7 +154,7 @@
 
 - (void)reloadXmlFromFile {
 
-       [self setXmlCode:[NSString stringWithContentsOfFile:[self xmlFilename]]];
+       [self setXmlCode:[XMLUtils getStringWithEncodingFromFile:[self xmlFilename]]];
        [self updateXmlFileModificationDate];
 
 }
@@ -163,6 +163,15 @@
 
 
 
+- (int)resultEncoding {
+       return resultEncoding;
+}
+
+- (void)setResultEncoding:(NSStringEncoding)newencoding {
+       resultEncoding = newencoding;
+}
+
+
 
 
 
@@ -190,7 +199,7 @@
                return FALSE;
        }
 
-       [[self xsltCode] writeToFile:[self xsltFilename] atomically:NO];
+       [[XMLUtils getDataWithEncodingFromString:[self xsltCode]] writeToFile:[self xsltFilename] atomically:NO];
        [self updateXsltFileModificationDate];
 
        return YES;
@@ -234,7 +243,7 @@
 
 - (void)reloadXsltFromFile {
 
-       [self setXsltCode:[NSString stringWithContentsOfFile:[self xsltFilename]]];
+       [self setXsltCode:[XMLUtils getStringWithEncodingFromFile:[self xsltFilename]]];
        [self updateXsltFileModificationDate];
                
 }
@@ -243,9 +252,6 @@
 
 
 
-
-
-
 - (NSString *)resultFilename {
        return resultFilename;
 }
@@ -273,16 +279,23 @@
        xsltCode = s;
 }
 
-- (NSString *)result {
+- (NSData *)result {
        return result;
 }
 
-- (void)setResult:(NSString *)s {
+- (void)setResult:(NSData *)s {
        [s retain];
        [result release];
        result = s;
 }
 
+
+- (NSString *)stringResult {
+       return [[[NSString alloc] initWithData:result encoding:[self resultEncoding]] autorelease];
+}
+
+
+
 - (ParameterSet *)parameterSet {
        return parameterSet;
 }