Corregeix els includes que schematron-wrapper no tracta bé

Els hi he obert issue Agilefreaks/schematron-wrapper#9
descala · Nov 22, 2019 · 3b387ad · 3b387ad
1 parent 0fb1995
commit 3b387ad
Show file tree

Hide file tree

Showing 10 changed files with 2,120 additions and 1 deletion.
diff --git a/bin/create_xmlns_symlinks b/bin/create_xmlns_symlinks
@@ -2,5 +2,7 @@
 
 require "bundler/setup"
 require "xsd/validator"
+require "sch/validator"
 
 Xsd::Validator.symlink
+Sch::Validator.compile
diff --git a/lib/sch/compiled/BIIRULES-UBL-T10.sch.xslt b/lib/sch/compiled/BIIRULES-UBL-T10.sch.xslt
diff --git a/lib/sch/compiled/OPENPEPPOL-UBL-T10.sch.xslt b/lib/sch/compiled/OPENPEPPOL-UBL-T10.sch.xslt
diff --git a/lib/sch/schemas/BII CORE/BIICORE-UBL-T10.sch → lib/sch/schemas/BII_CORE/BIICORE-UBL-T10.sch b/lib/sch/schemas/BII CORE/BIICORE-UBL-T10.sch → lib/sch/schemas/BII_CORE/BIICORE-UBL-T10.sch
diff --git a/...ch/schemas/BII RULES/BIIRULES-UBL-T10.sch → ...ch/schemas/BII_RULES/BIIRULES-UBL-T10.sch b/...ch/schemas/BII RULES/BIIRULES-UBL-T10.sch → ...ch/schemas/BII_RULES/BIIRULES-UBL-T10.sch
diff --git a/...chemas/BII RULES/UBL/BIIRULES-UBL-T10.sch → ...chemas/BII_RULES/UBL/BIIRULES-UBL-T10.sch b/...chemas/BII RULES/UBL/BIIRULES-UBL-T10.sch → ...chemas/BII_RULES/UBL/BIIRULES-UBL-T10.sch
diff --git a/...hemas/BII RULES/abstract/BIIRULES-T10.sch → ...hemas/BII_RULES/abstract/BIIRULES-T10.sch b/...hemas/BII RULES/abstract/BIIRULES-T10.sch → ...hemas/BII_RULES/abstract/BIIRULES-T10.sch
diff --git a/...I RULES/codelist/BIIRULESCodesT10-UBL.sch → ...I_RULES/codelist/BIIRULESCodesT10-UBL.sch b/...I RULES/codelist/BIIRULESCodesT10-UBL.sch → ...I_RULES/codelist/BIIRULESCodesT10-UBL.sch
diff --git a/...PENPEPPOL CORE/OPENPEPPOLCORE-UBL-T10.sch → ...PENPEPPOL_CORE/OPENPEPPOLCORE-UBL-T10.sch b/...PENPEPPOL CORE/OPENPEPPOLCORE-UBL-T10.sch → ...PENPEPPOL_CORE/OPENPEPPOLCORE-UBL-T10.sch
diff --git a/lib/sch/validator.rb b/lib/sch/validator.rb
@@ -46,12 +46,20 @@ def self.compile
       Dir.chdir('lib/sch/schemas/') do
         Dir["*.sch","*/*.sch"].each do |schematron_file|
           cache_xslt = "../compiled/#{File.basename(schematron_file)}.xslt"
-          compiled_schematron = Schematron::XSLT2.compile(File.read(schematron_file))
+          compiled_schematron = schematron_compile(schematron_file)
           File.write(cache_xslt, compiled_schematron)
         end
       end
     end
 
+    # schematron-wrapper patch ################
+    def self.schematron_compile(file_path)
+      # process_includes does not work in /tmp. it needs access to included files
+      temp_schematron = Schematron::XSLT2.execute_transform(Schematron::XSLT2::DSDL_INCLUDES_PATH, file_path)
+      temp_schematron = Schematron::XSLT2.expand_abstract_patterns(temp_schematron)
+      Schematron::XSLT2.create_stylesheet(temp_schematron)
+    end
+
     private
 
     def xslt_path(name)