# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1311325831 0
# Node ID 2c8fc60125b9110e95e5d8595cc1b17f9aa5673b
# Parent  0fd335b4b21bf2eee483a21bfcd73f1d353fd6c7
Meta data template:  Allow '-' in variable names.

flys-artifacts/trunk@2393 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 0fd335b4b21b -r 2c8fc60125b9 flys-artifacts/ChangeLog
--- 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
diff -r 0fd335b4b21b -r 2c8fc60125b9 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java
--- 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() {
     }
 
diff -r 0fd335b4b21b -r 2c8fc60125b9 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java
--- 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;