Bladeren bron

Fixed bug in feature views_data hook that kept chado_XXXX tables from being integrated if the priority wasn't 9

spficklin 12 jaren geleden
bovenliggende
commit
f1952e2be3

+ 2 - 1
tripal_analysis/tripal_analysis.views.inc

@@ -66,7 +66,8 @@ function tripal_analysis_views_data()  {
       'analysisprop'
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);     
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 2 - 1
tripal_feature/tripal_feature.views.inc

@@ -84,7 +84,8 @@ function tripal_feature_views_data()  {
       'featurerange'
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);     
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 2 - 1
tripal_library/tripal_library.views.inc

@@ -66,7 +66,8 @@ function tripal_library_views_data()  {
       'libraryprop'
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);     
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 2 - 1
tripal_organism/tripal_organism.views.inc

@@ -70,7 +70,8 @@ function tripal_organism_views_data()  {
       'organism_dbxref'
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);    	
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 2 - 1
tripal_project/tripal_project.views.inc

@@ -53,7 +53,8 @@ function tripal_project_views_data()  {
     $tables = array(
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);     
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }

+ 2 - 1
tripal_stock/tripal_stock.views.inc

@@ -73,7 +73,8 @@ function tripal_stock_views_data()  {
       'stockprop_pub'
     );
     foreach ($tables as $tablename) {
-      if (!tripal_views_is_integrated($tablename, 9)) {
+    	$priority = tripal_views_get_lightest_priority_setup($tablename);     
+      if (!tripal_views_is_integrated($tablename, $priority)) {
         $table_integration_array = tripal_views_get_integration_array_for_chado_table($tablename, FALSE);
         tripal_views_integration_add_entry($table_integration_array);
       }