lib/libis/format/config.rb in libis-format-0.9.46 vs lib/libis/format/config.rb in libis-format-0.9.47

@@ -14,14 +14,14 @@
     Config[:soffice_path] = 'soffice'
     Config[:ghostscript_path] = 'gs'
     Config[:droid_path] = '/opt/droid/droid.sh'
     Config[:fido_path] = '/usr/local/bin/fido'
     Config[:ffmpeg_path] = 'ffmpeg'
-    data_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data'))
-    Config[:fido_formats] = [(File.join(data_dir, 'lias_formats.xml'))]
+    Config[:fido_formats] = [(File.join(Libis::Format::DATA_DIR, 'lias_formats.xml'))]
+    Config[:pdf_tool] = [(File.join(Libis::Format::TOOL_DIR, 'PdfTool.jar'))]
     # noinspection RubyStringKeysInHashInspection
-    Config[:xml_validations] = [['archive/ead', File.join(data_dir, 'ead.xsd')]]
-    Config[:type_database] = File.join(data_dir, 'types.yml')
+    Config[:xml_validations] = [['archive/ead', File.join(Libis::Format::DATA_DIR, 'ead.xsd')]]
+    Config[:type_database] = File.join(Libis::Format::DATA_DIR, 'types.yml')
     Config[:raw_audio_convert_cmd] = 'sox %s -e signed -b 16 -t wav %s rate %d channels %d'
     Config[:watermark_font] = '/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf'
 
   end
 end