[Mpuls-commits] r5326 - jmd/trunk/jmdstrukturweb/public/xml
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 14 08:54:20 CEST 2011
Author: roland
Date: 2011-09-14 08:54:18 +0200 (Wed, 14 Sep 2011)
New Revision: 5326
Modified:
jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
Add an additional check, so negative number are not counted.
This needed to ignore "unknown" values, that are converted to -999999 and
falsify the result.
Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml 2011-09-13 18:39:23 UTC (rev 5325)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml 2011-09-14 06:54:18 UTC (rev 5326)
@@ -119,7 +119,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_stellenteile, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_stellenteile))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_stellenteile > 0
+ THEN anzahl_ha_stellenteile
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -146,7 +151,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_personen, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_personen))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_personen > 0
+ THEN anzahl_ha_personen
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -173,7 +183,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_maennlich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_maennlich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_maennlich > 0
+ THEN anzahl_ha_maennlich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -200,7 +215,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_weiblich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_weiblich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_weiblich > 0
+ THEN anzahl_ha_weiblich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -227,7 +247,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_migration, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_migration))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_migration > 0
+ THEN anzahl_ha_migration
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -254,7 +279,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_nha_personen, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_nha_personen))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_nha_personen > 0
+ THEN anzahl_nha_personen
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -281,7 +311,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_nha_stellenteile, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_nha_stellenteile))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_nha_stellenteile > 0
+ THEN anzahl_nha_stellenteile
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -308,7 +343,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_nha_maennlich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_nha_maennlich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_nha_maennlich > 0
+ THEN anzahl_nha_maennlich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -335,7 +375,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_nha_weiblich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_nha_weiblich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_nha_weiblich > 0
+ THEN anzahl_nha_weiblich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -362,7 +407,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_nha_migration, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_nha_migration))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_nha_migration > 0
+ THEN anzahl_nha_migration
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -389,7 +439,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ea_personen, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ea_personen))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ea_personen > 0
+ THEN anzahl_ea_personen
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -416,7 +471,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ea_maennlich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ea_maennlich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ea_maennlich > 0
+ THEN anzahl_ea_maennlich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -443,7 +503,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ea_weiblich, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ea_weiblich))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ea_weiblich > 0
+ THEN anzahl_ea_weiblich
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -470,7 +535,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ea_migration, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ea_migration))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ea_migration > 0
+ THEN anzahl_ea_migration
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -497,7 +567,24 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, anzahl_ha_personen, anzahl_nha_personen, anzahl_ea_personen, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(anzahl_ha_personen) + SUM(anzahl_nha_personen) + SUM(anzahl_ea_personen))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN anzahl_ha_personen > 0
+ THEN anzahl_ha_personen
+ ELSE 0
+ END
+ ) +
+ SUM(
+ CASE WHEN anzahl_nha_personen > 0
+ THEN anzahl_nha_personen
+ ELSE 0
+ END
+ ) +
+ SUM(
+ CASE WHEN anzahl_ea_personen > 0
+ THEN anzahl_ea_personen
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -849,7 +936,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, bildungsberatung_beratungsfaelle, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(bildungsberatung_beratungsfaelle))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN bildungsberatung_beratungsfaelle > 0
+ THEN bildungsberatung_beratungsfaelle
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -877,7 +969,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, elternberatung_anzahl, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(elternberatung_anzahl))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN elternberatung_anzahl > 0
+ THEN elternberatung_anzahl
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -905,7 +1002,12 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, elternberatung_stunden, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(elternberatung_stunden))</aggregate>
+ <aggregate>(SUM(
+ CASE WHEN elternberatung_stunden > 0
+ THEN elternberatung_stunden
+ ELSE 0
+ END
+ ))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
More information about the Mpuls-commits
mailing list