# HG changeset patch # User Andre Heinecke # Date 1369414385 -7200 # Node ID 0f3ca851d204ecff0a8b05068f4d7488806466e1 # Parent 16027599b2a9a6fcfebd33586dd712d251ad2212 First part of the filtering datacage for user data. This joins the outs to the master artifact information and adds km filtering. Next step: Joining the facets and filtering by them. This will also fix the broken select-facet macro diff -r 16027599b2a9 -r 0f3ca851d204 artifacts/doc/conf/meta-data.xml --- a/artifacts/doc/conf/meta-data.xml Fri May 24 17:10:19 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri May 24 18:53:05 2013 +0200 @@ -273,115 +273,117 @@ - - - - - Recommendations (client shall load immediately). - - - - - - - - - - - - Non Recommendations - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Recommendations (user) + + + + + + + + + + + + Non Recommendations (user) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -389,6 +391,7 @@ + SELECT a.gid AS aid, @@ -476,12 +479,7 @@ - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'cross_section' - + @@ -507,17 +505,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} - AND name = 'longitudinal_section' - + @@ -545,17 +537,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} - AND name = 'fix_longitudinal_section_curve' - + @@ -587,17 +573,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} - AND name = 'fix_deltawt_curve' - + @@ -630,16 +610,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'fix_deltawt_curve' - + @@ -667,16 +642,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'fix_derivate_curve' - + @@ -702,16 +672,11 @@ - + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'fix_wq_curve' - + @@ -741,7 +706,7 @@ - + @@ -777,53 +742,41 @@ TODO doesnt work nicely for fix/wq-diags. - - - 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 - - - - - - - - - - - - - - - - - + + + + + + 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 + + + + + + + + + + + + + + + + - - - SELECT id AS out_id - FROM outs - WHERE artifact_id = ${a_id} AND name = 'floodmap' - + SELECT name AS facet_name, - num AS facet_num, - description AS facet_description + num AS facet_num, + description AS facet_description FROM facets WHERE out_id = ${out_id} AND name = 'floodmap.usershape' ORDER BY num ASC, name DESC @@ -841,18 +794,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - o.name='bed_longitudinal_section' - + @@ -860,17 +806,17 @@ SELECT a.gid AS aid, - f.id AS fid, - f.name AS facet_name, - f.num AS facet_num, - f.description AS facet_description + 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 = 'bed_longitudinal_section.bed_diameter_toplayer' - OR f.name = 'bed_longitudinal_section.bed_diameter_sublayer') AND - f.out_id = o.id AND - o.artifact_id = ${a_id} AND - a.id = ${a_id} + (f.name = 'bed_longitudinal_section.bed_diameter_toplayer' + OR f.name = 'bed_longitudinal_section.bed_diameter_sublayer') AND + f.out_id = o.id AND + o.artifact_id = ${a_id} AND + a.id = ${a_id} @@ -886,18 +832,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - o.name='bed_longitudinal_section' - + @@ -930,18 +869,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - o.name='bed_longitudinal_section' - + @@ -975,18 +907,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - o.name='bed_longitudinal_section' - + @@ -1020,17 +945,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} and o.name='flow_velocity' - + @@ -1066,17 +985,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} and o.name='sedimentload_ls' - + @@ -1108,20 +1021,11 @@ - + - - - SELECT id AS oid, - name AS o_name - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - (o.name = 'bed_difference_year' OR - o.name = 'bed_differnece_epoch') - + @@ -1161,18 +1065,11 @@ - + - - - SELECT id AS oid - FROM outs AS o - WHERE - o.artifact_id = ${a_id} AND - o.name = 'discharge_longitudinal_section' - + @@ -1204,7 +1101,7 @@ - + @@ -2653,7 +2550,7 @@ - + Select collections and masterartifacts. @@ -2665,10 +2562,13 @@ COALESCE(ma.ld_mode, '') AS ld_m, COALESCE(ma.ld_locations, '') AS ld_l, COALESCE(ma.ld_from, '') AS ld_f, - COALESCE(ma.ld_to, '') AS ld_t + COALESCE(ma.ld_to, '') AS ld_t, + o.name AS out_name, + o.id AS out_id FROM users u JOIN collections c ON c.user_id = u.id JOIN master_artifacts_range ma ON ma.collection_id = c.id + JOIN outs o ON o.artifact_id = ma.id WHERE u.gid = CAST(${user-id} AS UUID) AND ma.gid <> CAST(${artifact-id} AS uuid) AND EXISTS ( @@ -2678,16 +2578,20 @@ AND k = 'river' AND v = ${river}) - - - - - - - + + + + + + + + + + +