bin/oddb2xml in oddb2xml-1.2.5 vs bin/oddb2xml in oddb2xml-1.2.6

@@ -16,11 +16,13 @@
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
     -c F, --compress=F   Compress format F. {tar.gz|zip}
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -o O, --optional=O   Optional output. O, only 'fi' is available.
-    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9_]
+    -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
+                         'xml' format includes always ean14 records.
+    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
     -h,   --help         Show this help message.
 EOS
 end
 
@@ -30,17 +32,19 @@
   :compress_ext => nil,
   :format       => :xml,
   :fi           => false,
   :tag_suffix   => nil,
   :debug        => false,
+  :ean14        => false,
 }
 
-parser.on('-a v', '--append v',     /nonpharma/)     {|v| opts[:nonpharma] = true }
-parser.on('-c v', '--compress v',   /tar\.gz|zip/)   {|v| opts[:compress_ext] = v }
-parser.on('-f v', '--format v',     /dat/)           {|v| opts[:format] = :dat }
-parser.on('-o v', '--optional v',   /fi/)            {|v| opts[:fi] = true }
-parser.on('-t v', '--tag-suffix v', /^[A-z0-9_]*$/i) {|v| opts[:tag_suffix] = v.upcase }
+parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
+parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
+parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
+parser.on('-o v', '--optional v',   /^fi$/)         {|v| opts[:fi] = true }
+parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }
+parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
 #parser.on('--debug') {|v| opts[:debug] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup
 begin
@@ -52,9 +56,12 @@
   exit
 end
 
 ui = Oddb2xml::Cli.new(opts)
 begin
+  if opts[:format] == :xml
+    opts[:ean14] = true # force
+  end
   #puts opts if opts[:debug]
   ui.run
 rescue Interrupt
   puts
   exit