From 829ce545b79395392bdde3af1b1fa75f6792814e Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 1 Aug 2001 00:04:04 +0000
Subject: [PATCH] removed old setContent/getContent garbage from Node. Some
 reformatting in ESNode.

---
 src/helma/framework/core/ESNode.java       | 150 +++++++--------------
 src/helma/framework/core/HopExtension.java |  29 +---
 2 files changed, 51 insertions(+), 128 deletions(-)

diff --git a/src/helma/framework/core/ESNode.java b/src/helma/framework/core/ESNode.java
index 8599941b..7a3da5a3 100644
--- a/src/helma/framework/core/ESNode.java
+++ b/src/helma/framework/core/ESNode.java
@@ -33,35 +33,35 @@ public class ESNode extends ObjectPrototype {
     
     // used to create cache nodes
     protected ESNode (INode node, RequestEvaluator eval) {
-        super (eval.esNodePrototype, eval.evaluator);
-        this.eval = eval;
-        this.node = node;
-        cache = null;
+	super (eval.esNodePrototype, eval.evaluator);
+	this.eval = eval;
+	this.node = node;
+	cache = null;
 
-        cacheWrapper = null;
-        nodeID = node.getID ();
-        dbmap = node.getDbMapping ();
+	cacheWrapper = null;
+	nodeID = node.getID ();
+	dbmap = node.getDbMapping ();
     }
     
     public ESNode (ESObject prototype, Evaluator evaluator, Object obj, RequestEvaluator eval) {
-        super (prototype, evaluator);
-        // eval.app.logEvent ("in ESNode constructor: "+o.getClass ());
-        this.eval = eval;
-        if (obj == null)
-            node = new Node ();
-        else if (obj instanceof ESWrapper) 
-            node = (INode) ((ESWrapper) obj).getJavaObject ();
-        else if (obj instanceof INode)
-            node = (INode) obj;
-        else
-            node = new Node (obj.toString ());
-        // set nodeID to id of wrapped node
-        nodeID = node.getID ();
-        dbmap = node.getDbMapping ();
+	super (prototype, evaluator);
+	// eval.app.logEvent ("in ESNode constructor: "+o.getClass ());
+	this.eval = eval;
+	if (obj == null)
+	    node = new Node (null);
+	else if (obj instanceof ESWrapper)
+	    node = (INode) ((ESWrapper) obj).getJavaObject ();
+	else if (obj instanceof INode)
+	    node = (INode) obj;
+	else
+	    node = new Node (obj.toString ());
+	// set nodeID to id of wrapped node
+	nodeID = node.getID ();
+	dbmap = node.getDbMapping ();
 
-        // get transient cache Node
-        cache = node.getCacheNode ();
-        cacheWrapper = new ESNode (cache, eval);
+	// get transient cache Node
+	cache = node.getCacheNode ();
+	cacheWrapper = new ESNode (cache, eval);
     }
 
     /**
@@ -70,100 +70,56 @@ public class ESNode extends ObjectPrototype {
      */
     private void checkNode () {
 	if (node.getState () == INode.INVALID) try {
-	    setNode (eval.app.nmgr.getNode (node.getID (), node.getDbMapping ()));
+	    setNode (eval.app.nmgr.getNode (new Key (node.getDbMapping (), node.getID ())));
 	} catch (Exception nx) {}
     }
 
-    public INode getNode () {
-        checkNode ();
-        return node;
+   public INode getNode () {
+	checkNode ();
+	return node;
     }
 
     public void setNode (INode node) {
-        if (node != null) {
-            this.node = node;
-            nodeID = node.getID ();
-            dbmap = node.getDbMapping ();
-            eval.objectcache.put (node, this);
-            // get transient cache Node
-            cache = node.getCacheNode ();
-            cacheWrapper = new ESNode (cache, eval);
-        }
+	if (node != null) {
+	    this.node = node;
+	    nodeID = node.getID ();
+	    dbmap = node.getDbMapping ();
+	    eval.objectcache.put (node, this);
+	    // get transient cache Node
+	    cache = node.getCacheNode ();
+	    cacheWrapper = new ESNode (cache, eval);
+	}
     }
 
     public void setPrototype (String protoName) {
-        checkNode ();
-        node.setPrototype (protoName);
+	checkNode ();
+	node.setPrototype (protoName);
     }
 
     public String getPrototypeName () {
-        return node.getPrototype ();
+	return node.getPrototype ();
     }
 
     public String getESClassName () {
-        return "HopObject";
+	return "HopObject";
     }
     
     public String toString () {
-         if (node == null)
-             return "<null>";
-         return node.toString ();
+	if (node == null)
+	    return "<null>";
+	return node.toString ();
     }
     
     public String toDetailString () {
-        return "ES:[Object: builtin " + this.getClass().getName() + ":" + 
-            ((node == null) ? "null" : node.toString()) + "]";
+	return "ES:[Object: builtin " + this.getClass().getName() + ":" +
+			((node == null) ? "null" : node.toString()) + "]";
     }
 
     protected void setError (Throwable e) {
-        lastError = e;
+	lastError = e;
     }
     
 
-    public boolean setContent (ESValue what[]) {
-        checkNode ();
-        if (what.length > 0) {
-            if (what[0] instanceof ESString) {
-                node.setContent (what[0].toString ());
-                return true;
-            }
-            if (what[0] instanceof ESWrapper) {
-                Object o =  ((ESWrapper) what[0]).toJavaObject ();
-                if (o instanceof INode) {
-                    try {
-                        INode p = (INode) o;
-                        node.setContent (p.getContent (), p.getContentType ());
-                        return true;
-                    } catch (Exception x) {
-                        eval.app.logEvent ("error in ESNode.setContent: "+x);
-                    }
-                }
-            }
-            if (what[0] instanceof ESNode) {
-                INode i = ((ESNode) what[0]).getNode ();
-                try {
-                    node.setContent (i.getContent (), i.getContentType ());
-                    return true;
-                } catch (Exception x) {
-                    eval.app.logEvent ("error in ESNode.setContent: "+x);
-                }
-            }
-        }
-        return false;
-    }
-
-    public Object getContent () {
-        checkNode ();
-        if (node.getContentLength () == 0)
-            return null;
-        String contentType = node.getContentType ();
-        if (contentType != null && contentType.startsWith ("text/")) {
-            return node.getText ();
-        } else {
-            return node.getContent ();
-        }
-    }
-    
     public boolean add (ESValue what[]) {
         checkNode ();
         for (int i=0; i<what.length; i++)
@@ -215,7 +171,7 @@ public class ESNode extends ObjectPrototype {
      *  when they go from transient to persistent state.
      */
     protected void rewrap (INode newnode) {
-        // eval.app.logEvent ("rewrapping "+this+" from "+node+" to "+newnode);
+        eval.app.logEvent ("##### rewrapping "+this+" from "+node+" to "+newnode);
         if (newnode == null)
             throw new RuntimeException ("Non-consistent check-in detected in rewrap ()");
         INode oldnode = node;
@@ -318,7 +274,7 @@ public class ESNode extends ObjectPrototype {
              checkNode ();
 	// eval.app.logEvent ("put property called: "+propertyName+", "+propertyValue.getClass());
 	if ("lastmodified".equalsIgnoreCase (propertyName) || "created".equalsIgnoreCase (propertyName) ||
-	        "contentlength".equalsIgnoreCase (propertyName) || "cache".equalsIgnoreCase (propertyName))
+	        "cache".equalsIgnoreCase (propertyName))
 	    throw new EcmaScriptException ("Can't modify read-only property \""+propertyName+"\".");
 
 	if ("subnodeRelation".equalsIgnoreCase (propertyName)) {
@@ -326,9 +282,7 @@ public class ESNode extends ObjectPrototype {
 	    return;
 	}
 
-	if ("contenttype".equalsIgnoreCase (propertyName))
-	    node.setContentType (propertyValue.toString ());
-	else if (propertyValue instanceof ESNull)
+	if (propertyValue instanceof ESNull)
 	    node.unset (propertyName);
 	else if (propertyValue instanceof ESString)
 	    node.setString (propertyName, propertyValue.toString ());
@@ -397,10 +351,6 @@ public class ESNode extends ObjectPrototype {
 	    return new DatePrototype (evaluator, node.created ());	
 	if ("lastmodified".equalsIgnoreCase (propertyName))
 	    return new DatePrototype (evaluator, node.lastModified ());
-	if ("contenttype".equalsIgnoreCase (propertyName))
-	    return new ESString (node.getContentType ());
-	if ("contentlength".equalsIgnoreCase (propertyName))
-	    return new ESNumber (node.getContentLength ());
 
 	if ("subnodeRelation".equalsIgnoreCase (propertyName)) {
 	    String rel = node.getSubnodeRelation ();
diff --git a/src/helma/framework/core/HopExtension.java b/src/helma/framework/core/HopExtension.java
index 24a1ba02..31d3cc0a 100644
--- a/src/helma/framework/core/HopExtension.java
+++ b/src/helma/framework/core/HopExtension.java
@@ -76,8 +76,6 @@ public class HopExtension {
         reval.esNodePrototype.putHiddenProperty ("editor", new NodeEditor ("editor", evaluator, fp));
         reval.esNodePrototype.putHiddenProperty ("chooser", new NodeChooser ("chooser", evaluator, fp));
         reval.esNodePrototype.putHiddenProperty ("multiChooser", new MultiNodeChooser ("multiChooser", evaluator, fp));
-        reval.esNodePrototype.putHiddenProperty ("getContent", new NodeGetContent ("getContent", evaluator, fp));
-        reval.esNodePrototype.putHiddenProperty ("setContent", new NodeSetContent ("setContent", evaluator, fp));
         reval.esNodePrototype.putHiddenProperty ("path", new NodePath ("path", evaluator, fp));
         reval.esNodePrototype.putHiddenProperty ("href", new NodeHref ("href", evaluator, fp));
         reval.esNodePrototype.putHiddenProperty ("setParent", new NodeSetParent ("setParent", evaluator, fp));
@@ -124,31 +122,6 @@ public class HopExtension {
 
     }
 
-
-    class NodeSetContent extends BuiltinFunctionObject {
-        NodeSetContent (String name, Evaluator evaluator, FunctionPrototype fp) {
-            super (fp, evaluator, name, 1);
-        }
-        public ESValue callFunction (ESObject thisObject, ESValue[] arguments) throws EcmaScriptException {
-            ESNode node = (ESNode) thisObject;
-            return ESBoolean.makeBoolean (node.setContent (arguments));
-        }
-    }
-    
-    class NodeGetContent extends BuiltinFunctionObject {
-        NodeGetContent (String name, Evaluator evaluator, FunctionPrototype fp) {
-            super (fp, evaluator, name, 1);
-        }
-        public ESValue callFunction (ESObject thisObject, ESValue[] arguments) throws EcmaScriptException {
-            ESNode node = (ESNode) thisObject;
-            Object content = node.getContent ();
-            if (content == null) 
-                return ESNull.theNull;
-            else 
-                return ESLoader.normalizeValue (content, this.evaluator);
-        }
-    }
-        
     class NodeAdd extends BuiltinFunctionObject {
         NodeAdd (String name, Evaluator evaluator, FunctionPrototype fp) {
             super (fp, evaluator, name, 1);
@@ -264,7 +237,7 @@ public class HopExtension {
             if (node instanceof helma.objectmodel.db.Node) {
                 ((helma.objectmodel.db.Node) node).invalidate ();
 	   try {
-                    node = app.nmgr.getNode (node.getID (), node.getDbMapping ());
+                    node = app.nmgr.getNode (new Key (node.getDbMapping (), node.getID ()));
                     esn.setNode (node);
 	    } catch (Exception x) {}
             }