Datacage: Added <dc:filter> element. This allows cleaner way to narrow the datasets. Example: <dc:context> <dc:statement> SELECT DISTINCT name AS hws_name, official AS hws_official, kind_id AS hws_kind FROM hws_lines WHERE river_id = ${river_id} </dc:statement> <dc:if test="dc:has-result()"> <lines> <dc:macro name="hws-lines"> <dc:elements> <hws factory="hwsfactory" name="{$hws_name}"/> </dc:elements> </dc:macro> <dc:filter expr="$hws_official=1"> <dc:if test="dc:has-result()"> <official> <dc:filter expr="$hws_kind=1"> <dc:if test="dc:has-result()"> <Durchlass><dc:call-macro name="hws-lines"></Durchlass> </dc:if> </dc:filter> <dc:filter expr="$hws_kind=2"> <dc:if test="dc:has-result()"> <Damm><dc:call-macro name="hws-lines"></Damm> </dc:if> </dc:filter> <dc:filter expr="$hws_kind=3"> <dc:if test="dc:has-result()"> <Graben><dc:call-macro name="hws-lines"></Graben> </dc:if> </dc:filter> </official> </dc:if> </dc:filter> </lines> </dc:if> </dc:context>

BEGIN;

DROP TABLE river_axes;
DROP SEQUENCE RIVER_AXES_ID_SEQ;

DROP TABLE river_axes_km;
DROP SEQUENCE RIVER_AXES_KM_ID_SEQ;

DROP TABLE cross_section_tracks;
DROP SEQUENCE CROSS_SECTION_TRACKS_ID_SEQ;

DROP TABLE buildings;
DROP SEQUENCE BUILDINGS_ID_SEQ;

DROP TABLE fixpoints;
DROP SEQUENCE FIXPOINTS_ID_SEQ;

DROP TABLE floodplain;
DROP SEQUENCE FLOODPLAIN_ID_SEQ;

DROP TABLE dem;
DROP SEQUENCE DEM_ID_SEQ;

DROP TABLE hws_points;
DROP SEQUENCE HWS_POINTS_ID_SEQ;

DROP TABLE hws_lines;
DROP SEQUENCE HWS_LINES_ID_SEQ;

DROP TABLE floodmaps;
DROP SEQUENCE FLOODMAPS_ID_SEQ;

DROP TABLE hydr_boundaries;
DROP SEQUENCE HYDR_BOUNDARIES_ID_SEQ;

DROP TABLE hydr_boundaries_poly;
DROP SEQUENCE HYDR_BOUNDARIES_POLY_ID_SEQ;

DROP TABLE gauge_location;
DROP SEQUENCE GAUGE_LOCATION_ID_SEQ;

DROP TABLE fed_states;
DROP TABLE hws_kinds;
DROP TABLE sobek_kinds;
DROP TABLE sectie_kinds;
DROP TABLE boundary_kinds;
DROP TABLE axis_kinds;
DROP TABLE building_kinds;

COMMIT;