Changeset 1436

Timestamp:

2010-02-16 09:06:52 (2 years ago)

Author:

mpo

Message:

fix for #191

Location:

trunk

Files:

• modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html (modified) (1 diff)
• modules/kauri-jquery/src/test/kauri.util/testPage.html (modified) (1 diff)
• universe/kauri-template/src/main/java/org/kauriproject/template/VariableBlock.java (modified) (4 diffs)
• universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src.xml (modified) (1 diff)
• universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src_result.xml (modified) (1 diff)

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html

@@ -6 +6 @@
 
   <link rel="Stylesheet" media="screen" href="../../../../../kauri-jquery/src/test/qunit/testsuite.css" />
-  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.3.2/jquery-1.3.2.js"></script>
+  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.4.1/jquery-1.4.1.js"></script>
   <script type="text/javascript" src="../../../../../kauri-jquery/src/test/qunit/testrunner.js"></script>
 

trunk/modules/kauri-jquery/src/test/kauri.util/testPage.html

@@ -5 +5 @@
   <title>Kauri JQuery Main Test Page</title>
   <link rel="Stylesheet" media="screen" href="../qunit/testsuite.css" />
-  <script type="text/javascript" src="../../main/kauri/static/jquery/jquery-1.3.2/jquery-1.3.2.js"></script>
+  <script type="text/javascript" src="../../main/kauri/static/jquery/jquery-1.4.1/jquery-1.4.1.js"></script>
   <script type="text/javascript" src="../qunit/testrunner.js"></script>
       

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/VariableBlock.java

@@ -59 +59 @@
     }
 
+    private static final Object NO_VALUE = new Object();
+
     class StartStep extends Step {
 
@@ -101 +103 @@
         }
 
+        
         @Override
         public Step executeAndProceed(ExecutionContext context, TemplateResult result) throws SAXException {
             TemplateContext tmplContext = context.getTemplateContext();
             if (overwrite || !tmplContext.containsKey(name)) {
+                Object value = NO_VALUE;
                 if (valueExpression != null) {
-                    final Object value = valueExpression.evaluate(context.getTemplateContext());
-                    tmplContext.put(name, value);
-                } else if (srcExpression != null) {
-                    Object data = loadFromSrc(context);
-                    tmplContext.put(name, data);
+                    value = valueExpression.evaluate(context.getTemplateContext());
                 } else {
                     // use element body as value
@@ -123 +123 @@
                     buffer.endDocument();
                     buffer.flush();
-                    String value;
                     try {
                         bos.flush();
-                        value = bos.toString("UTF-8");
+                        final String content = bos.toString("UTF-8");
+                        if (content != null && content.length() > 0)
+                            value = content; 
                     } catch (IOException ex) {
                         throw new TemplateException("Error building variable value.", ex);
                     }
-
-                    tmplContext.put(name, value);
-                }
-            }
+                }
+
+                // value retrieved from @value or body can be overwritten by loaded data from @src
+                if (srcExpression != null) {
+                    value = loadFromSrc(context, value);
+                }
+
+                tmplContext.put(name, value);
+            }
+
             return endStep.getCompiledNext();
         }
 
-        private Object loadFromSrc(ExecutionContext context) {
+        private Object loadFromSrc(ExecutionContext context, Object fallbackValue) {
             String src = (String)srcExpression.evaluate(context.getTemplateContext());
             String accept = acceptExpression != null ? (String)acceptExpression.evaluate(context.getTemplateContext()) : null;
@@ -152 +159 @@
                 }
             } catch (Throwable e) {
+                if (fallbackValue != NO_VALUE)
+                    return fallbackValue;
+                // else
                 throw new TemplateException("Some error occured while loading data for variable " + name + " from URI " + src, e);
             } finally {

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root xmlns:ktl="http://kauriproject.org/template">
-  <ktl:variable name="data" src="data.json"/>
+  <ktl:variable name="data" src="data.json" value="ignore"/>
+  <ktl:variable name="data2" src="nodata.json" value="${data}"/>
   <ktl:variable name="overwriteTest1" value="local"/>
   <ktl:variable name="overwriteTest2" value="local" overwrite="false"/>
 
-  ${data.message},${overwriteTest1},${overwriteTest2}
+  ${data.message},${data2.message},${overwriteTest1},${overwriteTest2}
 </root>

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src_result.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root xmlns:ktl="http://kauriproject.org/template">
-  Hello world!,local,overwriteTest2 - external value
+  Hello world!,Hello world!,local,overwriteTest2 - external value
 </root>