--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java	Wed Jul 20 15:06:16 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java	Wed Jul 20 16:28:49 2011 +0000
@@ -206,21 +206,12 @@
                         continue;
                     }
 
-                    try {
-                        XPath xpath = XPATH_FACTORY.newXPath();
-                        xpath.setXPathVariableResolver(frames);
-                        Object result = xpath.evaluate(
-                            test, EVAL_DOCUMENT, XPathConstants.BOOLEAN);
+                    Boolean result = evaluateXPath(test);
+                    if (result != null && result.booleanValue()) {
+                        branch = child;
+                        break;
+                    }
 
-                        if (result instanceof Boolean
-                        && ((Boolean)result).booleanValue()) {
-                            branch = child;
-                            break;
-                        }
-                    }
-                    catch (XPathExpressionException xfce) {
-                        log.error(xfce);
-                    }
                     continue;
                 }
                 else if ("otherwise".equals(name)) {
@@ -237,6 +228,24 @@
             }
         }
 
+        protected Boolean evaluateXPath(String expr) {
+            try {
+                XPath xpath = XPATH_FACTORY.newXPath();
+                xpath.setXPathVariableResolver(frames);
+                xpath.setXPathFunctionResolver(FunctionResolver.FUNCTIONS);
+                Object result = xpath.evaluate(
+                    expr, EVAL_DOCUMENT, XPathConstants.BOOLEAN);
+
+                return result instanceof Boolean
+                    ? (Boolean)result
+                    : null;
+            }
+            catch (XPathExpressionException xfce) {
+                log.error(xfce);
+            }
+            return null;
+        }
+
         protected void convert(Node parent, Element current) {
 
             String variable = expand(current.getAttribute("var"));