From 5f566a97fbfd7e847046db711b2cecdd019bb93e Mon Sep 17 00:00:00 2001 From: Yury Melnichek Date: Sat, 27 Aug 2011 16:43:15 +0200 Subject: [PATCH] Remove indexer -> search dependency. --- indexer/index.hpp | 3 +-- indexer/indexer.pro | 2 ++ indexer/search_index_builder.cpp | 5 ++--- {search => indexer}/search_trie.hpp | 0 {search => indexer}/string_search_utils.hpp | 0 search/approximate_string_match.hpp | 2 +- search/engine.hpp | 2 +- search/keyword_matcher.cpp | 2 +- search/query.cpp | 2 +- search/search.pro | 2 -- search/search_tests/keyword_matcher_test.cpp | 2 +- search/search_trie_matching.cpp | 2 +- search/search_trie_matching.hpp | 2 +- 13 files changed, 12 insertions(+), 14 deletions(-) rename {search => indexer}/search_trie.hpp (100%) rename {search => indexer}/string_search_utils.hpp (100%) diff --git a/indexer/index.hpp b/indexer/index.hpp index 172d8c47a0..811fd532e6 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -5,11 +5,10 @@ #include "features_vector.hpp" #include "scale_index.hpp" #include "scales.hpp" +#include "search_trie.hpp" #include "../../defines.hpp" -#include "../search/search_trie.hpp" - #include "../platform/platform.hpp" #include "../geometry/rect2d.hpp" diff --git a/indexer/indexer.pro b/indexer/indexer.pro index 8b3449f57a..bc2d754a59 100644 --- a/indexer/indexer.pro +++ b/indexer/indexer.pro @@ -80,3 +80,5 @@ HEADERS += \ coding_params.hpp \ feature_loader_base.hpp \ feature_loader.hpp \ + search_trie.hpp \ + string_search_utils.hpp \ diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp index 445b51c4f1..74a5c47d0c 100644 --- a/indexer/search_index_builder.cpp +++ b/indexer/search_index_builder.cpp @@ -1,11 +1,10 @@ #include "search_index_builder.hpp" #include "features_vector.hpp" +#include "search_trie.hpp" +#include "string_search_utils.hpp" #include "../defines.hpp" -#include "../search/search_trie.hpp" -#include "../search/string_search_utils.hpp" - #include "../coding/trie_builder.hpp" #include "../coding/writer.hpp" diff --git a/search/search_trie.hpp b/indexer/search_trie.hpp similarity index 100% rename from search/search_trie.hpp rename to indexer/search_trie.hpp diff --git a/search/string_search_utils.hpp b/indexer/string_search_utils.hpp similarity index 100% rename from search/string_search_utils.hpp rename to indexer/string_search_utils.hpp diff --git a/search/approximate_string_match.hpp b/search/approximate_string_match.hpp index 2225bb72a0..edc8ab0f71 100644 --- a/search/approximate_string_match.hpp +++ b/search/approximate_string_match.hpp @@ -1,5 +1,5 @@ #pragma once -#include "string_search_utils.hpp" +#include "../indexer/string_search_utils.hpp" #include "../base/base.hpp" #include "../base/buffer_vector.hpp" #include "../std/queue.hpp" diff --git a/search/engine.hpp b/search/engine.hpp index a291c2e966..95932a602d 100644 --- a/search/engine.hpp +++ b/search/engine.hpp @@ -1,7 +1,7 @@ #pragma once -#include "search_trie.hpp" #include "../indexer/index.hpp" +#include "../indexer/search_trie.hpp" #include "../geometry/rect2d.hpp" diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp index 3864d21ebe..971d24b2ad 100644 --- a/search/keyword_matcher.cpp +++ b/search/keyword_matcher.cpp @@ -1,6 +1,6 @@ #include "keyword_matcher.hpp" #include "delimiters.hpp" -#include "string_search_utils.hpp" +#include "../indexer/string_search_utils.hpp" #include "../base/logging.hpp" #include "../base/string_utils.hpp" #include "../std/bind.hpp" diff --git a/search/query.cpp b/search/query.cpp index 644e1e814a..d23b51171a 100644 --- a/search/query.cpp +++ b/search/query.cpp @@ -2,10 +2,10 @@ #include "categories_holder.hpp" #include "delimiters.hpp" #include "latlon_match.hpp" -#include "string_search_utils.hpp" #include "search_trie_matching.hpp" #include "../indexer/feature_visibility.hpp" +#include "../indexer/string_search_utils.hpp" #include "../base/exception.hpp" #include "../base/stl_add.hpp" diff --git a/search/search.pro b/search/search.pro index 57d928dd89..de8b5e31ed 100644 --- a/search/search.pro +++ b/search/search.pro @@ -18,9 +18,7 @@ HEADERS += \ result.hpp \ latlon_match.hpp \ categories_holder.hpp \ - search_trie.hpp \ search_trie_matching.hpp \ - string_search_utils.hpp \ approximate_string_match.hpp \ SOURCES += \ diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp index 7e17f5c215..fa8e3356ca 100644 --- a/search/search_tests/keyword_matcher_test.cpp +++ b/search/search_tests/keyword_matcher_test.cpp @@ -2,7 +2,7 @@ #include "../keyword_matcher.hpp" #include "match_cost_mock.hpp" #include "../approximate_string_match.hpp" -#include "../string_search_utils.hpp" +#include "../../indexer/string_search_utils.hpp" #include "../../testing/testing_utils.hpp" #include "../../base/string_utils.hpp" #include "../../std/scoped_ptr.hpp" diff --git a/search/search_trie_matching.cpp b/search/search_trie_matching.cpp index dddaf4e7e3..9cd8d8744d 100644 --- a/search/search_trie_matching.cpp +++ b/search/search_trie_matching.cpp @@ -1,8 +1,8 @@ #include "search_trie_matching.hpp" #include "query.hpp" -#include "string_search_utils.hpp" #include "../indexer/feature_visibility.hpp" +#include "../indexer/string_search_utils.hpp" #include "../std/algorithm.hpp" #include "../std/functional.hpp" diff --git a/search/search_trie_matching.hpp b/search/search_trie_matching.hpp index d14f05e55b..f12e98a7bf 100644 --- a/search/search_trie_matching.hpp +++ b/search/search_trie_matching.hpp @@ -1,5 +1,5 @@ #pragma once -#include "search_trie.hpp" +#include "../indexer/search_trie.hpp" class FeaturesVector;