|
From: Allen D. <all...@us...> - 2005-10-18 05:10:45
|
Update of /cvsroot/gmod/schema/chado/modules/sequence In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32154 Modified Files: frange.plpgsql Log Message: need to bring in entire group if group member matches Index: frange.plpgsql =================================================================== RCS file: /cvsroot/gmod/schema/chado/modules/sequence/frange.plpgsql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frange.plpgsql 3 Oct 2005 13:27:42 -0000 1.1 --- frange.plpgsql 18 Oct 2005 05:10:35 -0000 1.2 *************** *** 82,91 **** FOR f IN SELECT * ! FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) LOOP RETURN NEXT f; --- 82,93 ---- FOR f IN SELECT * ! FROM featuregroup WHERE group_id IN ( ! SELECT group_id FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) ! ) LOOP RETURN NEXT f; *************** *** 110,121 **** FOR f IN SELECT * ! FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin <= mins[i] ! AND fmax >= maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) LOOP RETURN NEXT f; --- 112,125 ---- FOR f IN SELECT * ! FROM featuregroup WHERE group_id IN ( ! SELECT group_id FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin <= mins[i] ! AND fmax >= maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) ! ) LOOP RETURN NEXT f; *************** *** 140,151 **** FOR f IN SELECT * ! FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin >= mins[i] ! AND fmax <= maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) LOOP RETURN NEXT f; --- 144,157 ---- FOR f IN SELECT * ! FROM featuregroup WHERE group_id IN ( ! SELECT group_id FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin >= mins[i] ! AND fmax <= maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) ! ) LOOP RETURN NEXT f; *************** *** 170,181 **** FOR f IN SELECT * ! FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin = mins[i] ! AND fmax = maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) LOOP RETURN NEXT f; --- 176,189 ---- FOR f IN SELECT * ! FROM featuregroup WHERE group_id IN ( ! SELECT group_id FROM featuregroup ! WHERE (srcfeature_id = s OR srcfeature_id IS NULL) ! AND fmin = mins[i] ! AND fmax = maxs[i] ! AND group_id IN ( ! SELECT group_id FROM groupoverlaps( mins[i], maxs[i] ) ! WHERE srcfeature_id = s ! ) ! ) LOOP RETURN NEXT f; |