X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FTemplate.java;h=2ef5e1b2e131dd88dde1f16460b99eac52ff0a5d;hb=8908552c1a2ae233c95d0ed59ee6cfa9c4a91440;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..2ef5e1b 100644
--- a/src/org/ibex/Template.java
+++ b/src/org/ibex/Template.java
@@ -32,6 +32,7 @@ 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
 
 
@@ -75,12 +76,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);
         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));
         }
@@ -157,7 +160,7 @@ 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;
             }
             parse(new InputStreamReader(is));
@@ -182,6 +185,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 +204,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;