X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FTemplate.java;h=2f3e2acef89baddfa7cbe2619bb22bcead772540;hb=bb26c9c5308bb6d0ec5554a357fc86085139ccb3;hp=154de72b70027cf17158b285ad00c272f37310c6;hpb=4abd3e305d0b87f37d5969016b86ba53574a3210;p=org.ibex.core.git

diff --git a/src/org/ibex/Template.java b/src/org/ibex/Template.java
index 154de72..2f3e2ac 100644
--- a/src/org/ibex/Template.java
+++ b/src/org/ibex/Template.java
@@ -32,7 +32,9 @@ public class Template {
     private Vec children = new Vec();   ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
     private JS script = null;           ///< the script on this node
     Template prev;
+    Template prev2;
     JSScope staticScope = null;         ///< the scope in which the static block is executed
+    JS staticObject = null;
 
 
     // Only used during parsing /////////////////////////////////////////////////////////////////
@@ -75,12 +77,14 @@ public class Template {
 
     private void apply(Box b, PerInstantiationScope parentPis) throws JSExn, IOException {
         if (prev != null) prev.apply(b, null);
+        if (prev2 != null) prev2.apply(b, null);
 
         // FIXME this dollar stuff is all wrong
         if (id != null) parentPis.putDollar(id, b);
 
-        PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticScope);
+        PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticObject);
         for(int i=0; i<urikeys.length; i++) {
+            if (urikeys[i] == null) continue;
             pis.declare(urikeys[i]);
             pis.put(urikeys[i], ibex.resolveString(urivals[i], true));
         }
@@ -114,7 +118,6 @@ public class Template {
                     // FIXME: should we be resolving all of these in the XML-parsing code?
                 }
             }
-
             b.putAndTriggerTraps(key, val);
         }
     }
@@ -157,12 +160,14 @@ public class Template {
             InputStream is = Stream.getInputStream(s);
             Ibex.Blessing b = Ibex.Blessing.getBlessing(s).parent;
             while(b != null) {
-                initial_uri = (b.parentkey == null ? "" : (b.parentkey + ".")) + initial_uri;
+                if(b.parentkey != null) initial_uri = b.parentkey + (initial_uri.equals("") ? "" : "." + initial_uri);
                 b = b.parent;
             }
+            initial_uri = "";
             parse(new InputStreamReader(is));
             JS staticScript = parseScript(static_content, static_content_start);
-            t.staticScope = new PerInstantiationScope(null, ibex, null, null);
+            t.staticObject = new JS();
+            t.staticScope = new PerInstantiationScope(null, ibex, null, t.staticObject);
             if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
         }
 
@@ -182,6 +187,7 @@ public class Template {
                     if (c.getAttrLen() != 0)
                         throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
                     if (c.getUri("ui") == null || "".equals(c.getUri("ui"))) c.addUri("ui", "ibex://ui");
+                    if (c.getUri("meta") == null || "".equals(c.getUri("meta"))) c.addUri("meta", "ibex://meta");
                     if (c.getUri("") == null || "".equals(c.getUri(""))) c.addUri("", initial_uri);
                     state = STATE_IN_ROOT_NODE;
                     return;
@@ -200,21 +206,23 @@ public class Template {
                 String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
                 // GROSS hack
                 try {
-                    t.prev = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);
+                    // GROSSER hack
+                    t.prev2 = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);
                 } catch (Exception e) {
                     Log.error(Template.class, e);
                 }
             }
                 
             Hash urimap = c.getUriMap();
-            t.urikeys = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
-            t.urivals = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
+            t.urikeys = new String[urimap.size()];
+            t.urivals = new String[urimap.size()];
             Enumeration uriEnumeration = urimap.keys();
             int ii = 0;
             while(uriEnumeration.hasMoreElements()) {
                 String key = (String)uriEnumeration.nextElement();
-                if (key.equals("ui")) continue;
                 String val = (String)urimap.get(key);
+                if (val.equals("ibex://ui")) continue;
+                if (val.equals("ibex://meta")) continue;
                 t.urikeys[ii] = key;
                 if (val.length() > 0 && val.charAt(0) == '.') val = val.substring(1);
                 t.urivals[ii] = val;
@@ -226,11 +234,10 @@ public class Template {
 
             // process attributes into Vecs, dealing with any XML Namespaces in the process
             ATTR: for (int i=0; i < c.getAttrLen(); i++) {
-                //#switch(c.getAttrKey(i))
-                case "id":
+                if (c.getAttrKey(i).equals("id")) {
                     t.id = c.getAttrVal(i).toString().intern();
                     continue ATTR;
-                //#end
+                }
 
                 // treat value starting with '.' as resource reference
                 String uri = c.getAttrUri(i); if (!uri.equals("")) uri = '.' + uri;
@@ -288,6 +295,7 @@ public class Template {
                     nodeStack.setSize(nodeStack.size() - 1);
                     t.children.addElement(oldt);
                     int oldt_lines = getLine() - oldt.startLine;
+                    if (t.content == null) t.content = new StringBuffer();
                     for (int i=0; oldt_lines > i; i++) t.content.append('\n');
                 }
             }
@@ -320,13 +328,13 @@ public class Template {
     private static class PerInstantiationScope extends JSScope {
         Ibex ibex = null;
         PerInstantiationScope parentBoxPis = null;
-        JSScope myStatic = null;
+        JS myStatic = null;
         void putDollar(String key, Box target) throws JSExn {
             if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
             declare("$" + key);
             put("$" + key, target);
         }
-        public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JSScope myStatic) {
+        public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JS myStatic) {
             super(parentScope);
             this.parentBoxPis = parentBoxPis;
             this.ibex = ibex;