# HG changeset patch # User Felix Wolfsteller # Date 1321012781 0 # Node ID d7369f395a80cc78a9874de72c5a8bd784a25424 # Parent 84cf67a2a19e49f05093f480b4b6de2f9565a646 Somewhat unified user-part of dc config. flys-artifacts/trunk@3238 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 84cf67a2a19e -r d7369f395a80 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Fri Nov 11 11:28:15 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Nov 11 11:59:41 2011 +0000 @@ -1,3 +1,7 @@ +2011-11-11 Felix Wolfsteller + + * doc/conf/meta-data.xml: Somewhat unify user-part of dc config. + 2011-11-11 Ingo Weinzierl * doc/conf/themes.xml: Modified some floodmap styles and added a diff -r 84cf67a2a19e -r d7369f395a80 flys-artifacts/doc/conf/meta-data.xml --- a/flys-artifacts/doc/conf/meta-data.xml Fri Nov 11 11:28:15 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Nov 11 11:59:41 2011 +0000 @@ -587,141 +587,158 @@ ------------------ - - Show diffferences if longitudinal sections are there. - ----------------------------------------------------- - - - - - + + + + + Get the user and collection-id. + - SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description - FROM outs as o, facets as f, artifacts as a - WHERE f.name = 'w_differences' and f.out_id = o.id and o.artifact_id = a.id; + SELECT u.id AS user_id, c.id AS collection_id, c.name as collection_name + FROM collections c JOIN users u ON c.user_id = u.id + WHERE u.gid = CAST(${user-id} AS uuid) + ORDER BY c.creation DESC - - - - - - - - - - - - - - - - SELECT u.id AS user_id, c.id AS collection_id, c.name as collection_name - FROM collections c JOIN users u ON c.user_id = u.id - WHERE u.gid = CAST(${user-id} AS uuid) - ORDER BY c.creation DESC - - - - - SELECT m.id AS a_id, m.state AS a_state, m.gid AS a_gid, m.creation AS a_creation - FROM master_artifacts m - WHERE m.collection_id = ${collection_id} AND m.gid <> CAST(${artifact-id} AS uuid) - AND EXISTS ( - SELECT id FROM artifact_data ad WHERE ad.artifact_id = m.id AND k = 'river' AND v = ${river}) - - - - - - Import longitudinal sections only if the ${artifact-out} is defined as 'longitudinal_section' - --------------------------------------------------------------------------------------------- - - - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' - - - - - SELECT name AS facet_name, num as facet_num, description AS facet_description - FROM facets - WHERE out_id = ${out_id} - ORDER BY num ASC, name DESC - - - - - - - - - - - - - - - - - - - Import of longitudinal sections finished - - + + SHOW W-DIFFERENCES + - - Import Waterlevels only if the ${artifact-out} is defined as 'waterlevels' - -------------------------------------------------------------------------- - - - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' - - - - - SELECT name AS facet_name, num as facet_num, description AS facet_description - FROM facets - WHERE out_id = ${out_id} and name = 'longitudinal_section.w' - ORDER BY num ASC, name DESC - - - - - - - - - - - - - - - - - - - Import of waterlevels finished - + + + + + + SELECT m.id AS a_id, m.state AS a_state, m.gid AS a_gid, m.creation AS a_creation + FROM master_artifacts m + WHERE m.collection_id = ${collection_id} AND m.gid <> CAST(${artifact-id} AS uuid) + AND EXISTS ( + SELECT id FROM artifact_data ad WHERE ad.artifact_id = m.id AND k = 'river' AND v = ${river}) + + + + + SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description + FROM outs as o, facets as f, artifacts as a + WHERE f.name = 'w_differences' and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} + + + + + + + + + + + + + + + + - - - - - + + + + + + SELECT m.id AS a_id, m.state AS a_state, m.gid AS a_gid, m.creation AS a_creation + FROM master_artifacts m + WHERE m.collection_id = ${collection_id} AND m.gid <> CAST(${artifact-id} AS uuid) + AND EXISTS ( + SELECT id FROM artifact_data ad WHERE ad.artifact_id = m.id AND k = 'river' AND v = ${river}) + + + + + SELECT id AS out_id + FROM outs + WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' + + + + + SELECT name AS facet_name, num as facet_num, description AS facet_description + FROM facets + WHERE out_id = ${out_id} + ORDER BY num ASC, name DESC + + + + + + + + + + + + + + + + + + + + + + + + WATERLEVELS - ONLY SHOW Ws + + + + + + + + SELECT m.id AS a_id, m.state AS a_state, m.gid AS a_gid, m.creation AS a_creation + FROM master_artifacts m + WHERE m.collection_id = ${collection_id} AND m.gid <> CAST(${artifact-id} AS uuid) + AND EXISTS ( + SELECT id FROM artifact_data ad WHERE ad.artifact_id = m.id AND k = 'river' AND v = ${river}) + + + + + + SELECT id AS out_id + FROM outs + WHERE artifact_id = ${a_id} AND name = 'longitudinal_section' + + + + + SELECT name AS facet_name, num as facet_num, description AS facet_description + FROM facets + WHERE out_id = ${out_id} and name = 'longitudinal_section.w' + ORDER BY num ASC, name DESC + + + + + + + + + + + + + + + + + + + + + + +