Browse Source

Continuing to fix feature aggreation SQL

spficklin 12 years ago
parent
commit
d8f85709a8
1 changed files with 2 additions and 14 deletions
  1. 2 14
      tripal_feature/api/tripal_feature.api.inc

+ 2 - 14
tripal_feature/api/tripal_feature.api.inc

@@ -643,20 +643,8 @@ function trpial_feature_get_formatted_sequence($feature_id, $feature_name,
                        WHEN FL.fmin - $2 <= 0 THEN FL.fmin
                        ELSE $2
                     END                   
-                END as downstream,            
-                              
-                CASE 
-                  WHEN FL.strand >= 0 THEN 
-                    CASE 
-                       WHEN FL.fmin - $1 <= 0 THEN substring(OF.residues from 1 for ((FL.fmax - FL.fmin) + FL.fmin)) 
-                       ELSE substring(OF.residues from (FL.fmin - $1 + 1) for ((FL.fmax - FL.fmin) + $1 + $2))
-                    END
-                  WHEN FL.strand < 0 THEN
-                    CASE 
-                      WHEN FL.fmin - $2 <= 0 THEN substring(OF.residues from 1 for ((FL.fmax - FL.fmin) + FL.fmin)) 
-                      ELSE substring(OF.residues from (FL.fmin - $2 + 1) for ((FL.fmax - FL.fmin) + $1 + $2))      
-                    END
-                END as residues
+                END as downstream,                                          
+                substring(OF.residues from (adjfmin + 1) for (upstream + (FL.fmax - FL.fmin) + downstream)  as residues
               FROM featureloc FL 
                 INNER JOIN feature SF on FL.feature_id = SF.feature_id
                 INNER JOIN cvterm SCVT on SF.type_id = SCVT.cvterm_id