lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-25 07:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Noah Levitt
2014-03-17 18:11:47 -07:00
parent fb039291ef
commit 863ff90157
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/src/main/java/org/archive/modules/deciderules/ExpressionDecideRule.java
+2 -2
View File
@@ -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);