[lnst] XmlPreprocessor: Modify template detection

[Jiří Pírko]

commit 2dfa60872151f2d245d589ef362885fcc77b9032
Author: Radek Pazdera <rpazdera(a)redhat.com&gt;
Date:   Fri Jun 8 12:42:04 2012 +0200

    XmlPreprocessor: Modify template detection
    
    The previous solution considered curly braces to be reserved
    characters, exclusively for marking templates. But according
    to recent development, it will be necessary to deal with
    those characters also in non-template context.
    
    This commit enhances template detection code so it will ignore
    any occurencies of curly braces unless they form a valid template.
    
    Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com&gt;

 Common/XmlPreprocessor.py |   37 ++++++++++++++-----------------------
 1 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/Common/XmlPreprocessor.py b/Common/XmlPreprocessor.py
index b20fec8..be2cab2 100644
--- a/Common/XmlPreprocessor.py
+++ b/Common/XmlPreprocessor.py
@@ -31,9 +31,8 @@ class XmlPreprocessor:
     This class serves as template processor within a XML DOM tree object.
     """
 
-    _template_re = "\{([^\{\}]+)\}"
-    _alias_re = "^\$([a-zA-Z0-9_]+)(\[.+\])*$"
-    _func_re  = "^([a-zA-Z0-9_]+)\(([^\(\)]*)\)$"
+    _alias_re = "\{\$([a-zA-Z0-9_]+)(\[.+\])*\}"
+    _func_re  = "\{([a-zA-Z0-9_]+)\(([^\(\)]*)\)\}"
 
     def __init__(self):
         self._definitions = {}
@@ -97,31 +96,23 @@ class XmlPreprocessor:
 
     def _expand_string(self, string):
         while True:
-            template_match = re.search(self._template_re, string)
-            if template_match:
-                template_string = template_match.group(0)
-                template = template_match.group(1)
-                template_result = self._process_template(template)
+            alias_match = re.search(self._alias_re, string)
+            func_match  = re.search(self._func_re, string)
 
-                string = string.replace(template_string, template_result)
+            result = None
+
+            if alias_match:
+                template = alias_match.group(0)
+                result = self._process_alias_template(template)
+            elif func_match:
+                template = func_match.group(0)
+                result = self._process_func_template(template)
             else:
                 break
 
-        return string
-
-    def _process_template(self, string):
-        string = string.strip()
-        result = None
+            string = string.replace(template, result)
 
-        if re.match(self._alias_re, string):
-            result = self._process_alias_template(string)
-            return result
-
-        if re.match(self._func_re, string):
-            result = self._process_func_template(string)
-            return result
-
-        raise XmlTemplateError("Unknown template type '%s'" % string)
+        return string
 
     def _process_alias_template(self, string):
         result = None