oddb2xml 2.6.9 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57997dab6b06c6ad0aa8bff72b8fb5050f025255
-  data.tar.gz: 57b14760b0448b1cc5a24b4fd7f5f313f3257a19
+SHA256:
+  metadata.gz: f09c85343784bea903af64ee40b29749dfdfc2af55000673244129510276c88a
+  data.tar.gz: 7a8cbd05765da37ec1d582c13bb71758c05a0ddd73773aea5084fa211ebf98d2
 SHA512:
-  metadata.gz: 4b2e2bd8a4ffa584e74422da0c77cf9755c48908bc3c82210a71848109704a59a918bda7092ba3c056dc9e1423317b8ceb94b715639d08e19ecd8b9e95db4e7c
-  data.tar.gz: c277c5c81259a52031f97ce7b346c80e124385efc128f549c97ed4e7f26ab739316ab7dae1b1315842c310c4028dae2db0d1a372a44ea429e3e70382c0acdd4f
+  metadata.gz: 5be02fa2ec4dff0aa6f8c4a4dbfba9cc0f272831fd0b10b6a1af1a18fd3cff3956ad0884de9e81c19c31d60984cc5d234586372aa7a0d34acdab9015cf7252d8
+  data.tar.gz: ea9317a80ad372959d59f0a13614a9a5a8a1f5da3befa9202f5dadbcb23a41523580184c9a769fb512ba7256f5d36b97dffc214424d4d70df499cb35b6c9371e

data/Elexis_Artikelstamm_v5.xsd

@@ -431,9 +431,6 @@
 												</xs:documentation>
 											</xs:annotation>
 										</xs:element>
-										<xs:element name="Chapter70_HACK"
-											type="xs:string" minOccurs="0" maxOccurs="1">
-										</xs:element>
 									</xs:sequence>
 
 

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.7.0 / 05.11.2020
+* Chapter70 hack nur als Kommentar
+* Avoid double hyphen in comment
+
 === 2.6.9 / 29.06.2020
 
 * Fix problem when running bin/oddb2xml -a -f dat. Thanks to Lukas Furre for reporting the problem

data/lib/oddb2xml/builder.rb

@@ -1628,10 +1628,9 @@ module Oddb2xml
               end
              @csv_file << [ ean13, description, '', '', pexf, ppub, '', '', '', '', '', '' ]
               if chap70
-                xml.comment "Chapter70 hack"
+                xml.comment "Chapter70 hack #{ean13.to_s.rjust(13, '0')} #{description.encode(:xml => :text).gsub('--','-')}"
                 xml.SL_ENTRY 'true'
                 xml.PRODNO obj[:pharmacode]
-                xml.Chapter70_HACK 'true'
               end
             end
           end
@@ -1733,7 +1732,7 @@ module Oddb2xml
                   used_limitations << lim_code unless used_limitations.index(lim_code)
                   xml.LIMNAMEBAG lim_code
                 elsif obj[:chapter70]
-                  xml.comment "Chapter70 hack"
+                  xml.comment "Chapter70 hack prodno #{prodno} #{obj[:description].encode(:xml => :text).gsub('--','-')}"
                   xml.SALECD('A') # these products are always active!
                   xml.DSCR obj[:description]
                   xml.DSCRF ''
@@ -1766,7 +1765,7 @@ module Oddb2xml
               end
               emitted_lim_code << lim[:code]
               xml.LIMITATION do
-                xml.comment "Chapter70 hack" if lim[:chap70]
+                xml.comment "Chapter70 2 hack" if lim[:chap70]
                 xml.LIMNAMEBAG lim[:code] # original LIMCD
                 xml.DSCR       Oddb2xml.html_decode(lim[:desc_de])
                 xml.DSCRF      Oddb2xml.html_decode(lim[:desc_fr])

data/lib/oddb2xml/cli.rb

@@ -88,6 +88,7 @@ module Oddb2xml
             puts "Validatied #{@_files[:artikelstamm]}"
          else
             puts "Validating failed using #{cmd}"
+            raise  "Validating failed using #{cmd}"
             exit(2)
          end
       end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.6.9"
+  VERSION = "2.7.0"
 end

data/spec/artikelstamm_spec.rb

@@ -24,7 +24,7 @@ describe Oddb2xml::Builder do
     unless @inhalt.index(expected_value)
       puts expected_value
     end
-    # binding.pry unless @inhalt.index(expected_value)
+    binding.pry unless @inhalt.index(expected_value)
     expect(@inhalt.index(expected_value)).not_to be nil
   end
   def common_run_init(options = {})
@@ -467,9 +467,9 @@ describe Oddb2xml::Builder do
         </ITEM),
         'Chapter 70 product' => %(<PRODUCT>
             <PRODNO>2069639</PRODNO>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack prodno 2069639 Ceres Urtinkturen gemäss L2 mit - im Kommentar-->
             <SALECD>A</SALECD>
-            <DSCR>Ceres Urtinkturen gemäss L2</DSCR>
+            <DSCR>Ceres Urtinkturen gemäss L2 mit -- im Kommentar</DSCR>
             <DSCRF/>
         </PRODUCT>),
         'Chapter 70 item' => %(<ITEM PHARMATYPE="P">
@@ -480,10 +480,9 @@ describe Oddb2xml::Builder do
             <DSCRF>--missing--</DSCRF>
             <PEXF>23.44</PEXF>
             <PPUB>31.30</PPUB>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack 2500000588532 EINF ARZNEI Ceres Urtinktur spez 20ml-->
             <SL_ENTRY>true</SL_ENTRY>
             <PRODNO>2069639</PRODNO>
-            <Chapter70_HACK>true</Chapter70_HACK>
         </ITEM>),
         'HTML-encoded limitation' => %(<DSCR>Zur Erhaltungstherapie (Monotherapie) bei erwachsenen Patientinnen mit rezidiviertem, fortgeschrittenem Ovarialkarzinom mit BRCA Mutation im Anschluss an eine platinhaltige Chemotherapie bei Vorliegen einer kompletten oder partiellen Remission.
 

data/spec/data/varia_De.htm

@@ -197,7 +197,7 @@
 <p>70.01.10</p>
     </td>
     <td width="52%">
-<p>Ceres Urtinkturen gem&auml;ss L2</p>
+<p>Ceres Urtinkturen gem&auml;ss L2 mit -- im Kommentar</p>
     </td>
     <td align="right" width="10%">
 <p>20ml</p>
@@ -2438,4 +2438,4 @@ die Abrechnung zu erleichtern.<br>
 
 </body>
 
-</html>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.7.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -486,8 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.