Mercurial > dive4elements > river
changeset 969:2c8fc60125b9
Meta data template: Allow '-' in variable names.
flys-artifacts/trunk@2393 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 22 Jul 2011 09:10:31 +0000 |
| parents | 0fd335b4b21b |
| children | e456aca4eb7b |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Jul 21 15:13:07 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Jul 22 09:10:31 2011 +0000 @@ -1,3 +1,8 @@ +2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: + Allow '-' in variable names. + 2011-07-21 Ingo Weinzierl <ingo@intevation.de> * doc/conf/meta-data-template.xml: Now, the river-id is really added to
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Thu Jul 21 15:13:07 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Fri Jul 22 09:10:31 2011 +0000 @@ -33,8 +33,12 @@ { private static Logger log = Logger.getLogger(MetaDataService.class); + // old service. To be removed public static final String XPATH_RIVER = "/art:river/text()"; + public static final String XPATH_OUT = "/art:out/@value"; + public static final String XPATH_UUID = "/art:uuid/@value"; + public MetaDataService() { }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java Thu Jul 21 15:13:07 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java Fri Jul 22 09:10:31 2011 +0000 @@ -15,7 +15,8 @@ public class CompiledStatement { - public static final Pattern VAR = Pattern.compile("\\$\\{([a-zA-Z0-9_]+)\\}"); + public static final Pattern VAR = + Pattern.compile("\\$\\{([a-zA-Z0-9_-]+)\\}"); protected String original; protected String statement;