brand2csv 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.3 06.06.2013
+
+* Added option --swiss_only
+
 === 0.2.2 05.06.2013
 
 * Fixed (re-)opening of session

data/bin/brand2csv

@@ -18,11 +18,13 @@ Usage:
       brand2csv 1.10.2005-31.10.2005 #this will work as well from version 0.1.9
     The results are stored in the file <date_selected>.csv.
     The trademark name is either a real brand name or a link to an image.
+  --swiss_only Fetch only trademarks from swiss owner
 EOS
 end
 
 parser = OptionParser.new
 opts = {}
+parser.on('--swiss_only') {|v| opts[:swiss_only] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup
@@ -42,7 +44,7 @@ unless args.size >= 1
 end
 
 begin
-  Brand2csv::run(args[0], args[1])
+  Brand2csv::run(args[0], args[1], opts[:swiss_only])
 rescue Interrupt
   puts "Unterbrochen. Breche mit Fehler ab"
   exit 1

data/lib/brand2csv.rb

@@ -89,9 +89,10 @@ module Brand2csv
     
     attr_accessor :marke, :results, :timespan
     
-    def initialize(timespan, marke = nil)
+    def initialize(timespan, marke = nil, swiss_only=false)
       @timespan = timespan
       @marke = marke
+      @swiss_only = swiss_only
       @number = nil
       @results = []
       @all_trademark_numbers = []
@@ -182,7 +183,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", '_ALL'],
+        ["id_swissreg:mainContent:id_cbxCountry", @swiss_only ? 'CH' : '_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.
@@ -535,8 +536,8 @@ module Brand2csv
     end
   end # class Swissreg
   
-  def Brand2csv::run(timespan, marke = 'a*')
-    session = Swissreg.new(timespan, marke)
+  def Brand2csv::run(timespan, marke = 'a*', swiss_only = false)
+    session = Swissreg.new(timespan, marke, swiss_only)
     begin
       session.parse_swissreg
       session.fetchresult

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

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