X-Git-Url: http://jaekl.net/gitweb/?p=quanlib.git;a=blobdiff_plain;f=main.rb;h=e294b4a15e3391a0e4b84d41235b2eee1265ca31;hp=4ea9c7057de2e456b65eecb2fcad0515b3fbc283;hb=HEAD;hpb=0aeb88ddc91aa8f9fd8d93a8004d5df5094a4613

diff --git a/main.rb b/main.rb
index 4ea9c70..e294b4a 100644
--- a/main.rb
+++ b/main.rb
@@ -1,42 +1,50 @@
-require 'navigator'
-require 'page'
-require 'store'
-require 'walkdir'
+require_relative 'navigator'
+require_relative 'page'
+require_relative 'store'
+require_relative 'walk_dir'
 
-outputDir = 'output'
+@outputDir = 'output'
 
-book_ids = []
-imageCount = 0
+@config_file = 'quanlib.ini'
+@skip_class = false
 
 def handleArg(arg)
-  if "--purge" == arg
+  if arg.start_with?("--config=")
+    @config_file = arg[9..-1]
+    puts 'Using config file "' + @config_file + '".'
+  elsif "--purge" == arg
     puts 'Purging database...'
     @store.dropSchema()
-    if File.exists?(Store.unclassified_csv)
-      File.delete(Store.unclassified_csv)
+    if File.exists?(@store.unclassified_csv)
+      File.delete(@store.unclassified_csv)
     end
+  elsif "--skip-class" == arg
+    puts 'Skipping load of classification table.'
+    @skip_class = true
   elsif arg.start_with?("--")
     abort('ERROR:  Unrecognized option "' + arg + '".')
   end
 end
 
-@store = Store.new()
+@store = Store.new(@config_file)
 @store.connect()
 
 for arg in ARGV
   handleArg(arg)
 end
 
-@store.init_db()
+@store.init_db(@skip_class)
 
 for arg in ARGV
   if ! arg.start_with?("--")
     puts 'Scanning directory "' + arg + '"...'
-    w = WalkDir.new(@store, arg)
-    book_ids += (w.books)
+    w = WalkDir.new(@config_file, arg)
+    w.books
   end
 end
 
+@store.cross_reference_lists
+
 puts 'Creating output...'
 
 navigator = Navigator.new(@store)