Browse Source

Had to rollback a fix that removed memory leaks, but it casued other problems

Stephen Ficklin 12 years ago
parent
commit
a28f785f25
2 changed files with 7 additions and 6 deletions
  1. 6 6
      tripal_core/api/tripal_core.api.inc
  2. 1 0
      tripal_organism/tripal_organism.module

+ 6 - 6
tripal_core/api/tripal_core.api.inc

@@ -2362,7 +2362,7 @@ function tripal_db_set_active($dbname) {
 
     // if this is the default database then set the search path and return
     if (strcmp($dbname, 'default')==0) {
-//      tripal_db_set_default_search_path();
+      tripal_db_set_default_search_path();
       return db_set_active($dbname);
     }
     // if the user requests a database other than the default
@@ -2371,12 +2371,12 @@ function tripal_db_set_active($dbname) {
     // fails then we assume the database is not local and we'll
     // set it as normal.
     else {
-//      if (tripal_db_set_chado_search_path($dbname)) {
+      if (tripal_db_set_chado_search_path($dbname)) {
          return $dbname;
-//      }
-//      else {
-//        return db_set_active($dbname);
-//      }
+      }
+      else {
+        return db_set_active($dbname);
+      }
     }
   }
   else {

+ 1 - 0
tripal_organism/tripal_organism.module

@@ -964,6 +964,7 @@ function chado_organism_load($node) {
   // find the organism and add in the details
   $organism_id = chado_get_id_for_node('organism', $node);
   $values = array('organism_id' => $organism_id);
+
   $organism = tripal_core_generate_chado_var('organism', $values);
 
   // add in the description field