Merge branch '7.x-2.x' of git.drupal.org:sandbox/spficklin/1337878 into 7.x-2.x

tripal_analysis/tripal_analysis.install

@@ -59,10 +59,6 @@ function tripal_analysis_install() {
  */
 function tripal_analysis_uninstall() {
 
-  // remove the materialized view
-  if ($mview = tripal_mviews_get_mview_id('analysis_organism')) {
-    tripal_mviews_action('delete', $mview);
-  }
 }
 /**
  * 

tripal_cv/tripal_cv.install

@@ -61,15 +61,11 @@ function tripal_cv_install() {
  * @ingroup tripal_cv
  */
 function tripal_cv_uninstall() {
-  // remove the materialized view
-  if ($mview = tripal_mviews_get_mview_id('cv_root_mview')) {
-    tripal_mviews_action('delete', $mview);
-  }
-  
+
   // drop the tripal_obo_temp table
   if (db_table_exists('chado.tripal_obo_temp')) {
-    $sql = "DROP TABLE {tripal_obo_temp}";
-    chado_query($sql);
+    $sql = "DROP TABLE chado.tripal_obo_temp";
+    db_query($sql);
   }
 }
 /**

tripal_feature/tripal_feature.install

@@ -47,12 +47,6 @@ function tripal_feature_install() {
 
   // add the materialized view
   tripal_feature_add_organism_count_mview();
-
-  // add a job to the job queue so this view gets updated automatically next
-  // time the job facility is run
-  if ($mview_id = tripal_mviews_get_mview_id('organism_feature_count')) {
-    tripal_mviews_action('update', $mview_id);
-  }
   
   // create the temp table we will use for loading GFF files
   tripal_cv_create_tripal_gff_temp();
@@ -64,12 +58,7 @@ function tripal_feature_install() {
  * @ingroup tripal_feature
  */
 function tripal_feature_uninstall() {
-  // Drop the MView table if it exists
-  // D7 @todo Fix tripal_mviews_get_mview_id()
-  if ($mview_id = tripal_mviews_get_mview_id('organism_feature_count')) {
-    tripal_mviews_action("delete", $mview_id);
-  }
-  
+
 }
 
 /**

tripal_library/tripal_library.install

@@ -59,10 +59,7 @@ function tripal_library_install() {
  * @ingroup tripal_library
  */
 function tripal_library_uninstall() {
-  // Drop the MView table if it exists
-  if ($mview_id = tripal_mviews_get_mview_id('library_feature_count')) {
-    tripal_mviews_action("delete", $mview_id);
-  }
+
 }
 
 /**