[Gmod-apollo-cmts] SF.net SVN: gmod:[22647] apollo/trunk/src/java/apollo/dataadapter/chado/ jdbc/JdbcChadoAdapter.java

[<gk...@us...>]

Revision: 22647
          http://gmod.svn.sourceforge.net/gmod/?rev=22647&view=rev
Author:   gk_fan
Date:     2010-02-01 21:24:41 +0000 (Mon, 01 Feb 2010)

Log Message:
-----------
Fixed issue where when analysis table is cached, if no configured one level result type is found in the analysis, it would fetch all results in the given range (since the where clause was not set for explicit filtering)

Modified Paths:
--------------
    apollo/trunk/src/java/apollo/dataadapter/chado/jdbc/JdbcChadoAdapter.java

Modified: apollo/trunk/src/java/apollo/dataadapter/chado/jdbc/JdbcChadoAdapter.java
===================================================================
--- apollo/trunk/src/java/apollo/dataadapter/chado/jdbc/JdbcChadoAdapter.java	2010-02-01 20:58:50 UTC (rev 22646)
+++ apollo/trunk/src/java/apollo/dataadapter/chado/jdbc/JdbcChadoAdapter.java	2010-02-01 21:24:41 UTC (rev 22647)
@@ -2937,8 +2937,13 @@
       where.add("af.analysis_id", "a.analysis_id");
     }
 
-    try {    
-      where.add(getChadoProgramWhereClause(programs, "af", analysisAlias));
+    try {
+      String chadoProgramWhereClause = getChadoProgramWhereClause(programs, "af", analysisAlias);
+      // no analysis found for configured programs
+      if (chadoProgramWhereClause.length() == 0) {
+        return;
+      }
+      where.add(chadoProgramWhereClause);
     }
     catch (AnalysisException e) {
       logger.error("unable to retrieve one-level results: " + e.getMessage());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.