antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Renamed save(), load() and create() to write(), writeToString(),

Browse source 
read() and readFromString() as discussed on the mailing list.
This commit is contained in:
hns 2002-06-05 17:47:11 +00:00
parent 0149b093b7
commit 13fb4e28f6
1 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/helma/scripting/fesi/extensions/DomExtension.java
View file

@ -1,6 +1,7 @@
package helma.scripting.fesi.extensions; package helma.scripting.fesi.extensions;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -33,9 +34,10 @@ public class DomExtension extends Extension {
ESObject globalXml = new GlobalObjectXml("Xml", evaluator, fp); ESObject globalXml = new GlobalObjectXml("Xml", evaluator, fp);
globalXml.putHiddenProperty ("length",new ESNumber(1)); globalXml.putHiddenProperty ("length",new ESNumber(1));
globalXml.putHiddenProperty ("load", new XmlLoad ("load", evaluator, fp)); globalXml.putHiddenProperty ("read", new XmlRead ("read", evaluator, fp, false));
globalXml.putHiddenProperty ("save", new XmlSave ("save", evaluator, fp)); globalXml.putHiddenProperty ("readFromString", new XmlRead ("readFromString", evaluator, fp, true));
globalXml.putHiddenProperty ("create", new XmlCreate ("create", evaluator, fp)); globalXml.putHiddenProperty ("write", new XmlWrite ("write", evaluator, fp, false));
globalXml.putHiddenProperty ("writeToString", new XmlWrite ("writeToString", evaluator, fp, true));
globalXml.putHiddenProperty ("get", new XmlGet ("get", evaluator, fp)); globalXml.putHiddenProperty ("get", new XmlGet ("get", evaluator, fp));
go.putHiddenProperty ("Xml", globalXml); go.putHiddenProperty ("Xml", globalXml);
} }
@ -52,29 +54,42 @@ public class DomExtension extends Extension {
} }
} }
class XmlSave extends BuiltinFunctionObject { class XmlWrite extends BuiltinFunctionObject {
XmlSave(String name, Evaluator evaluator, FunctionPrototype fp) { boolean tostring;
XmlWrite(String name, Evaluator evaluator, FunctionPrototype fp, boolean tostring) {
super(fp, evaluator, name, 1); super(fp, evaluator, name, 1);
this.tostring = tostring;
} }
public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException { public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException {
if ( arguments==null || arguments.length<2 ) if ( arguments==null ||
throw new EcmaScriptException("not enough arguments"); (tostring && arguments.length != 1) ||
(!tostring && arguments.length != 2))
throw new EcmaScriptException("wrong number of arguments");
INode node = null; INode node = null;
try { try {
node = ((ESNode)arguments[1]).getNode(); node = ((ESNode)arguments[0]).getNode();
} catch ( Exception e ) { } catch ( Exception e ) {
// we definitly need a node // we definitly need a node
throw new EcmaScriptException("argument is not an hopobject"); throw new EcmaScriptException("first argument is not an hopobject");
} }
try { try {
File tmpFile = new File(arguments[0].toString()+".tmp."+XmlWriter.generateID()); if (tostring) {
XmlWriter writer = new XmlWriter (tmpFile); ByteArrayOutputStream out = new ByteArrayOutputStream ();
writer.setDatabaseMode(false); XmlWriter writer = new XmlWriter (out, "UTF-8");
boolean result = writer.write(node); writer.setDatabaseMode(false);
writer.close(); boolean result = writer.write(node);
File finalFile = new File(arguments[0].toString()); writer.close();
tmpFile.renameTo (finalFile); return new ESString (out.toString ("utf8"));
this.evaluator.reval.app.logEvent("wrote xml to " + finalFile.getAbsolutePath() ); } else {
File tmpFile = new File(arguments[0].toString()+".tmp."+XmlWriter.generateID());
XmlWriter writer = new XmlWriter (tmpFile);
writer.setDatabaseMode(false);
boolean result = writer.write(node);
writer.close();
File finalFile = new File(arguments[0].toString());
tmpFile.renameTo (finalFile);
this.evaluator.reval.app.logEvent("wrote xml to " + finalFile.getAbsolutePath() );
}
} catch (IOException io) { } catch (IOException io) {
throw new EcmaScriptException (io.toString()); throw new EcmaScriptException (io.toString());
} }
@ -113,9 +128,11 @@ public class DomExtension extends Extension {
} }
} }
class XmlLoad extends BuiltinFunctionObject { class XmlRead extends BuiltinFunctionObject {
XmlLoad(String name, Evaluator evaluator, FunctionPrototype fp) { boolean fromstring;
XmlRead(String name, Evaluator evaluator, FunctionPrototype fp, boolean fromstring) {
super(fp, evaluator, name, 1); super(fp, evaluator, name, 1);
this.fromstring = fromstring;
} }
public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException { public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException {
if ( arguments==null || arguments.length==0 ) if ( arguments==null || arguments.length==0 )
@ -129,7 +146,11 @@ public class DomExtension extends Extension {
} }
try { try {
XmlReader reader = new XmlReader (); XmlReader reader = new XmlReader ();
INode result = reader.read (new File(arguments[0].toString()),node); INode result = null;
if (fromstring)
result = reader.read (new StringReader (arguments[0].toString()),node);
else
result = reader.read (new File(arguments[0].toString()),node);
return this.evaluator.reval.getNodeWrapper (result); return this.evaluator.reval.getNodeWrapper (result);
} catch ( NoClassDefFoundError e ) { } catch ( NoClassDefFoundError e ) {
throw new EcmaScriptException ("Can't load dom-capable xml parser."); throw new EcmaScriptException ("Can't load dom-capable xml parser.");