miniharvest 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5487f82a2fd55c10cc459970c1da3b7e79287f37
-  data.tar.gz: 6a26b3fc11e17f9423bcf0d30ac454718a6593d1
+  metadata.gz: 791be58e05aa79cdfdb62221fde70d7fce93bed9
+  data.tar.gz: 3373ff3347f32cd77c8799e7d9ac5c94ff699e09
 SHA512:
-  metadata.gz: e45e99872470ec95ace48e61f09cee3b9694302d1c857271d6f9a121a51f71fbb0a987f18282d785aff50e6cc70e8d5a394e5e279d358733807856357032be0c
-  data.tar.gz: 120fe7fd9ab4039c48057b806711f6c5aac845d222d426c18175ac1c5d1045072cafa9a058e63d92f922de896d41da0a8fd691c23edc5d7c75d26ddb58e32b50
+  metadata.gz: a1859ee9734e1c3daffbc457e0b3da322bd24dda9e4df8fef89bbccb37b3e72f8aba07f7d1960f0eef4342b78f9025129cbcdc96d5400d3c4784904b491ce7a6
+  data.tar.gz: a273abf2e4ad986a458187bfae60102a7b41f4e08f4b0735951dc4f527280846acab4e2faecea92643e6b2452bbda9124f36a710ae01108487d6f9e7fb56e0ee

data/exe/miniharvest

@@ -2,10 +2,7 @@
 require 'miniharvest'
 require 'nokogiri'
 
-mh = MiniHarvest::MiniHarvest.new
-mh.oai_base_uri = ARGV[0]
-mh.set = ARGV[1]
-mh.from = ARGV[2]
+mh = MiniHarvest::MiniHarvest.new(ARGV[0],ARGV[1],ARGV[2])
 mh.marc_collection = Nokogiri::XML('<collection xmlns="http://www.loc.gov/MARC21/slim">')
-marc_xml = mh.get_records(mh.initial_request)
+marc_xml = mh.get_records(mh.initial_token)
 File.write(ARGV[3], marc_xml.to_xml)

data/lib/miniharvest.rb

@@ -1,48 +1,73 @@
 require "miniharvest/version"
 
+
 module MiniHarvest
   require 'net/http'
   require 'nokogiri'
-  require 'open-uri'
+  require 'logger'
 
   class MiniHarvest 
-     
-    attr_accessor :oai_base_uri, :set, :from, :marc_collection
+    
+    attr_accessor :oai_base_uri, :set, :from, :marc_collection, :logger, :initial_res, :initial_token
+    
+    def initialize(oai_base_uri, set, from)
+      @oai_base_uri = oai_base_uri
+      @set = set
+      @from = from
+      @marc_collection = Nokogiri::XML('<collection xmlns="http://www.loc.gov/MARC21/slim">')
+      @logger = Logger.new(STDOUT)
 
-     def append_to_collection(records)
-       self.marc_collection.root.add_child(records)
+      params = { :verb => 'ListRecords', :set => self.set, :metadataPrefix => 'marc21', :from => self.from }
+      @initial_res = oai_request(self.oai_base_uri,params)
+      @initial_token = get_resumption_token(@initial_res)
+    end
+    
+    def append_to_collection(records)
+      self.marc_collection.root.add_child(records)
     end
 
     def oai_request(uri,params)
       oai_uri = URI(uri)
       oai_uri.query = URI.encode_www_form(params)
-      return Net::HTTP.get_response(oai_uri)
-    end
+      @logger.info(oai_uri.query)
+
+      res = Net::HTTP.get_response(oai_uri)
 
-    def process_request(res)
       doc = Nokogiri::XML(res.body)
       doc.remove_namespaces!
-      records =  doc.xpath('//record')
-      append_to_collection(records)
-      
+
+      return doc
+    end
+
+    def get_resumption_token(doc)
       resumption_token =  doc.xpath('//resumptionToken')
-      return resumption_token.text
+      if resumption_token.length == 1
+        return resumption_token
+      else
+        return false
+      end
     end
-    
-    def initial_request
-      params = { :verb => 'ListRecords', :set => self.set, :metadataPrefix => 'marc21', :from => self.from }
-      res = oai_request(self.oai_base_uri,params)
-      get_records(process_request(res))
+
+    def process_request(doc)
+      token = get_resumption_token(doc)
+      if token != false
+        records =  doc.xpath('//record')
+        append_to_collection(records)
+        return token
+      else
+        return false
+      end
     end
 
     def get_records(token)
-      params = { :verb => 'ListRecords', :resumptionToken => token }
-      res = oai_request(self.oai_base_uri,params)
-      resumption_token = process_request(res)
-      if resumption_token != ""
+      params = { :verb => 'ListRecords', :resumptionToken => token[0].text }
+      doc = oai_request(self.oai_base_uri,params)
+      resumption_token = process_request(doc)
+      
+      if resumption_token != false
         get_records(resumption_token)
       else
-        return self.marc_collection
+        return self.marc_collection.root
       end
     end
   end

data/lib/miniharvest/version.rb

@@ -1,3 +1,3 @@
 module MiniHarvest
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniharvest
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jamie Little
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler