Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java @ 3310:8af1111af180
SQ relation: More fixes.
flys-artifacts/trunk@4999 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 13 Jul 2012 15:41:56 +0000 |
parents | 5ccd51ca11ce |
children | 816ceb0418b9 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Fri Jul 13 15:04:36 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Fri Jul 13 15:41:56 2012 +0000 @@ -45,18 +45,18 @@ "m.TSCHWEB AS TSCHWEB," + "m.CSCHWEB AS CSCHWEB," + "m.Q AS Q," + - "%GSIEBSATZ%" + - "%SSIEBUNG%" + + "%GSIEBSATZ%," + + "%SSIEBUNG% " + "FROM messung m " + "JOIN station s ON m.stationid = s.stationid " + "JOIN gewaesser g ON s.gewaesserid = g.gewaesserid " + - "LEFT JOIN GSIEBSATZ gs ON m.gsiebsatzid = gs.gewaesserid " + - "LEFT JOIN SSIEBUNG ss ON gs.gsiebsatzid = ss.gewaesserid " + - "WHERE " + - "g.name = :river_name AND " + - "s.km BETWEEN :location - 0.001 AND :location + 0.001 AND " + - "m.datum BETWEEN :from AND :to AND " + - "m.Q IS NOT NULL") + "LEFT JOIN GSIEBSATZ gs ON m.gsiebsatzid = gs.gsiebsatzid " + + "LEFT JOIN SSIEBUNG ss ON gs.gsiebsatzid = ss.gsiebsatzid " + + "WHERE " + + "g.name = :river_name AND " + + "s.km BETWEEN :location - 0.001 AND :location + 0.001 AND " + + "m.datum BETWEEN :from AND :to AND " + + "m.Q IS NOT NULL") .replace("%GSIEBSATZ%", projection("gs", GSIEBSATZ)) .replace("%SSIEBUNG%", projection("ss", SSIEBUNG)); @@ -65,13 +65,15 @@ String [] columnNames ) { StringBuilder sb = new StringBuilder(); - for (String columnName: columnNames) { + for (int i = 0; i < columnNames.length; ++i) { + if (i > 0) { + sb.append(','); + } sb.append(prefix) .append('.') - .append(columnName) + .append(columnNames[i]) .append(" AS ") - .append(columnName) - .append(','); + .append(columnNames[i]); } return sb.toString(); }