spficklin 14 years ago
parent
commit
88c10710be

+ 1 - 1
theme_tripal/tripal_feature/tripal_feature_unigenes.tpl.php

@@ -3,7 +3,7 @@ $node = $variables['node'];
 $feature = $node->feature;
 $unigenes = $feature->tripal_analysis_unigene->unigenes;
 
-//dpm($unigenes);
+dpm($unigenes);
 ?>
 <div id="tripal_feature-unigenes-box" class="tripal_feature-info-box tripal-info-box">
   <div class="tripal_feature-info-box-title tripal-info-box-title">Unigenes</div>

+ 1 - 1
tripal_analysis_blast/tripal_analysis_blast.module

@@ -193,7 +193,7 @@ function tripal_get_feature_blast_results($feature_id, $db_id, $max){
       // particular we need the database setting
       $blast_settings  = tripal_analysis_get_property($analysis_id,'analysis_blast_settings');	
       if($blast_settings){
-		   $blastsettings = explode("|", $blast_settings[0]->value);
+		   $blastsettings = explode("|", $blast_settings->value);
          // if we don't have the proper number of fields in the value column then
          // skip this entry
          if(count($blastsettings) != 3){

+ 7 - 3
tripal_analysis_unigene/tripal_analysis_unigene.module

@@ -237,13 +237,13 @@ function tripal_analysis_unigene_nodeapi(&$node, $op, $teaser, $page) {
                if(strcmp($node->type,'chado_organism')==0){
                   $node->content['tripal_organism_unigenes'] = array(
 					   	'#value' => theme('tripal_organism_unigenes', $node),
-						   '#weight' => 4
+						'#weight' => 4
                   );
                }
                if(strcmp($node->type,'chado_feature')==0){
                   $node->content['tripal_feature_unigenes'] = array(
 					   	'#value' => theme('tripal_feature_unigenes', $node),
-						   '#weight' => 4
+						'#weight' => 4
                   );
                }
             }
@@ -268,6 +268,10 @@ function tripal_analysis_unigene_theme () {
          'arguments' => array('node'=> null),
          'template' => 'tripal_organism_unigenes',
       ),
+      'tripal_feature_unigenes' => array (
+         'arguments' => array('node'=> null),
+         'template' => 'tripal_feature_unigenes',
+      ),
       'tripal_analysis_unigene_base' => array (
          'arguments' => array('node'=> null),
          'template' => 'tripal_analysis_unigene_base',
@@ -672,7 +676,7 @@ function tripal_analysis_unigene_load_feature_unigenes($feature){
       $analysis_id = $unigene->analysis_id;
 
       // check if this feature is present in the unigene
-      $values = (
+      $values = array(
          'feature_id' => $feature->feature_id,
          'analysis_id' => $analysis_id,
       );

+ 1 - 1
tripal_core/tripal_core.api.inc

@@ -1269,7 +1269,7 @@ function chado_get_node_id ($table, $id) {
 *
 * @ingroup tripal_api
 */
-function tripal_core_get_property($basetable, $record_id, $property,$cv_name,){
+function tripal_core_get_property($basetable, $record_id, $property,$cv_name){
 
    $table_desc = module_invoke_all('chado_'.$basetable.'prop_schema');
    $fkcol = key($table_desc['foreign_keys'][$basetable]['columns']);