brand2csv 0.2.0 → 0.2.1

data/History.txt

@@ -1,6 +1,12 @@
+=== 0.2.1 02.06.2013
+
+* Fixed problems with ampersands. Emit clear error when swisssreg.ch not responding correctly
+
 === 0.2.0 02.06.2013
 
 * Updated README.md
+* Fix problem with & in names
+* Catch "500 Internal Server Error" when connecting to swissreg
 
 === 0.1.9 02.06.2013
 

data/lib/brand2csv.rb

@@ -18,6 +18,7 @@ module Brand2csv
       # Weitere gesehene Fehler
     BekannteFehler = 
           ['Das Datum ist ung', # ültig'
+           '500 Internal Server Error',
            'Vereinfachte Trefferliste anzeigen',
             'Es wurden keine Daten gefunden.',
             'Die Suchkriterien sind teilweise unzul', # ässig',
@@ -134,11 +135,17 @@ module Brand2csv
                       marke = @marke,    
                       nummer =@number) #  nummer = "559271" ergibt genau einen treffer
 
-      @agent.get_file  Start_uri # 'https://www.swissreg.ch/srclient/faces/jsp/start.jsp'
-      writeResponse("#{LogDir}/session_expired.html")
-      @agent.page.links[3].click
-      writeResponse("#{LogDir}/homepage.html")
-      @state = @agent.page.form["javax.faces.ViewState"]
+      begin
+        @agent.get_file  Start_uri # 'https://www.swissreg.ch/srclient/faces/jsp/start.jsp'
+        writeResponse("#{LogDir}/session_expired.html")
+        checkErrors(@agent.page.body, false)
+        @agent.page.links[3].click
+        writeResponse("#{LogDir}/homepage.html")
+        @state = @agent.page.form["javax.faces.ViewState"]
+      rescue Net::HTTPInternalServerError, Mechanize::ResponseCodeError
+        puts "Net::HTTPInternalServerError oder Mechanize::ResponseCodeError gesehen.\n   #{Base_uri} hat wahrscheinlich Probleme"
+        exit 3
+      end
       data = [
         ["autoScroll", "0,0"],
         ["id_swissreg:_link_hidden_", ""],
@@ -169,7 +176,7 @@ module Brand2csv
         ["id_swissreg:mainContent:id_txf_app_no", ""],                       # Gesuch Nr.
         ["id_swissreg:mainContent:id_txf_tm_text", "#{marke}"],
         ["id_swissreg:mainContent:id_txf_applicant", ""],                    # Inhaber/in
-        ["id_swissreg:mainContent:id_cbxCountry", "CH"],
+        ["id_swissreg:mainContent:id_cbxCountry", '_ALL'],
         ["id_swissreg:mainContent:id_txf_agent", ""],                         # Vertreter/in
         ["id_swissreg:mainContent:id_txf_licensee", ""], # Lizenznehmer
         ["id_swissreg:mainContent:id_txf_nizza_class", ""], # Nizza Klassifikation Nr.
@@ -211,7 +218,8 @@ module Brand2csv
 
     # the number is only passed to facilitate debugging
     # lines are the address lines 
-    def Swissreg::parseAddress(number, lines)
+    def Swissreg::parseAddress(number, inhaber)
+      lines = CGI.unescapeHTML(inhaber).split(LineSplit)
       ort = nil
       plz = nil
       
@@ -307,13 +315,14 @@ module Brand2csv
             end
           end
           if x.children.first.text.eql?('Inhaber/in')
-            inhaber = />(.*)<\/td/.match(x.children[1].to_s)[1].gsub('<br>',LineSplit).gsub('&amp;', '&')
-            x.children[1].children.each{ |child| zeilen << child.text.gsub('&amp;', '&') unless child.text.length == 0 } # avoid adding <br>
+#            inhaber = />(.*)<\/td/.match(x.children[1].to_s)[1].gsub('<br>',LineSplit).gsub('&amp;', '&')
+#            x.children[1].children.each{ |child| zeilen << child.text.gsub('&amp;', '&') unless child.text.length == 0 } # avoid adding <br>
+             inhaber = />(.*)<\/td/.match(x.children[1].to_s)[1].gsub('<br>',LineSplit)
           end
           hinterlegungsdatum = x.children[1].text if x.children.first.text.eql?('Hinterlegungsdatum')           
           number = x.children[1].text if x.children.first.text.eql?('Gesuch Nr.')           
       }
-      zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, zeilen)
+      zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, inhaber)
       marke = Marke.new(bezeichnung, number,  inhaber,  DefaultCountry,  hinterlegungsdatum, zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort )
     end
     

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/utilities_spec.rb

@@ -38,7 +38,7 @@ describe 'Tests parsing adress line' do
   it "must handle correctly Via San Salvatore, 2" do
     full_address_line = 'Ideal Hobby Sagl, Via San Salvatore, 2, 6902 Paradiso'
     number = 'for_debugging'
-    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line.split(Swissreg::LineSplit))
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
     zeile_1.should == 'Ideal Hobby Sagl'
     zeile_2.should == 'Via San Salvatore, 2'
     zeile_3.should be_nil
@@ -49,7 +49,7 @@ describe 'Tests parsing adress line' do
   it "must handle correctly 90, route de Frontenex" do    
     full_address_line = 'Olivier Karim Wasem, 90, route de Frontenex, 1208 Genève'
     number = 'for_debugging'
-    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line.split(Swissreg::LineSplit))
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
     zeile_1.should == 'Olivier Karim Wasem'
     zeile_2.should == '90, route de Frontenex'
     zeile_3.should be_nil
@@ -60,11 +60,13 @@ describe 'Tests parsing adress line' do
   it "must handle ampersands correctly" do
     full_address_line = 'Schweiz. Serum- & Impfinstitut, und Institut zur Erforschung der, Infektionskrankheiten, Rehhagstrasse 79, 3018 Bern'    
     number = 'for_debugging'
-    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line.split(Swissreg::LineSplit))
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
     zeile_1.should == 'Schweiz. Serum- & Impfinstitut'
-    zeile_2.should be_nil
-    zeile_3.should be_nil
-    plz.should be_nil
-    ort.should be_nil
+    zeile_2.should == 'und Institut zur Erforschung der'
+    zeile_3.should == 'Infektionskrankheiten'
+    zeile_4.should == 'Rehhagstrasse 79'
+    zeile_5.should be_nil
+    plz.should == '3018'
+    ort.should == 'Bern'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brand2csv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: