X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FTemplate.java;h=05cede3e91dcfee1752d45a96e7542e061a5b445;hb=06ee5c54c9f27e37bbdb5155e29b2cd90d5ca98f;hp=943fe0fbc85315b15c3f72edecceb714d88c3bcb;hpb=ba09e48a63af493adc3b5c1d4c891a992fe63207;p=org.ibex.core.git

diff --git a/src/org/ibex/Template.java b/src/org/ibex/Template.java
index 943fe0f..05cede3 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));
         }
@@ -123,9 +126,9 @@ public class Template {
 
     // XML Parsing /////////////////////////////////////////////////////////////////
 
-    public static Template buildTemplate(String sourceName, InputStream is, Ibex ibex) {
+    public static Template buildTemplate(String sourceName, Object s, Ibex ibex) {
         try {
-            return new TemplateHelper(sourceName, is, ibex).t;
+            return new TemplateHelper(sourceName, s, ibex).t;
         } catch (Exception e) {
             Log.error(Template.class, e);
             return null;
@@ -149,9 +152,17 @@ public class Template {
         int meta = 0;
         Ibex ibex;
 
-	public TemplateHelper(String sourceName, InputStream is, Ibex ibex) throws XML.Exn, IOException, JSExn {
+        String initial_uri = "";
+
+	public TemplateHelper(String sourceName, Object s, Ibex ibex) throws XML.Exn, IOException, JSExn {
             this.sourceName = sourceName;
             this.ibex = ibex;
+            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;
+                b = b.parent;
+            }
             parse(new InputStreamReader(is));
             JS staticScript = parseScript(static_content, static_content_start);
             t.staticScope = new PerInstantiationScope(null, ibex, null, null);
@@ -173,10 +184,13 @@ public class Template {
                         throw new XML.Exn("root element was not <ibex>", XML.Exn.SCHEMA, getLine(), getCol());
                     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;
                 case STATE_IN_ROOT_NODE:
-                    if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
+                    if ("ibex://meta".equals(c.getUri())) { state = STATE_IN_META_NODE; meta = 0; return; }
                     state = STATE_IN_TEMPLATE_NODE;
                     t = (t == null) ? new Template(ibex) : new Template(t, getLine());
                     break;
@@ -186,11 +200,12 @@ public class Template {
                     break;
             }
 
-            if (!(/* "ui".equals(c.getPrefix()) && */ "box".equals(c.getLocalName()))) {
+            if (!("ibex://ui".equals(c.getUri()) && "box".equals(c.getLocalName()))) {
                 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);
                 }
@@ -204,8 +219,10 @@ public class Template {
             while(uriEnumeration.hasMoreElements()) {
                 String key = (String)uriEnumeration.nextElement();
                 String val = (String)urimap.get(key);
+                if (val.equals("ibex://ui")) continue;
+                if (val.equals("ibex://meta")) continue;
                 t.urikeys[ii] = key;
-                if (val.charAt(0) == '.') val = val.substring(1);
+                if (val.length() > 0 && val.charAt(0) == '.') val = val.substring(1);
                 t.urivals[ii] = val;
                 ii++;
             }