comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java @ 421:24b53f9aa9dc

MetaDataService: Make incoming XML symmetric to DistanceInfoService. flys-artifacts/trunk@1896 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 11 May 2011 09:51:54 +0000
parents 7c018f466d6d
children db8d93cb65fd
comparison
equal deleted inserted replaced
420:a0afdda4d4b9 421:24b53f9aa9dc
18 18
19 import de.intevation.artifactdatabase.DefaultService; 19 import de.intevation.artifactdatabase.DefaultService;
20 20
21 import de.intevation.artifacts.common.utils.XMLUtils; 21 import de.intevation.artifacts.common.utils.XMLUtils;
22 22
23 import de.intevation.artifacts.common.ArtifactNamespaceContext;
24
23 import de.intevation.flys.artifacts.services.meta.Builder; 25 import de.intevation.flys.artifacts.services.meta.Builder;
24 26
25 import de.intevation.flys.backend.SessionHolder; 27 import de.intevation.flys.backend.SessionHolder;
26 28
27 import org.hibernate.Session; 29 import org.hibernate.Session;
31 public class MetaDataService 33 public class MetaDataService
32 extends DefaultService 34 extends DefaultService
33 { 35 {
34 private static Logger log = Logger.getLogger(MetaDataService.class); 36 private static Logger log = Logger.getLogger(MetaDataService.class);
35 37
36 public static final String XPATH_RIVER = "//river/@name"; 38 public static final String XPATH_RIVER = "/art:river/text()";
37 39
38 public static final String META_DATA_TEMPLATE = "/metadata/template.xml"; 40 public static final String META_DATA_TEMPLATE = "/metadata/template.xml";
39 41
40 protected Builder builder; 42 protected Builder builder;
41 43
43 } 45 }
44 46
45 protected static Map<String, Object> extractParameters(Document data) { 47 protected static Map<String, Object> extractParameters(Document data) {
46 HashMap<String, Object> parameters = new HashMap<String, Object>(); 48 HashMap<String, Object> parameters = new HashMap<String, Object>();
47 49
48 String river = XMLUtils.xpathString(data, XPATH_RIVER, null); 50 String river = XMLUtils.xpathString(
51 data, XPATH_RIVER, ArtifactNamespaceContext.INSTANCE);
49 52
50 if (river == null || (river = river.trim()).length() == 0) { 53 if (river == null || (river = river.trim()).length() == 0) {
51 river = "%"; // matches all rivers 54 river = "%"; // matches all rivers
52 } 55 }
53 56

http://dive4elements.wald.intevation.org