pkm_level2_converter 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4b2395882a262593bc5f25148d8cca36e9a6bfca27cd98d59090501d76e04c
-  data.tar.gz: bd2be0b4c5ce218d418a6724c5b3c069f65418c895fc344ce11df9314b3cae93
+  metadata.gz: 97c43176a6dc371c0603050b13f197d0ba563aa1cc0259a9fc9749db2b7f9a56
+  data.tar.gz: 7e01836579a624c1066cac0e0e49710fff71f8910f5da1155965e4be18ba70a1
 SHA512:
-  metadata.gz: de8cb77e36efc2939edc0cf83488ce780a5a868358e4dd5352bceaf4612e93094727e98b4f34408690ff9a25d3111439f6f70b0de788faf8f8cf8219e980a175
-  data.tar.gz: a36b0392d7aa30791240e2710bff4efc55dac23edefc6d7dfac11d8767ae0851b23a09fe7d131c5a14b5197f469eb0956bfac5ac1c6a73332eb86413ad0e5c7f
+  metadata.gz: 826a1cf5808b3ce435128532809e26555a4dee14e62fc54921dddce269eef0bc2c06759a606d64ac1c737d1c0660135ffeeaf40138b56e11bd471b98bd8143d6
+  data.tar.gz: f5b359813d967af6db08445b308cd59227edfb022fc5270e36121e00a5b683001adabb8b715225d5a3d0aca1d91eaa5c6f005ffcfaa85d168154baf0d8453fa9

data/.gitignore

@@ -1,5 +1,3 @@
-test/*.xml
-
 /.bundle/
 /.yardoc
 /_yardoc/

data/Gemfile.lock

@@ -1,38 +1,39 @@
-PATH
-  remote: .
-  specs:
-    pkm_level2_converter (0.1.1)
-      nokogiri (~> 1.10.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.10-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  pkm_level2_converter!
-  rake (~> 13.0)
-  rspec (~> 3.2)
-
-BUNDLED WITH
-   2.2.20
+PATH
+  remote: .
+  specs:
+    pkm_level2_converter (0.2.0)
+      nokogiri (~> 1.10.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+
+PLATFORMS
+  x64-mingw-ucrt
+  x64-mingw32
+
+DEPENDENCIES
+  pkm_level2_converter!
+  rake (~> 13.0)
+  rspec (~> 3.2)
+
+BUNDLED WITH
+   2.2.20

data/lib/pkm_level2_converter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PkmLevel2Converter
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/pkm_level2_converter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'nokogiri'
+require 'pathname'
 require_relative "pkm_level2_converter/version"
 
 module PkmLevel2Converter
@@ -14,17 +15,13 @@ module PkmLevel2Converter
     end
   
     def convertFileName()
-      file_name = @filename
-      #puts file_name
-      f = file_name.split('_')
-      #puts f
+      pn = Pathname.new(@filename)
+      dir, base = File.split(pn)
+      f = base.split('_')
       org_id_l3 = f[1].to_i
-      #puts org_id_l3
       org_id_l2 = org_id_l3 + 0x8000 
-      #puts org_id_l2
       f[1] = org_id_l2.to_s
-      #puts f.join("_")
-      return f.join("_")
+      return Pathname.new(dir).join(f.join("_"))
     end
   
     def save_file(file)
@@ -56,7 +53,17 @@ module PkmLevel2Converter
       orig_file_name = @filename
       if File.file?(orig_file_name) 
         @xml_doc = File.open(orig_file_name) { |f| Nokogiri::XML(f) }
-        convert_ids
+        case @xml_doc.root.name
+        when "pv-km"
+          convert_ids_pvkm
+        when "dl-km"
+          convert_ids_dlkm
+        when "rntm"
+          convert_ids_rntm
+        else
+          puts(@xml_doc.root.name + " wird nicht unterstützt.")
+        end
+
         if xml_is_valid_pkm(@xml_doc) 
           save_file(@xml_doc)
         end
@@ -67,7 +74,18 @@ module PkmLevel2Converter
   
     def xml_is_valid_pkm(xml)
       #xsd =  File.read("./ka/pkm/1/XML-Schema_PKM.xsd")
-      file_path = File.join(File.dirname(__FILE__), './pkm_level2_converter/ka/pkm/1/XML-Schema_PKM.xsd') 
+      path=''
+      case @xml_doc.root.name
+      when "pv-km"
+        path = './pkm_level2_converter/ka/pkm/1/XML-Schema_PKM.xsd'
+      when "dl-km"
+        path = './pkm_level2_converter/ka/pkm/1/XML-Schema_PKM.xsd'
+      when "rntm"
+        path = './pkm_level2_converter/ka/pkm/2/XML-Schema_PKM.xsd'
+      end
+
+      file_path = File.join(File.dirname(__FILE__), path) 
+  
       xsd =  File.read(file_path)
       return self.check_xsd(xsd,xml)
     end
@@ -78,7 +96,7 @@ module PkmLevel2Converter
       map.content = (id + 0x8000).to_s
     end
   
-    def convert_ids
+    def convert_ids_dlkm
       #Organisations-ID des DL: 
       #dl-km/organisation/id
       convert_xpath_l3_id(@xml_doc, 'xmlns:dl-km/xmlns:organisation/xmlns:id')
@@ -101,7 +119,57 @@ module PkmLevel2Converter
       #Für Anzeige von KVP als Klartext:
       #dl-km/kontrollmodul-pool/item/moduldaten/nummerninterpretation-pool/item[nr=2]/nummerntext-pool/item/nr
     end
-  
+
+    def convert_ids_pvkm
+      #Organisations-ID des DL: 
+      #dl-km/organisation/id
+      # convert_xpath_l3_id(@xml_doc, 'xmlns:dl-km/xmlns:organisation/xmlns:id')
+      # puts "Converted following IDs:"
+      # puts "/dl-km/organisation/id = " + @xml_doc.xpath('/xmlns:dl-km/xmlns:organisation/xmlns:id').text
+      
+      # @xml_doc.xpath('/xmlns:dl-km/xmlns:kontrollmodul-pool/xmlns:item').each do |node|
+        node = @xml_doc.xpath('/xmlns:pv-km')
+        #Organisations-ID des PV:
+        #dl-km/kontrollmodul-pool/item/moduldaten/organisation/id
+        # convert_xpath_l3_id(node, '/xmlns:pv-km/xmlns:organisation/xmlns:id')
+        convert_xpath_l3_id(node, 'xmlns:organisation/xmlns:id')
+        puts "# pv-km/organisation/id = " + node.xpath('xmlns:organisation/xmlns:id').text
+        #Für PVKM zulässige Organisations-IDs der DL:
+        #dl-km/kontrollmodul-pool/item/moduldaten/organisation-pool/item/id
+        node.xpath('xmlns:organisation-pool/xmlns:item').each do |child| 
+          convert_xpath_l3_id(child, 'xmlns:id')
+          puts "## pv-km/organisation-pool/item/id = " + child.xpath('xmlns:id').text
+        end
+      # end
+      #Für Anzeige von KVP als Klartext:
+      #dl-km/kontrollmodul-pool/item/moduldaten/nummerninterpretation-pool/item[nr=2]/nummerntext-pool/item/nr
+    end
+    
+    def convert_ids_rntm
+      #Organisations-ID des RN: 
+      #rntm/herausgeber/nr
+      convert_xpath_l3_id(@xml_doc, 'xmlns:rntm/xmlns:herausgeber/xmlns:nr')
+      puts "Converted following IDs:"
+      puts "rntm/herausgeber/nr = " + @xml_doc.xpath('xmlns:rntm/xmlns:herausgeber/xmlns:nr').text
+      
+      @xml_doc.xpath('/xmlns:rntm/xmlns:tarifmodul-pool/xmlns:item').each do |node|
+      
+        #Organisations-ID des PV:
+        #dl-km/kontrollmodul-pool/item/moduldaten/organisation/id
+        
+        convert_xpath_l3_id(node, 'xmlns:tarifmodul/xmlns:herausgeber/xmlns:nr')
+        puts "# /rntm/tarifmodul-pool/item/tarifmodul/herausgeber/nr/ = " + node.xpath('xmlns:tarifmodul/xmlns:herausgeber/xmlns:nr').text
+        #Für PVKM zulässige Organisations-IDs der DL:
+        #dl-km/kontrollmodul-pool/item/moduldaten/organisation-pool/item/id
+        node.xpath('xmlns:tarifmodul/xmlns:organisation-pool/xmlns:item').each do |child| 
+          convert_xpath_l3_id(child, 'xmlns:nr')
+          puts "## /rntm/tarifmodul-pool/item/tarifmodul/organisation-pool/item/nr = " + child.xpath('xmlns:nr').text
+        end
+      end
+      #Für Anzeige von KVP als Klartext:
+      #dl-km/kontrollmodul-pool/item/moduldaten/nummerninterpretation-pool/item[nr=2]/nummerntext-pool/item/nr
+    end
+
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkm_level2_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Francis Doege
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -57,8 +57,6 @@ files:
 - bin/console
 - bin/setup
 - exe/pkmlevel2
-- lib/conv_PV_KM.rb
-- lib/conv_RN_TM.rb
 - lib/pkm_level2_converter.rb
 - lib/pkm_level2_converter/ka/pkm/1/XML-Schema_PKM.xsd
 - lib/pkm_level2_converter/ka/pkm/1/XML-Schema_PKM_TX.xsd
@@ -89,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Converts PKM modules for testing

data/lib/conv_PV_KM.rb

@@ -1,75 +0,0 @@
-require 'nokogiri'
-#require 'pry'
-require_relative 'check_xsd'
-
-def convertFileName(file_name)
-  f = file_name.split('_')
-  org_id_l3 = f[1].to_i
-  org_id_l2 = org_id_l3 + 0x8000 
-  f[1] = org_id_l2.to_s
-  return f.join("_")
-end
-
-def safe_file(file, new_file_name)
-  #SAVE FILE with NEW name
-  output = File.open( new_file_name, "w" )
-  output << file.to_xml(:indent_text => "", :indent => 0).gsub(/>\n/,">")
-  output.close
-  puts "File saved as: #{new_file_name}"  
-  
-end
-
-def convert_pkm(orig_file_name)
-  if File.file?(orig_file_name) 
-    new_file_name = convertFileName(orig_file_name)
-    @xml_doc = File.open(orig_file_name) { |f| Nokogiri::XML(f) }
-    convert_ids
-    if xml_is_valid_pkm(@xml_doc) 
-      safe_file(@xml_doc, new_file_name)
-    end
-  else 
-    puts "File ('#{orig_file_name}') not found."    
-  end
-end
-
-def xml_is_valid_pkm(xml)
-  #xsd =  File.read("./ka/pkm/1/XML-Schema_PKM.xsd")
-  file_path = File.join(File.dirname(__FILE__), './ka/pkm/1/XML-Schema_PKM.xsd') 
-  xsd =  File.read(file_path)
-  return check_xsd(xsd,xml)
-end
-
-def convert_xpath_l3_id(node, x_path)
-  map = node.at_xpath x_path
-  id = map.content.to_i
-  map.content = (id + 0x8000).to_s
-end
-
-def convert_ids
-  #Organisations-ID des DL: 
-  #dl-km/organisation/id
-  # convert_xpath_l3_id(@xml_doc, 'xmlns:dl-km/xmlns:organisation/xmlns:id')
-  # puts "Converted following IDs:"
-  # puts "/dl-km/organisation/id = " + @xml_doc.xpath('/xmlns:dl-km/xmlns:organisation/xmlns:id').text
-  
-  # @xml_doc.xpath('/xmlns:dl-km/xmlns:kontrollmodul-pool/xmlns:item').each do |node|
-    node = @xml_doc.xpath('/xmlns:pv-km')
-    #Organisations-ID des PV:
-    #dl-km/kontrollmodul-pool/item/moduldaten/organisation/id
-    # convert_xpath_l3_id(node, '/xmlns:pv-km/xmlns:organisation/xmlns:id')
-    convert_xpath_l3_id(node, 'xmlns:organisation/xmlns:id')
-    puts "# pv-km/organisation/id = " + node.xpath('xmlns:organisation/xmlns:id').text
-    #Für PVKM zulässige Organisations-IDs der DL:
-    #dl-km/kontrollmodul-pool/item/moduldaten/organisation-pool/item/id
-    node.xpath('xmlns:organisation-pool/xmlns:item').each do |child| 
-      convert_xpath_l3_id(child, 'xmlns:id')
-      puts "## pv-km/organisation-pool/item/id = " + child.xpath('xmlns:id').text
-    end
-  # end
-  #Für Anzeige von KVP als Klartext:
-  #dl-km/kontrollmodul-pool/item/moduldaten/nummerninterpretation-pool/item[nr=2]/nummerntext-pool/item/nr
-end
-
-orig_file_name = ARGV.first
-convert_pkm(orig_file_name)
-

data/lib/conv_RN_TM.rb

@@ -1,73 +0,0 @@
-require 'nokogiri'
-#require 'pry'
-require_relative 'check_xsd'
-
-def convertFileName(file_name)
-  f = file_name.split('_')
-  org_id_l3 = f[1].to_i
-  org_id_l2 = org_id_l3 + 0x8000 
-  f[1] = org_id_l2.to_s
-  return f.join("_")
-end
-
-def safe_file(file, new_file_name)
-  #SAVE FILE with NEW name
-  output = File.open( new_file_name, "w" )
-  output << file.to_xml(:indent_text => "", :indent => 0).gsub(/>\n/,">")
-  output.close
-  puts "File saved as: #{new_file_name}"  
-  
-end
-
-def convert_pkm(orig_file_name)
-  if File.file?(orig_file_name) 
-    new_file_name = convertFileName(orig_file_name)
-    @xml_doc = File.open(orig_file_name) { |f| Nokogiri::XML(f) }
-    convert_ids
-    if xml_is_valid_pkm(@xml_doc) 
-      safe_file(@xml_doc, new_file_name)
-    end
-  else 
-    puts "File ('#{orig_file_name}') not found."    
-  end
-end
-
-def xml_is_valid_pkm(xml)
-  xsd =  File.read("ka/pkm/2/XML-Schema_PKM.xsd")
-  return check_xsd(xsd,xml)
-end
-
-def convert_xpath_l3_id(node, x_path)
-  map = node.at_xpath x_path
-  id = map.content.to_i
-  map.content = (id + 0x8000).to_s
-end
-
-def convert_ids
-  #Organisations-ID des RN: 
-  #rntm/herausgeber/nr
-  convert_xpath_l3_id(@xml_doc, 'xmlns:rntm/xmlns:herausgeber/xmlns:nr')
-  puts "Converted following IDs:"
-  puts "rntm/herausgeber/nr = " + @xml_doc.xpath('xmlns:rntm/xmlns:herausgeber/xmlns:nr').text
-  
-  @xml_doc.xpath('/xmlns:rntm/xmlns:tarifmodul-pool/xmlns:item').each do |node|
-  
-    #Organisations-ID des PV:
-    #dl-km/kontrollmodul-pool/item/moduldaten/organisation/id
-    
-    convert_xpath_l3_id(node, 'xmlns:tarifmodul/xmlns:herausgeber/xmlns:nr')
-    puts "# /rntm/tarifmodul-pool/item/tarifmodul/herausgeber/nr/ = " + node.xpath('xmlns:tarifmodul/xmlns:herausgeber/xmlns:nr').text
-    #Für PVKM zulässige Organisations-IDs der DL:
-    #dl-km/kontrollmodul-pool/item/moduldaten/organisation-pool/item/id
-    node.xpath('xmlns:tarifmodul/xmlns:organisation-pool/xmlns:item').each do |child| 
-      convert_xpath_l3_id(child, 'xmlns:nr')
-      puts "## /rntm/tarifmodul-pool/item/tarifmodul/organisation-pool/item/nr = " + child.xpath('xmlns:nr').text
-    end
-  end
-  #Für Anzeige von KVP als Klartext:
-  #dl-km/kontrollmodul-pool/item/moduldaten/nummerninterpretation-pool/item[nr=2]/nummerntext-pool/item/nr
-end
-
-orig_file_name = ARGV.first
-convert_pkm(orig_file_name)
-