fix a duplicate function name

tripal_chado/api/modules/tripal_chado.feature.api.inc

@@ -804,7 +804,7 @@ function chado_get_location_string($featureloc) {
  *
  * @ingroup tripal_feature_api
  */
-function chado_get_feature_relationships($feature) {
+function chado_tripal_get_feature_relationships($feature) {
   // Expand the feature object to include the feature relationships.
   $options = array(
     'return_array' => 1,

tripal_chado/api/modules/tripal_chado.module.DEPRECATED.api.inc

@@ -999,7 +999,7 @@ function tripal_get_location_string($featureloc) {
  * @ingroup tripal_chado_module_DEPRECATED_api
  */
 function tripal_get_feature_relationships($feature) {
-  chado_get_feature_relationships($feature);
+  chado_tripal_get_feature_relationships($feature);
 }
 
 /**

tripal_chado/api/tripal_chado.DEPRECATED.api.inc

@@ -298,7 +298,7 @@ function hook_tripal_get_schema_name_alter($schema_name, $context)
  */
 function tripal_get_schema_name($schema = 'chado')
 {
-  chado_get_schema_name($schema = 'chado');
+  chado_get_schema_name($schema);
 }
 
 

tripal_chado/includes/tripal_chado.install.inc

@@ -404,7 +404,7 @@ function tripal_chado_upgrade_chado_1_2_to_1_3_pre_alter() {
   );
 
   // Get the name of the chado schema.
-  $chado_schema = tripal_get_schema_name('chado');
+  $chado_schema = chado_get_schema_name('chado');
 
   // Iterate through the new Chado tables and create them or if they already
   // exist then update them.
@@ -531,7 +531,7 @@ function tripal_chado_upgrade_chado_1_11_to_1_2() {
 function tripal_chado_reset_chado_schema() {
 
   // determine the schema name.
-  $chado_schema = tripal_get_schema_name('chado');
+  $chado_schema = chado_get_schema_name('chado');
   $chado_dot = $chado_schema . '.';
 
   // drop current chado and chado-related schema
@@ -588,7 +588,7 @@ function tripal_chado_install_sql($sql_file) {
   $chado_local = chado_dbschema_exists('chado');
 
   // determine the schema name.
-  $chado_schema = tripal_get_schema_name('chado');
+  $chado_schema = chado_get_schema_name('chado');
   $chado_dot = $chado_schema . '.';
 
   if ($chado_local) {
@@ -814,6 +814,6 @@ function tripal_chado_install_sql($sql_file) {
  */
 function tripal_chado_install_done() {
 
-  $drupal_schema = tripal_get_schema_name('drupal');
+  $drupal_schema = chado_get_schema_name('drupal');
   db_query("set search_path to $drupal_schema");
 }

tripal_chado_views/tripal_chado_views.views.inc

@@ -118,7 +118,7 @@ function tripal_chado_views_views_data() {
   $data = tripal_chado_views_views_data_tripal_views_tables($data);
 
   // Determine the name of the chado schema
-  $chado_schema = tripal_get_schema_name('chado');
+  $chado_schema = chado_get_schema_name('chado');
 
   // MAKE SURE ALL CHADO TABLES ARE INTEGRATED
   tripal_chado_views_integrate_all_chado_tables();