Browse Source

Added Panel support for all Analyses

spficklin 14 years ago
parent
commit
274cbcb488

+ 44 - 1
tripal_analysis_blast/tripal_analysis_blast.module

@@ -46,7 +46,46 @@ function tripal_analysis_blast_menu() {
 	);
 	return $items;
 }
-
+/**
+ *
+ *
+ * @ingroup tripal_analysis_blast
+ */
+function tripal_analysis_blast_block($op = 'list', $delta = 0, $edit=array()){
+   switch($op) {
+      case 'list':
+         $blocks['blast_base']['info'] = t('Analysis: Blast Details');
+         $blocks['blast_base']['cache'] = BLOCK_NO_CACHE;
+
+
+         $blocks['featureblast']['info'] = t('Tripal Feature Blast Results');
+         $blocks['featureblast']['cache'] = BLOCK_NO_CACHE;
+
+         
+         return $blocks;
+
+
+      case 'view':
+         if(user_access('access chado_analysis_blast content') and arg(0) == 'node' and is_numeric(arg(1))) {
+            $nid = arg(1);
+            $node = node_load($nid);
+ 
+            $block = array();
+            switch($delta){
+               case 'blast_base':
+                  $block['subject'] = t('Blast Details');
+                  $block['content'] = theme('tripal_analysis_blast_base',$node);
+                  break;
+               case 'featureblast':
+                  $block['subject'] = t('Homology');
+                  $block['content'] = theme('tripal_feature_blast_results',$node);
+                  break;  
+               default :
+            }
+            return $block;
+         }
+   }
+}
 
 /*******************************************************************************
  * tripal_analysis_blast_nodeapi()
@@ -104,6 +143,10 @@ function tripal_analysis_blast_theme () {
 		'tripal_analysis_blast_report' => array(
 			'arguments' =>  array('report_object'=> null),
 		   'template' => 'tripal_analysis_blast_report',
+		),
+		'tripal_analysis_blast_base' => array(
+			'arguments' =>  array('report_object'=> null),
+		   'template' => 'tripal_analysis_blast_base',
 		)
 	);
 }

+ 8 - 2
tripal_analysis_go/tripal_analysis_go.module

@@ -119,6 +119,9 @@ function tripal_analysis_go_block($op = 'list', $delta = 0, $edit=array()){
          $blocks['tago_org_sum']['info'] = t('Tripal Organism GO Analysis Report');
          $blocks['tago_org_sum']['cache'] = BLOCK_NO_CACHE;
 
+         $blocks['featurego']['info'] = t('Tripal Feature GO Terms');
+         $blocks['featurego']['cache'] = BLOCK_NO_CACHE;
+
          return $blocks;
 
 
@@ -131,9 +134,12 @@ function tripal_analysis_go_block($op = 'list', $delta = 0, $edit=array()){
             switch($delta){
                  case 'tago_org_sum':
                   $block['subject'] = t('GO Summary');
-                  $block['content'] = theme('tripal_analysis_go_org_summary',$node);
+                  $block['content'] = theme('tripal_organism_go_summary',$node);
+                  break;
+               case 'featurego':
+                  $block['subject'] = t('GO Terms');
+                  $block['content'] = theme('tripal_feature_go_terms',$node);
                   break;
-
                default :
             }
             return $block;

+ 43 - 26
tripal_analysis_interpro/tripal_analysis_interpro.module

@@ -30,32 +30,6 @@ function tripal_analysis_interpro_node_info() {
 	);
 	return $nodes;
 }
-/*******************************************************************************
-*
-*/
-function tripal_analysis_interpro_block($op = 'list', $delta = 0, $edit=array()){
-   switch($op) {
-      case 'list':
-         $blocks['tai_results']['info'] = t('Tripal InterProScan Analysis Results');
-         $blocks['tai_results']['cache'] = BLOCK_NO_CACHE;
-       return $blocks;
-
-      case 'view':
-         if(user_access('access chado_analysis_interpro content') and arg(0) == 'node' and is_numeric(arg(1))) {
-            $nid = arg(1);
-            $node = node_load($nid);
-            $block = array();
-            switch($delta){
-               case 'tai_results':
-                  $block['subject'] = t('InterProScan Results');
-                  $block['content'] = theme('tripal_analysis_interpro_results', $node);
-                  break;
-                default :
-            }
-            return $block;
-         }
-   }
-}
 /*******************************************************************************
  *  Provide a Interpro Analysis form
  */
@@ -325,8 +299,47 @@ function chado_analysis_interpro_view ($node, $teaser = FALSE, $page = FALSE) {
 	}
 	return $node;
 }
+/**
+ *
+ *
+ * @ingroup tripal_analysis_interpro
+ */
+function tripal_analysis_interpro_block($op = 'list', $delta = 0, $edit=array()){
+   switch($op) {
+      case 'list':
+         $blocks['ipr_base']['info'] = t('Analysis: Interpro Details');
+         $blocks['ipr_base']['cache'] = BLOCK_NO_CACHE;
+
+         $blocks['featureipr']['info'] = t('Tripal Feature Interpro Results');
+         $blocks['featureipr']['cache'] = BLOCK_NO_CACHE;
+
+         
+         return $blocks;
 
 
+      case 'view':
+         if(user_access('access chado_analysis_interpro content') and arg(0) == 'node' and is_numeric(arg(1))) {
+            $nid = arg(1);
+            $node = node_load($nid);
+ 
+            $block = array();
+            switch($delta){
+               case 'ipr_base':
+                  $block['subject'] = t('Interpro Details');
+                  $block['content'] = theme('tripal_analysis_interpro_base',$node);
+                  break;
+               case 'featureipr':
+                  $block['subject'] = t('Interpro Results');
+                  $block['content'] = theme('tripal_feature_interpro_results',$node);
+                  break;
+              
+               default :
+            }
+            return $block;
+         }
+   }
+}
+
 /*******************************************************************************
  * tripal_analysis_interpro_nodeapi()
  * HOOK: Implementation of hook_nodeapi()
@@ -374,6 +387,10 @@ function tripal_analysis_interpro_theme () {
       'tripal_feature_interpro_results' => array (
          'arguments' => array('node'=> null),
          'template' => 'tripal_feature_interpro_results',
+	   ),
+      'tripal_analysis_interpro_base' => array (
+         'arguments' => array('node'=> null),
+         'template' => 'tripal_analysis_interpro_base',
 	   )
 	);
 }

+ 49 - 0
tripal_analysis_kegg/tripal_analysis_kegg.module

@@ -766,6 +766,55 @@ function tripal_analysis_kegg_insert_featureprop ($feature_id, $analysis_id,
       return 0;
    }
 }
+/**
+ *
+ *
+ * @ingroup tripal_analysis_kegg
+ */
+function tripal_analysis_kegg_block($op = 'list', $delta = 0, $edit=array()){
+   switch($op) {
+      case 'list':
+         $blocks['featurekegg']['info'] = t('Tripal Feature KEGG Terms');
+         $blocks['featurekegg']['cache'] = BLOCK_NO_CACHE;
+
+         $blocks['orgkegg']['info'] = t('Organism KEGG Summary');
+         $blocks['orgkegg']['cache'] = BLOCK_NO_CACHE;
+
+         $blocks['kegg_base']['info'] = t('Analsyis: KEGG Details');
+         $blocks['kegg_base']['cache'] = BLOCK_NO_CACHE;
+
+         
+         return $blocks;
+
+
+      case 'view':
+         if(user_access('access chado_analysis_kegg content') and arg(0) == 'node' and is_numeric(arg(1))) {
+            $nid = arg(1);
+            $node = node_load($nid);
+ 
+            $block = array();
+            switch($delta){
+               case 'featurekegg':
+                  $block['subject'] = t('KEGG Terms');
+                  $block['content'] = theme('tripal_feature_kegg_terms',$node);
+                  break;
+
+               case 'orgkegg':
+                  $block['subject'] = t('KEGG Terms');
+                  $block['content'] = theme('tripal_organism_kegg_summary',$node);
+                  break;
+
+               case 'kegg_base':
+                  $block['subject'] = t('KEGG Terms');
+                  $block['content'] = theme('tripal_analysis_kegg_report',$node);
+                  break;
+              
+               default :
+            }
+            return $block;
+         }
+   }
+}
 /*******************************************************************************
  * HOOK: Implementation of hook_nodeapi()
  * Display library information for associated features or organisms

+ 45 - 0
tripal_analysis_unigene/tripal_analysis_unigene.module

@@ -327,6 +327,51 @@ function chado_analysis_unigene_load($node){
 
    return $additions;
 }
+/**
+ *
+ *
+ * @ingroup tripal_analysis_unigene
+ */
+function tripal_analysis_unigene_block($op = 'list', $delta = 0, $edit=array()){
+   switch($op) {
+      case 'list':
+         $blocks['base_ugene']['info'] = t('Analysis: Unigene Details');
+         $blocks['base_ugene']['cache'] = BLOCK_NO_CACHE;
+
+         $blocks['feature_ugene']['info'] = t('Tripal Feature Unigene');
+         $blocks['feature_ugene']['cache'] = BLOCK_NO_CACHE;
+
+         $blocks['org_ugene']['info'] = t('Tripal Organism Unigene');
+         $blocks['org_ugene']['cache'] = BLOCK_NO_CACHE;
+         
+         return $blocks;
+
+
+      case 'view':
+         if(user_access('access chado_analysis_unigene content') and arg(0) == 'node' and is_numeric(arg(1))) {
+            $nid = arg(1);
+            $node = node_load($nid);
+ 
+            $block = array();
+            switch($delta){
+               case 'base_ugene':
+                  $block['subject'] = t('Unigene Details');
+                  $block['content'] = theme('tripal_analysis_unigene_base',$node);
+                  break;
+               case 'feature_ugene':
+                  $block['subject'] = t('Unigene');
+                  $block['content'] = theme('tripal_feature_unigenes',$node);
+                  break;
+               case 'org_ugene':
+                  $block['subject'] = t('Unigene');
+                  $block['content'] = theme('tripal_organism_unigenes',$node);
+                  break;
+               default :
+            }
+            return $block;
+         }
+   }
+}
 /*******************************************************************************
  * tripal_analysis_unigene_nodeapi()
  * HOOK: Implementation of hook_nodeapi()