enju_biblio 0.1.0.pre9 → 0.1.0.pre10

data/app/models/manifestation.rb

@@ -176,7 +176,7 @@ class Manifestation < ActiveRecord::Base
   enju_ndl_search if defined?(EnjuNdl)
   #enju_amazon
   enju_oai if defined?(EnjuOai)
-  #enju_nii
+  enju_nii_cinii_books if defined?(EnjuNii)
   #enju_export
 
   has_paper_trail

data/app/models/patron_import_file.rb

@@ -181,7 +181,16 @@ class PatronImportFile < ActiveRecord::Base
     end
     open(uploaded_file_path){|f|
       f.each{|line|
-        tempfile.puts(NKF.nkf('-w -Lu', line))
+        if defined?(CharlockHolmes::EncodingDetector)
+          begin
+            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect[:encoding])
+          rescue StandardError
+            string = NKF.nkf('-w -Lu', line)
+          end
+        else
+          string = NKF.nkf('-w -Lu', line)
+        end
+        tempfile.puts(string)
       }
     }
     tempfile.close

data/db/migrate/005_create_manifestations.rb

@@ -41,15 +41,15 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false
     end
-    add_index :manifestations, :carrier_type_id
-    add_index :manifestations, :required_role_id
+    #add_index :manifestations, :carrier_type_id
+    #add_index :manifestations, :required_role_id
     add_index :manifestations, :isbn
     add_index :manifestations, :nbn
     add_index :manifestations, :lccn
     add_index :manifestations, :oclc_number
     add_index :manifestations, :issn
     add_index :manifestations, :access_address
-    add_index :manifestations, :frequency_id
+    #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
   end

data/lib/enju_biblio/engine.rb

@@ -9,7 +9,11 @@ require 'dynamic_form'
 require 'simple_form'
 require 'resque_mailer'
 require 'library_stdnums'
-require 'charlock_holmes/string' rescue nil
+require 'nkf'
+begin
+  require 'charlock_holmes/string'
+rescue LoadError
+end
 
 module EnjuBiblio
   class Engine < ::Rails::Engine

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre9"
+  VERSION = "0.1.0.pre10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre9
+  version: 0.1.0.pre10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1188,7 +1188,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_7y4
+- spec/dummy/solr/data/test/index/segments_8fm
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/accepts.rb
@@ -1627,7 +1627,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_7y4
+- spec/dummy/solr/data/test/index/segments_8fm
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/accepts.rb