mirror of
https://github.com/internetarchive/heritrix3.git
synced 2026-08-25 16:06:33 +00:00
Merge pull request #52 from nlevitt/expression-deciderule
Implicitly add the ${} around groovyExpression. When cxml contains ${}, ...
This commit is contained in:
@@ -31,7 +31,7 @@ import org.archive.modules.CrawlURI;
|
||||
/**
|
||||
* Example usage:
|
||||
* <pre> <bean class="org.archive.modules.deciderules.ExpressionDecideRule">
|
||||
* <property name="groovyExpression" value='${curi.via == null && curi ==~ "^https?://(?:www\\.)?(facebook|vimeo|flickr)\\.com/.*"}'/>
|
||||
* <property name="groovyExpression" value='curi.via == null &amp;&amp; curi ==~ "^https?://(?:www\\.)?(facebook|vimeo|flickr)\\.com/.*"'/>
|
||||
* </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);
|
||||
|
||||
Reference in New Issue
Block a user