fixed bug 460

[org.ibex.core.git] / src / org / ibex / Template.java

diff --git a/src/org/ibex/Template.java b/src/org/ibex/Template.java
index ec47e7c..154de72 100644 (file)
--- a/src/org/ibex/Template.java
+++ b/src/org/ibex/Template.java
@@ -32,7 +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;
-    JSScope staticScope = null;   ///< the scope in which the static block is executed
+    JSScope staticScope = null;         ///< the scope in which the static block is executed
 
 
     // Only used during parsing /////////////////////////////////////////////////////////////////
@@ -123,9 +123,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;
@@ -138,7 +138,7 @@ public class Template {
        String sourceName;
         private int state = STATE_INITIAL;
         private static final int STATE_INITIAL = 0;
-        private static final int STATE_IN_Ibex_NODE = 1;
+        private static final int STATE_IN_ROOT_NODE = 1;
         private static final int STATE_IN_TEMPLATE_NODE = 2; 
         private static final int STATE_IN_META_NODE = 3;
 
@@ -149,9 +149,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 +181,12 @@ 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());
-                    state = STATE_IN_Ibex_NODE;
+                    if (c.getUri("ui") == null || "".equals(c.getUri("ui"))) c.addUri("ui", "ibex://ui");
+                    if (c.getUri("") == null || "".equals(c.getUri(""))) c.addUri("", initial_uri);
+                    state = STATE_IN_ROOT_NODE;
                     return;
-                case STATE_IN_Ibex_NODE:
-                    if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
+                case STATE_IN_ROOT_NODE:
+                    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,7 +196,7 @@ 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 {
@@ -197,15 +207,16 @@ public class Template {
             }
                 
             Hash urimap = c.getUriMap();
-            t.urikeys = new String[urimap.size()];
-            t.urivals = new String[urimap.size()];
+            t.urikeys = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
+            t.urivals = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
             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);
                 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++;
             }
@@ -267,11 +278,11 @@ public class Template {
 
         public void endElement(XML.Element c) throws XML.Exn, IOException {
             switch(state) {
-                case STATE_IN_META_NODE: if (meta-- < 0) state = STATE_IN_Ibex_NODE; return;
-                case STATE_IN_Ibex_NODE: return;
+                case STATE_IN_META_NODE: if (--meta < 0) state = STATE_IN_ROOT_NODE; return;
+                case STATE_IN_ROOT_NODE: return;
                 case STATE_IN_TEMPLATE_NODE: {
                     if (t.content != null) { t.script = parseScript(t.content, t.content_start); t.content = null; }
-                    if (nodeStack.size() == 0) { state = STATE_IN_Ibex_NODE; return; }
+                    if (nodeStack.size() == 0) { state = STATE_IN_ROOT_NODE; return; }
                     Template oldt = t;
                     t = (Template)nodeStack.lastElement();
                     nodeStack.setSize(nodeStack.size() - 1);
@@ -293,7 +304,7 @@ public class Template {
                     }
                     t.content.append(ch, start, length);
                     return;
-                case STATE_IN_Ibex_NODE:
+                case STATE_IN_ROOT_NODE:
                     if (static_content == null) {
                         static_content_start = getLine();
                         static_content = new StringBuffer();