brand2csv 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.7 27.08.2013
+
+* Update to handle too many result view in swissreg
+
 === 0.2.6 26.08.2013
 
 * Update to work with ruby 1.8.7

data/lib/brand2csv.rb

@@ -10,6 +10,7 @@ require 'logger'
 
 module Brand2csv
 
+
   class Marke < Struct.new(:name, :markennummer, :inhaber, :land, :hinterlegungsdatum, :zeile_1, :zeile_2, :zeile_3, :zeile_4, :zeile_5, :plz, :ort)
   end
 
@@ -420,11 +421,18 @@ module Brand2csv
       # There we find info like "Seite 1 von 26 - Treffer 1-250 von 6'349" and upto 250 links to details
       def initialize(doc)
         @inputData = []
+        @pageNr = @nrSubPages = @firstHit = @nrHits = 0
         m = HitRegexpDE.match(doc.text)
-        @pageNr = m[1].sub("'", '').to_i
-        @nrSubPages = m[2].sub("'", '').to_i
-        @firstHit = m[3].sub("'", '').to_i
-        @nrHits = m[5].sub("'", '').to_i
+        if m
+          begin
+            c = m.to_a.map{|n| n.gsub(/'/, "").to_i }
+            @pageNr     = c[1]
+            @nrSubPages = c[2]
+            @firstHit   = c[3]
+            @nrHits     = c[5]
+          rescue NoMethodError
+          end
+        end
         @trademark_search_id = Swissreg::inputValue(Swissreg::getInputValuesFromPage(doc), Vivian)
         @links2details = []
         doc.search('input').each{ |input| 
@@ -478,13 +486,19 @@ module Brand2csv
       if filename && File.exists?(filename)
         doc = Nokogiri::Slop(File.open(filename))        
       else
-        body = @agent.page.body
+        form = @agent.page.form
+        btn  = form.buttons.last
+        if btn && btn.name == "id_swissreg:mainContent:id_show_simple_view_hitlist"
+          res = @agent.submit(form, btn)
+          body = res.body
+        else
+         body = @agent.page.body
+        end
         body.force_encoding('utf-8') unless /^1\.8/.match(RUBY_VERSION)
         doc = Nokogiri::Slop(body)
         filename = "#{LogDir}/vereinfachte_#{pageNr}.html"
         writeResponse(filename)
       end
-      
       einfach = Swissreg::Vereinfachte.new(doc)
       puts "#{Time.now.strftime("%H:%M:%S")} status: getAllHits for #{pageNr} of #{einfach.nrSubPages} pages"  if $VERBOSE
       subPage2Fetch = pageNr + 1

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brand2csv
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Niklaus Giger, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-26 00:00:00 Z
+date: 2013-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize