From 863ff901575b620facf275fdda9c9c1e738d73e2 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Mon, 17 Mar 2014 18:11:47 -0700
Subject: [PATCH] Implicitly add the ${} around groovyExpression. When cxml
 contains ${}, it fights with spring's PropertyPlaceholderConfigurer (if
 enabled); and since what we're interested in is an expression, not a template
 for producing a string, it's more appropriate to leave it out anyway.

---
 .../org/archive/modules/deciderules/ExpressionDecideRule.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main/java/org/archive/modules/deciderules/ExpressionDecideRule.java b/contrib/src/main/java/org/archive/modules/deciderules/ExpressionDecideRule.java
index f06332c7..cee7471e 100644
--- a/contrib/src/main/java/org/archive/modules/deciderules/ExpressionDecideRule.java
+++ b/contrib/src/main/java/org/archive/modules/deciderules/ExpressionDecideRule.java
@@ -31,7 +31,7 @@ import org.archive.modules.CrawlURI;
 /**
  * Example usage:
  * <pre> &lt;bean class="org.archive.modules.deciderules.ExpressionDecideRule">
- *     &lt;property name="groovyExpression" value='${curi.via == null &amp;&amp; curi ==~ "^https?://(?:www\\.)?(facebook|vimeo|flickr)\\.com/.*"}'/>
+ *     &lt;property name="groovyExpression" value='curi.via == null &amp;amp;&amp;amp; curi ==~ "^https?://(?:www\\.)?(facebook|vimeo|flickr)\\.com/.*"'/>
  * &lt/bean></pre>
  *
  * @contributor nlevitt
@@ -58,7 +58,7 @@ public class ExpressionDecideRule extends PredicatedDecideRule {
 
         if (groovyTemplate == null) {
             try {
-                groovyTemplate = new SimpleTemplateEngine().createTemplate(getGroovyExpression());
+                groovyTemplate = new SimpleTemplateEngine().createTemplate("${" + getGroovyExpression() + "}");
                 groovyTemplates.put(getGroovyExpression(), groovyTemplate);
             } catch (Exception e) {
                 logger.log(Level.SEVERE, "problem with groovy expression " + getGroovyExpression(), e);