Rename option & rework invocation.

Author: knowtheory

lib/docsplit/command_line.rb

@@ -71,7 +71,7 @@ def usage
     # Use the OptionParser library to parse out all supported options. Return
     # options formatted for the Ruby API.
     def parse_options
-      @options = {:ocr => :default, :clean => true}
+      @options = {:ocr => :default, :clean => true, :detect_orientation => true}
       @option_parser = OptionParser.new do |opts|
         opts.on('-o', '--output [DIR]', 'set the directory for all output') do |d|
           @options[:output] = d
@@ -98,8 +98,8 @@ def parse_options
           @options[:language] = l
           @options[:clean] = false
         end
-        opts.on('-n', '--no-orientation-detection', 'turn off automatic orientation detection in tesseract') do |n|
-          @options[:nod] = true
+        opts.on('--no-orientation-detection', 'turn off automatic orientation detection in tesseract') do |n|
+          @options[:detect_orientation] = false
         end
         opts.on('-r', '--rolling', 'generate images from each previous image') do |r|
           @options[:rolling] = true

lib/docsplit/text_extractor.rb

@@ -74,10 +74,9 @@ def extract_from_ocr(pdf, pages)
         tiff = "#{tempdir}/#{@pdf_name}.tif"
         escaped_tiff = ESCAPE[tiff]
         run "MAGICK_TMPDIR=#{tempdir} OMP_NUM_THREADS=2 gm convert -despeckle #{MEMORY_ARGS} #{OCR_FLAGS} #{escaped_pdf} #{escaped_tiff} 2>&1"
-        psm = "-psm 1"
-        if @nod || !DEPENDENCIES[:osd] #if the user says don't do orientation detection or the plugin is not installed, set psm to 0
-          psm = ""
-        end
+        #if the user says don't do orientation detection or the plugin is not installed, set psm to 0
+        psm = "-psm 1" if @detect_orientation and DEPENDENCIES[:osd]
+        psm ||= ""
         run "tesseract #{escaped_tiff} #{base_path} -l #{@language} #{psm} 2>&1"
         clean_text(base_path + '.txt') if @clean_ocr
       end
@@ -121,15 +120,15 @@ def extract_page(pdf, page)
     end
 
     def extract_options(options)
-      @output     = options[:output] || '.'
-      @pages      = options[:pages]
-      @force_ocr  = options[:ocr] == true
-      @forbid_ocr = options[:ocr] == false
-      @clean_ocr  = !(options[:clean] == false)
-      @language   = options[:language] || 'eng'
-      @nod        = options[:nod] == true
+      @output             = options[:output] || '.'
+      @pages              = options[:pages]
+      @force_ocr          = options[:ocr] == true
+      @forbid_ocr         = options[:ocr] == false
+      @clean_ocr          = !(options[:clean] == false)
+      @language           = options[:language] || 'eng'
+      @detect_orientation = options[:detect_orientation] == true
     end
 
   end
 
-end
+end