1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/PropertiesVariableResolver.java	Thu Sep 04 16:56:47 2014 +0200
     1.3 @@ -0,0 +1,41 @@
     1.4 +/**
     1.5 + * Alt2XML
     1.6 + * Copyright © 2014 František Kučera (frantovo.cz)
     1.7 + *
     1.8 + * This program is free software: you can redistribute it and/or modify
     1.9 + * it under the terms of the GNU General Public License as published by
    1.10 + * the Free Software Foundation, either version 3 of the License, or
    1.11 + * (at your option) any later version.
    1.12 + *
    1.13 + * This program is distributed in the hope that it will be useful,
    1.14 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.15 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    1.16 + * GNU General Public License for more details.
    1.17 + *
    1.18 + * You should have received a copy of the GNU General Public License
    1.19 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    1.20 + */
    1.21 +package cz.frantovo.alt2xml.out.xpath;
    1.22 +
    1.23 +import java.util.Properties;
    1.24 +import javax.xml.namespace.QName;
    1.25 +import javax.xml.xpath.XPathVariableResolver;
    1.26 +
    1.27 +/**
    1.28 + *
    1.29 + * @author Ing. František Kučera (frantovo.cz)
    1.30 + */
    1.31 +public class PropertiesVariableResolver implements XPathVariableResolver {
    1.32 +
    1.33 +	private Properties data;
    1.34 +
    1.35 +	public PropertiesVariableResolver(Properties data) {
    1.36 +		this.data = data;
    1.37 +	}
    1.38 +
    1.39 +	@Override
    1.40 +	public Object resolveVariable(QName variableName) {
    1.41 +		return data.getProperty(variableName.getLocalPart());
    1.42 +	}
    1.43 +
    1.44 +}

     2.1 --- a/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Thu Sep 04 16:28:49 2014 +0200
     2.2 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Thu Sep 04 16:56:47 2014 +0200
     2.3 @@ -35,33 +35,39 @@
     2.4  
     2.5  	private final XPathFactory xpathFactory;
     2.6  	private final XPath xpath;
     2.7 +	private final String expressionString;
     2.8 +	private final XPathExpression xpathExpression;
     2.9  
    2.10 -	public XPathAction(ActionContext actionContext) {
    2.11 +	public XPathAction(ActionContext actionContext) throws OutputActionException {
    2.12  		super(actionContext);
    2.13  		xpathFactory = XPathFactory.newInstance();
    2.14  		xpath = xpathFactory.newXPath();
    2.15 -	}
    2.16  
    2.17 -	@Override
    2.18 -	public void run(DOMResult domResult) throws OutputActionException {
    2.19 +		if (!actionContext.getActionProperties().isEmpty()) {
    2.20 +			xpath.setXPathVariableResolver(new PropertiesVariableResolver(actionContext.getActionProperties()));
    2.21 +		}
    2.22  
    2.23  		if (getActionContext().getActionData().size() == 1) {
    2.24 -			String expressionString = getActionContext().getActionData().get(0);
    2.25 -
    2.26 +			expressionString = getActionContext().getActionData().get(0);
    2.27  			try {
    2.28 -				XPathExpression xpe = xpath.compile(expressionString);
    2.29 -
    2.30 -				String result = xpe.evaluate(domResult.getNode());
    2.31 -
    2.32 -				try (PrintWriter out = new PrintWriter(getActionContext().getOutputStream())) {
    2.33 -					out.println(result);
    2.34 -				}
    2.35 -
    2.36 +				xpathExpression = xpath.compile(expressionString);
    2.37  			} catch (XPathExpressionException e) {
    2.38 -				throw new OutputActionException("Unable to compile or evaluate XPath: " + expressionString, e);
    2.39 +				throw new OutputActionException("Unable to compile XPath: " + expressionString, e);
    2.40  			}
    2.41  		} else {
    2.42  			throw new OutputActionException("Please specify the XPath expression as action data");
    2.43  		}
    2.44  	}
    2.45 +
    2.46 +	@Override
    2.47 +	public void run(DOMResult domResult) throws OutputActionException {
    2.48 +		try {
    2.49 +			String result = xpathExpression.evaluate(domResult.getNode());
    2.50 +			try (PrintWriter out = new PrintWriter(getActionContext().getOutputStream())) {
    2.51 +				out.println(result);
    2.52 +			}
    2.53 +		} catch (XPathExpressionException e) {
    2.54 +			throw new OutputActionException("Unable to evaluate XPath: " + xpathExpression, e);
    2.55 +		}
    2.56 +	}
    2.57  }