# HG changeset patch
# User greg
# Date 1647435201 0
# Node ID e4fe7259c4e9900d805d2bac41c5203dd441636e
# Parent  7093598fa300f136a1ba59bda3fbe6ad1916ed7c
Uploaded

diff -r 7093598fa300 -r e4fe7259c4e9 data_manager/gtdbtk_database_installer.py
--- a/data_manager/gtdbtk_database_installer.py	Tue Mar 15 19:31:23 2022 +0000
+++ b/data_manager/gtdbtk_database_installer.py	Wed Mar 16 12:53:21 2022 +0000
@@ -52,7 +52,7 @@
     data_manager_entry = {}
     data_manager_entry['value'] = database_id
     data_manager_entry['name'] = database_name
-    data_manager_entry['db_path'] = file_path
+    data_manager_entry['path'] = file_path
     data_manager_json["data_tables"]["gtdbtk_database"] = data_manager_entry
 
     with open(out_file, 'w') as fh:
diff -r 7093598fa300 -r e4fe7259c4e9 data_manager_conf.xml
--- a/data_manager_conf.xml	Tue Mar 15 19:31:23 2022 +0000
+++ b/data_manager_conf.xml	Wed Mar 16 12:53:21 2022 +0000
@@ -4,11 +4,11 @@
             <output>
                 <column name="value"/>
                 <column name="name"/>
-                <column name="db_path" output_ref="out_file">
+                <column name="path" output_ref="out_file">
                     <move type="directory" relativize_symlinks="True">
                         <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">gtdbtk_database/${value}</target>
                     </move>
-                    <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/gtdbtk_database/${value}/${db_path}</value_translation>
+                    <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/gtdbtk_database/${value}</value_translation>
                     <value_translation type="function">abspath</value_translation>
                 </column>
             </output>
diff -r 7093598fa300 -r e4fe7259c4e9 tool_data_table_conf.xml.sample
--- a/tool_data_table_conf.xml.sample	Tue Mar 15 19:31:23 2022 +0000
+++ b/tool_data_table_conf.xml.sample	Wed Mar 16 12:53:21 2022 +0000
@@ -1,7 +1,7 @@
 <tables>
     <!-- Locations of GTDB-Tk database versions 202 and higher -->
     <table name="gtdbtk_database" comment_char="#">
-        <columns>value, name, db_path</columns>
+        <columns>value, name, path</columns>
         <file path="tool-data/gtdbtk_database.loc" />
     </table>
 </tables>
diff -r 7093598fa300 -r e4fe7259c4e9 tool_data_table_conf.xml.test
--- a/tool_data_table_conf.xml.test	Tue Mar 15 19:31:23 2022 +0000
+++ b/tool_data_table_conf.xml.test	Wed Mar 16 12:53:21 2022 +0000
@@ -1,7 +1,7 @@
 <tables>
     <!-- Location of databases for gtdbtk version 202 and higher -->
     <table name="gtdbtk_database" comment_char="#">
-        <columns>value, name, db_path</columns>
+        <columns>value, name, path</columns>
         <file path="${__HERE__}/test-data/gtdbtk_database.loc" />
     </table>
 </tables>