From b83f0a10247119ef18bf72688d4e0bb8cfee8e36 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Wed, 21 Sep 2016 14:40:12 -0400 Subject: [PATCH 1/2] Fix whoosh indexing. --- scripts/tool_shed/build_ts_whoosh_index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/tool_shed/build_ts_whoosh_index.py b/scripts/tool_shed/build_ts_whoosh_index.py index 2bbf6da0265..d7ab7b9004f 100644 --- a/scripts/tool_shed/build_ts_whoosh_index.py +++ b/scripts/tool_shed/build_ts_whoosh_index.py @@ -25,6 +25,7 @@ import galaxy.webapps.tool_shed.model.mapping from galaxy.tools.loader_directory import load_tool_elements_from_path from galaxy.util import pretty_print_time_interval from galaxy.webapps.tool_shed import config, model +from galaxy.util import directory_hash_id repo_schema = Schema( id=STORED, @@ -152,7 +153,7 @@ def get_repos( sa_session, path_to_repositories ): # Parse all the tools within repo for separate index. tools_list = [] - path = os.path.join( path_to_repositories, *model.directory_hash_id( repo.id )) + path = os.path.join( path_to_repositories, *directory_hash_id( repo.id ) ) path = os.path.join( path, "repo_%d" % repo.id ) if os.path.exists(path): tools_list.extend( load_one_dir( path ) ) From 2c8a5d9d58c49c662aed4193f71caaf3fafe5651 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Fri, 23 Sep 2016 12:13:10 -0400 Subject: [PATCH 2/2] Correct import order. --- scripts/tool_shed/build_ts_whoosh_index.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/tool_shed/build_ts_whoosh_index.py b/scripts/tool_shed/build_ts_whoosh_index.py index d7ab7b9004f..d5f5ddaf57e 100644 --- a/scripts/tool_shed/build_ts_whoosh_index.py +++ b/scripts/tool_shed/build_ts_whoosh_index.py @@ -23,9 +23,8 @@ sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pa import galaxy.webapps.tool_shed.model.mapping from galaxy.tools.loader_directory import load_tool_elements_from_path -from galaxy.util import pretty_print_time_interval +from galaxy.util import directory_hash_id, pretty_print_time_interval from galaxy.webapps.tool_shed import config, model -from galaxy.util import directory_hash_id repo_schema = Schema( id=STORED,