convert ND module

tripal_natural_diversity/tripal_natural_diversity.info

@@ -1,9 +1,9 @@
 name = Tripal Natural Diversity
 description = A module for interfacing the GMOD chado database with Drupal, providing viewing of Natural Diversity data
-core = 6.x
+core = 7.x
 project = tripal_natural_diversity
 package = Tripal
-version = 6.x-1.1
+version = 7.x-2.0-beta1
 dependencies[] = tripal_core
 dependencies[] = tripal_cv
 dependencies[] = tripal_db

tripal_natural_diversity/tripal_natural_diversity.install

@@ -4,6 +4,26 @@
  * Implements hooks from the Schema API
  */
 
+
+
+/**
+ * Implementation of hook_requirements().
+ */
+function tripal_natural_diversity_requirements($phase) {
+  $requirements = array();
+  if ($phase == 'install') {
+    // make sure chado is installed
+    if (!tripal_core_is_chado_installed()) {
+      $requirements ['tripal_natural_diversity'] = array(
+        'title' => "tripal_natural_diversity",
+        'value' => "ERROR: Chado most be installed before this module can be enabled",
+        'severity' => REQUIREMENT_ERROR,
+      );
+    }
+  }
+  return $requirements;
+}
+
 /**
  * Implementation of hook_install().
  */
@@ -18,20 +38,10 @@ function tripal_natural_diversity_install() {
 }
 
 /**
- *  Update for Drupal 6.x, Tripal 1.1, Natural Diversity Module 1.1
- *  This update adds new cvterms for experiment types
- *
+ * Implementation of hook_uninstall().
  */
-function tripal_natural_diversity_update_6100() {
-   
-  // add cvterms
-  tripal_natural_diversity_add_cvterms(); 
-  
-  $ret = array(
-    '#finished' => 1,
-  );
+function tripal_natural_diversity_uninstall() {
 
-  return $ret;
 }
 
 /*
@@ -48,28 +58,3 @@ function tripal_natural_diversity_add_cvterms(){
   tripal_cv_add_cvterm(array('name' => 'Location','def' => 'The name of the location.'), 
     'nd_geolocation_property', 0, 1, 'tripal');
 }
-/**
- * Implementation of hook_uninstall().
- */
-function tripal_natural_diversity_uninstall() {
-
-}
-
-
-/**
- * Implementation of hook_requirements(). 
- */
-function tripal_natural_diversity_requirements($phase) {
-  $requirements = array();
-  if ($phase == 'install') {
-    // make sure chado is installed
-    if (!tripal_core_is_chado_installed()) {
-      $requirements ['tripal_natural_diversity'] = array(
-            'title' => "tripal_natural_diversity",
-            'value' => "ERROR: Chado most be installed before this module can be enabled",
-            'severity' => REQUIREMENT_ERROR,
-      );
-    }
-  }
-  return $requirements;
-}

tripal_natural_diversity/tripal_natural_diversity.module

@@ -52,19 +52,61 @@ function tripal_natural_diversity_theme() {
 }
 
 /**
- * Implements hook_nodeapi().
+ * @ingroup tripal_library
+ */
+function tripal_natural_diversity_block_info() {
+
+  $blocks['ndfgenotype']['info'] = t('Tripal Natural Diversity Feature Genotypes');
+  $blocks['ndfgenotype']['cache'] = BLOCK_NO_CACHE;
+
+  $blocks['ndsgenotype']['info'] = t('Tripal Natural Diversity Library Genotypes');
+  $blocks['ndsgenotype']['cache'] = BLOCK_NO_CACHE;
+
+  $blocks['ndsphenotype']['info'] = t('Tripal Natural Diversity Stock Phenotypes');
+  $blocks['ndsphenotype']['cache'] = BLOCK_NO_CACHE;
+
+  return $blocks;
+}
+/**
+ * @ingroup tripal_library
+ */
+function tripal_natural_diversity_block_view($delta = '') {
+
+  if (user_access('access chado_library content') and arg(0) == 'node' and is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load($nid);
+
+    $block = array();
+    switch ($delta) {
+    	case 'ndfgenotype':
+    	  $block['subject'] = t('Genotypes');
+    	  $block['content'] = theme('tripal_feature_nd_genotypes', $node);
+    	  break;
+    	case 'ndsgenotype':
+    	  $block['subject'] = t('Stock Genotypes');
+    	  $block['content'] = theme('tripal_stock_nd_genotypes', $node);
+    	  break;
+    	case 'ndsphenotype':
+    	  $block['subject'] = t('Phenotypes');
+    	  $block['content'] = theme('tripal_stock_nd_phenotypes', $node);
+    	  break;
+    	default :
+    }
+    return $block;
+  }
+}
+/**
  *
  * @ingroup tripal_natural_diversity
  */
-function tripal_natural_diversity_nodeapi(&$node, $op, $teaser, $page){
-  switch ($op) {
-    case 'view':
-      if ($node->type == 'chado_feature') {
-        // the tripal_genetic module provides a tripal_feature_genotype
-        // template.  The only difference between them is the addition of
-        // project information by this module's template.  Therefore,
-        // if the tripal_genetic content is present get rid of as this
-        // module superceeds it.
+function tripal_natural_diversity_node_view(&$node, $view_mode, $langcode) {
+    if ($node->type == 'chado_feature') {
+      // the tripal_genetic module provides a tripal_feature_genotype
+      // template.  The only difference between them is the addition of
+      // project information by this module's template.  Therefore,
+      // if the tripal_genetic content is present get rid of as this
+      // module superceeds it.
+      if ($view_mode == 'full') {
         if (array_key_exists('tripal_feature_genotypes', $node->content)) {
           unset($node->content['tripal_feature_genotypes']);
         }
@@ -72,7 +114,9 @@ function tripal_natural_diversity_nodeapi(&$node, $op, $teaser, $page){
            '#value' => theme('tripal_feature_nd_genotypes', $node),
         );
       }
-      if ($node->type == 'chado_stock') {
+    }
+    if ($node->type == 'chado_stock') {
+      if ($view_mode == 'full') {
         $node->content['tripal_stock_nd_genotypes'] = array(
            '#value' => theme('tripal_stock_nd_genotypes', $node),
         );
@@ -80,15 +124,6 @@ function tripal_natural_diversity_nodeapi(&$node, $op, $teaser, $page){
            '#value' => theme('tripal_stock_nd_phenotypes', $node),
         );
       }
-      break;
-  }
-}
-
-/**
- *
- *
- * @ingroup tripal_natural_diversity
- */
-function tripal_natural_diversity_preprocess_tripal_stock_nd_genotypes(&$variables){
-
+    }
+    break;
 }