gared 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b56aa6489168555337a810768f1503c9f6a0458f31b8cb811a885f8e825ae494
-  data.tar.gz: 59dfc804c9796726ec6a606274f69bc7ddde489bb03ac05c6b342ea647a211f2
+  metadata.gz: 8459865216cd87441be5b4b8077bb4d2a1796eab7a7e7949ab0c7f366ba17454
+  data.tar.gz: 69cbdabc561474f27133d99a29848e570e8463534e559f3f40757b368014c0b9
 SHA512:
-  metadata.gz: c3d52c618ae42161ce63b1d1ae6d278ca432de6da95a40ff98a3738c68ef17c7ebe848b3e46e21fbc6cd34bef72749faebf73fa6a26552f55d14d554c735a8eb
-  data.tar.gz: e127a94994c9776fd51669610231f1e14fca82da8a8e21feff51d7812658d25f36cf0671c2e7830e62760dcb69ed99bb54b9668ae95031efb2b1c96b895d4efb
+  metadata.gz: 7621514e31459ceea5bbe01fb5e29a9274c044b8f695645852fed95a3f777e5b991659338a50ee83dae0eca571e21538f655e6fa1c49b083b17aabfeac87e51a
+  data.tar.gz: e9ffaadf371c999ccaf8aff79df49eb01eb86cf15675505efb0fc91b2f0a4c9537de0462812d6f1f9390892b5bfd6802d496846dd5891dc864d2cd003bbdebaa

data/lib/gared/idea.rb

@@ -27,20 +27,35 @@ module Gared
       @browser.input(id: 'cb_update_0').click # "quick search" - not necessarily by author!
       @browser.wait
       ret = []
-      results = @browser.div(id: 'results_list')
-      if results.exists?
-        trs = @browser.div(id: 'results_list').table.rows
-        if trs.size > 0
-          trs.each do |tr|
-            item = tr.tr.tds[1]
-            urlpart = item.h5.a.href
-            p = Publication.new
-            p.title = item.ps[0].text
-            p.author_line = item.ps[1].text.sub('מחבר: ','')
-            p.pub_year = item.ps[2].text.sub('שנה לועזית:','').sub('שנת הוצאה:','')
-
-            p.source_id = urlpart
-            ret << p
+      begin
+        results = @browser.div(id: 'results_list')
+        if results.exists?
+          # total = @browser.div(:class => 'resultSum').text.scan(/מתוך\s+(\d+)/)[0][0].to_i
+          stop = false
+          until stop do 
+            trs = @browser.div(id: 'results_list').table.rows
+            if trs.size > 0
+              trs.each do |tr|
+                item = tr.tr.tds[1]
+                urlpart = item.h5.a.href
+                p = Publication.new
+                p.title = item.ps[0].text # first line is always the title. After that, all bets are off...
+                item.ps.each{|para|
+                  st = para.text.strip
+                  p.author_line = st.sub('מחבר: ','') if st =~ /^מחבר:/
+                  p.pub_year = st.sub('שנה לועזית:','').sub('שנת הוצאה:','') if st =~ /^שנה לועזית:/ or st =~ /^שנת הוצאה:/
+                }
+                p.source_id = urlpart
+                ret << p
+              end
+              nextlink = @browser.a(title: 'הבא')
+              if nextlink.exists?
+                nextlink.click
+                @browser.wait
+              else
+                stop = true
+              end
+            end
           end
           # now that we've extracted everything useful from this page, iterate over the results to pick up the system ID
           ret.each do |item|
@@ -53,11 +68,12 @@ module Gared
             h.source_id = item.source_id
             h.source_name = @options[:opac_url]
             item.add_holding(h)
-          end
+          end          
         end
+      rescue Exception
+        puts $!
       end
       return ret
-      # TODO: support multiple result pages
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gared
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Asaf Bartov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zoom