From e088e4c3cbeb0c2614fd4d57aa2845be18c52a01 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Fri, 13 Apr 2018 08:43:00 +0200
Subject: [PATCH] #818 Xapian not available

---
 app/models/dmsf_file.rb                    | 3 ++-
 app/views/settings/_dmsf_settings.html.erb | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 4c686473..be9950b7 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -22,9 +22,10 @@
 begin
   require 'xapian'
   $xapian_bindings_available = true
-rescue LoadError
+rescue LoadError => e
   Rails.logger.warn %{No Xapian search engine interface for Ruby installed => Full-text search won't be available.
                       Install a ruby-xapian package or an alternative Xapian binding (https://xapian.org).}
+  Rails.logger.warn e.message
   $xapian_bindings_available = false
 end
 
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index ded19807..da641ab5 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -280,8 +280,9 @@
 <% begin %>
   <% require 'xapian' %>
   <% xapian_disabled = false %>
-<% rescue LoadError %>
-  <p class="warning"><%= l(:warning_xapian_not_available) %></p> 
+<% rescue LoadError => e %>
+  <p class="warning"><%= l(:warning_xapian_not_available) %></p>
+  <% Rails.logger.warn e.message %>
   <% xapian_disabled = true %>
 <% end %>