Show more diagnostics in case of invalid categories.txt file.

1 files changed, 10 insertions, 2 deletions

diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 01efd1174c..0e1288c9b6 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -363,7 +363,7 @@ void Classificator::SortClassificator()
   GetMutableRoot()->Sort();
 }
 
-uint32_t Classificator::GetTypeByPath(vector<string> const & path) const
+uint32_t Classificator::GetTypeByPathSafe(vector<string> const & path) const
 {
   ClassifObject const * p = GetRoot();
 
@@ -373,7 +373,8 @@ uint32_t Classificator::GetTypeByPath(vector<string> const & path) const
   while (i < path.size())
   {
     ClassifObjectPtr ptr = p->BinaryFind(path[i]);
-    ASSERT ( ptr, ("Invalid path in Classificator::GetTypeByPath", path) );
+    if (!ptr)
+      return 0;
 
     ftype::PushValue(type, ptr.GetIndex());
 
@@ -384,6 +385,13 @@ uint32_t Classificator::GetTypeByPath(vector<string> const & path) const
   return type;
 }
 
+uint32_t Classificator::GetTypeByPath(vector<string> const & path) const
+{
+  uint32_t const type = GetTypeByPathSafe(path);
+  ASSERT_NOT_EQUAL(type, 0, (path));
+  return type;
+}
+
 void Classificator::ReadTypesMapping(istream & s)
 {
   m_mapping.Load(s);