oddb2xml 1.0.4 → 1.0.5

data/History.txt

@@ -1,6 +1,12 @@
+=== 1.0.5 / 19.10.2012
+
+* Removed unnecessary quote
+* Added PROD_DATE, VALID_DATE as same with creation
+* Added SALECD as STATUS(I,A) of swissindex
+* Added SLOPLUS (FlagSB20) field into article.xml
+
 === 1.0.4 / 18.09.2012
 
-*    Updated option handling.
-    
-        $ oddb2xml
-        $ oddb2xml -c tar.gz
+* Updated option handling.
+  $ oddb2xml
+  $ oddb2xml -c tar.gz

data/lib/oddb2xml/builder.rb

@@ -36,13 +36,14 @@ module Oddb2xml
         seq
       end
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        datetime = Time.new.strftime('%FT%T.%7N%z')
         xml.PRODUCT(
-          'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xmlns'     => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
-          'CREATION_DATETIME' => Time.new.strftime('%FT%T.%7N%z'),
-          'PROD_DATE'         => '',
-          'VALID_DATE'        => ''
+          'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:xsi'         => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns'             => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
+          'CREATION_DATETIME' => datetime,
+          'PROD_DATE'         => datetime,
+          'VALID_DATE'        => datetime,
         ) {
           objects.each do |seq|
             xml.PRD('DT' => '') {
@@ -169,13 +170,14 @@ module Oddb2xml
         objects << object
       end
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        datetime = Time.new.strftime('%FT%T.%7N%z')
         xml.ARTICLE(
-          'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xmlns'     => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
-          'CREATION_DATETIME' => Time.new.strftime('%FT%T.%7N%z'),
-          'PROD_DATE'         => '',
-          'VALID_DATE'        => ''
+          'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:xsi'         => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns'             => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
+          'CREATION_DATETIME' => datetime,
+          'PROD_DATE'         => datetime,
+          'VALID_DATE'        => datetime,
         ) {
           objects.each do |obj|
             de_pac = obj[:de] # swiss index DE (base)
@@ -200,7 +202,9 @@ module Oddb2xml
               #xml.CLINCD
               #xml.ARTTYP
               #xml.VAT
-              #xml.SALECD
+              if de_pac
+                xml.SALECD de_pac[:status].empty? ? 'N' : de_pac[:status]
+              end
               if bg_pac
                 #xml.INSLIM
                 xml.LIMPTS bg_pac[:limitation_points] unless bg_pac[:limitation_points].empty?
@@ -227,7 +231,13 @@ module Oddb2xml
                 xml.SYN1D obj[:seq][:name_de] unless obj[:seq][:name_de].empty?
                 xml.SYN1F obj[:seq][:name_fr] unless obj[:seq][:name_fr].empty?
               end
-              #xml.SLOPLUS
+              if obj[:seq]
+                case obj[:seq][:deductible]
+                when 'Y'; xml.SLOPLUS 1; # 20%
+                when 'N'; xml.SLOPLUS 2; # 10%
+                else      xml.SLOPLUS '' # k.A.
+                end
+              end
               #xml.NOPCS
               #xml.HSCD
               #xml.MINI

data/lib/oddb2xml/cli.rb

@@ -45,7 +45,7 @@ EOS
           extractor = SwissIndexExtractor.new(xml)
           index = extractor.to_hash
           #@mutex.synchronize do
-            @index["#{lang}"] = index
+            @index[lang] = index
           #end
         #end
       end

data/lib/oddb2xml/extractor.rb

@@ -25,6 +25,7 @@ module Oddb2xml
         item[:name_de]      = (name = seq.at_xpath('.//NameDe'))        ? name.text : ''
         item[:name_fr]      = (name = seq.at_xpath('.//NameFr'))        ? name.text : ''
         item[:org_gen_code] = (orgc = seq.at_xpath('.//OrgGenCode'))    ? orgc.text : ''
+        item[:deductible]   = (ddbl = seq.at_xpath('.//FlagSB20'))      ? ddbl.text : ''
         item[:atc_code]     = (orgc = seq.at_xpath('.//AtcCode'))       ? orgc.text : ''
         item[:comment_de]   = (info = seq.at_xpath('.//CommentDe'))     ? info.text : ''
         item[:comment_fr]   = (info = seq.at_xpath('.//CommentFr'))     ? info.text : ''

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16734560 !ruby/object:Gem::Requirement
+  requirement: &11942900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *16734560
+  version_requirements: *11942900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &14447420 !ruby/object:Gem::Requirement
+  requirement: &11942440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *14447420
+  version_requirements: *11942440
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com