Changeset 14137

Timestamp:

03/15/12 18:37:21 (12 years ago)

Author:

ramonb

Message:

cmt.py:

• removed compatibility check

sara_cmt/cluster/templatetags/cmts_extras.py:

• added compatibility check
• see #4

this should do the trick

Location:

trunk/sara_cmt

Files:

• cmt.py (modified) (1 diff)
• sara_cmt/cluster/templatetags/cmts_extras.py (modified) (1 diff)

trunk/sara_cmt/cmt.py

@@ -311 +311 @@
         logger.error('Template does not exist: %s' % e)
 
-        
-    context['__template_outputfiles__'][context['output']]=rendered_string # temporary to be fwd-compatible
-
     for outputfile, content in context['__template_outputfiles__'].items():
         write_msg = 'Writing outputfile: %s' % outputfile

trunk/sara_cmt/sara_cmt/cluster/templatetags/cmts_extras.py

@@ -166 +166 @@
                {% store variable %} # variable = '/path/to/file'
     """
-    try:
-        # RB: split_contents respects quoted 'strings containing spaces'
-        tag, path_str = token.split_contents()
-    except ValueError:
-        raise template.TemplateSyntaxError, '%r tag requires at least 1 argument' % tag
+    definition = token.split_contents()
+
+    if len(definition) != 4 and len(definition) != 2:
+        raise template.TemplateSyntaxError, '%r tag requires at least 1 arguments' % tag
+
+    tag = definition[0]
+    path_arg = definition[1]
+    #kw_as = definition[2]
+    #kw_output = definition[3]
+
+    if len(definition) == 4:
+
+        #RB: 4 arguments means: {% store /path/filename as output %}
+        #RB: old style: DONT try to resolve variable
+        #RB: instead convert filename to quoted string
+
+        path_str = "'%s'" %path_arg
+
+    else:
+
+        #RB: 2 arguments can mean: {% store 'string' %}
+        #RB: 2 arguments can mean: {% store variable %}
+
+        path_str = path_arg
 
     # RB: parse the template thing until %endstore found