Merge pull request #571 from tripal/526_v2_ignore_relaitonships_mview

dont include ontology relationships in tree viewer

tripal_chado/includes/setup/tripal_chado.chado_vx_x.inc

@@ -512,6 +512,7 @@ function tripal_chado_add_cv_root_mview_mview() {
       INNER JOIN cv CV on CV.cv_id = CVT.cv_id
     WHERE CVTR.object_id not in
       (SELECT subject_id FROM cvterm_relationship)
+    AND CVT.is_relationshiptype = 0
   ";
 
   // Create the MView

tripal_chado/tripal_chado.install

@@ -1568,4 +1568,23 @@ function tripal_chado_update_7327() {
   }
 }
 
+/**
+ * Don't count relationship cvterms as ontology roots.
+ */
+function tripal_chado_update_7328() {
+  try {
+    $mv_name = 'cv_root_mview';
+    // Remove the old mview.
+    $mview_id = chado_get_mview_id($mv_name);
+    chado_delete_mview($mview_id);
+    module_load_include('inc', 'tripal_chado', 'includes/setup/tripal_chado.chado_vx_x');
+    // Re-add the mview.
+    tripal_chado_add_cv_root_mview_mview();
+    $mview_id = chado_get_mview_id($mv_name);
+    chado_populate_mview($mview_id);
+  } catch (\PDOException $e) {
+    $error = $e->getMessage();
+    throw new DrupalUpdateException('Could not perform update: '. $error);
+  }
+}