Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/DischargeInfoDataSource.java @ 6837:9da2298ae380
(issue1353) Add river name to query for discharge Info
The previous assumption was that the official number is unique
for a gauge. This assumption is broken by having multiple variants
of a river in the database, like Donau (schleusenkanäle)
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Thu, 15 Aug 2013 15:57:13 +0200 |
| parents | ea9eef426962 |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 6836:caf027fe0715 | 6837:9da2298ae380 |
|---|---|
| 18 public class DischargeInfoDataSource extends DataSource { | 18 public class DischargeInfoDataSource extends DataSource { |
| 19 | 19 |
| 20 public static final String XPATH_DISCHARGE_DEFAULT = "/discharges/discharge"; | 20 public static final String XPATH_DISCHARGE_DEFAULT = "/discharges/discharge"; |
| 21 | 21 |
| 22 | 22 |
| 23 public DischargeInfoDataSource(String url, long gauge) { | 23 public DischargeInfoDataSource(String url, long gauge, String river) { |
| 24 setDataFormat(DSDataFormat.XML); | 24 setDataFormat(DSDataFormat.XML); |
| 25 setRecordXPath(XPATH_DISCHARGE_DEFAULT); | 25 setRecordXPath(XPATH_DISCHARGE_DEFAULT); |
| 26 | 26 |
| 27 DataSourceField desc = new DataSourceField( | 27 DataSourceField desc = new DataSourceField( |
| 28 "description", FieldType.TEXT, "description"); | 28 "description", FieldType.TEXT, "description"); |
| 35 | 35 |
| 36 DataSourceField end = new DataSourceField( | 36 DataSourceField end = new DataSourceField( |
| 37 "end", FieldType.TEXT, "end"); | 37 "end", FieldType.TEXT, "end"); |
| 38 | 38 |
| 39 setFields(desc, bfgid, start, end); | 39 setFields(desc, bfgid, start, end); |
| 40 setDataURL(getServiceURL(url, gauge)); | 40 setDataURL(getServiceURL(url, gauge, river)); |
| 41 } | 41 } |
| 42 | 42 |
| 43 | 43 |
| 44 protected String getServiceURL(String server, long gauge) { | 44 protected String getServiceURL(String server, long gauge, String river) { |
| 45 String url = GWT.getModuleBaseURL(); | 45 String url = GWT.getModuleBaseURL(); |
| 46 url += "dischargeinfoxml"; | 46 url += "dischargeinfoxml"; |
| 47 url += "?server=" + server; | 47 url += "?server=" + server; |
| 48 url += "&gauge=" + String.valueOf(gauge); | 48 url += "&gauge=" + String.valueOf(gauge); |
| 49 url += "&river=" + river; | |
| 49 | 50 |
| 50 return url; | 51 return url; |
| 51 } | 52 } |
| 52 } | 53 } |
| 53 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 54 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |