marc2solr 0.1.3 → 0.1.4

data/CHANGES

@@ -1,3 +1,6 @@
+0.1.4
+  Add dependency on Trollop to Rakefile
+  
 0.1.3
   ...and fixed signature for getISBNs
   

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency 'threach', '>= 0.2.0'
     gem.add_dependency 'logback-simple'
     gem.add_dependency 'library_stdnums', '>=0.2.0'
-
+    gem.add_dependency 'trollop'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/marc2solr

@@ -200,9 +200,7 @@ when "index"
     reader = opts.reader(filename)
     reader.send(method, *args) do |r, i|
       Thread.current[:index] = i
-      
-      $LOG.debug("Indexing record with 001 {}", r['001'])
-      
+            
       doc = ss.doc_from_marc(r, opts[:benchmark])
       
       # Send it to solr

data/lib/marc2solr/marc2solr_custom.rb

@@ -83,13 +83,19 @@ module MARC2Solr
     end
     
     # Extract an ISBN from the given subfields of the 020 and provide
-    # both 10-character and 13-digit versions for each
+    # both 10-character and 13-digit versions for each. If they appear
+    # to not be ISBNs, just return the original value
     
     def self.getISBNS doc, r, codes=['a', 'z']
       rv = []
       r.find_by_tag('020').each do |f|
         f.sub_values(codes).each do |v|
-          rv.concat StdNum::ISBN.allNormalizedValues(v)
+          std = StdNum::ISBN.allNormalizedValues(v)
+          if std.size > 0
+            rv.concat std
+          else
+            rv << v
+          end
         end
       end
       return rv

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 1
-    - 3
-  version: 0.1.3
+    - 4
+  version: 0.1.4
 platform: ruby
 authors: 
   - BillDueber
@@ -100,9 +100,21 @@ dependencies:
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: trollop
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -112,11 +124,11 @@ dependencies:
               - 9
             version: 1.2.9
     type: :development
-    version_requirements: *id007
+    version_requirements: *id008
   - !ruby/object:Gem::Dependency 
     name: yard
     prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    requirement: &id009 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -124,7 +136,7 @@ dependencies:
               - 0
             version: "0"
     type: :development
-    version_requirements: *id008
+    version_requirements: *id009
 description: Given a file of MARC records, send them to Sorl for indexing based on a set of MARCSpecs
 email: bill@dueber.com
 executables: