You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by ja...@apache.org on 2022/10/19 18:53:46 UTC

[daffodil] branch main updated: Pass schemas to Exificient via String, not stream

This is an automated email from the ASF dual-hosted git repository.

jadams pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git


The following commit(s) were added to refs/heads/main by this push:
     new bf4f232ee Pass schemas to Exificient via String, not stream
bf4f232ee is described below

commit bf4f232eef97515d33ff061f380cc2d216b304b5
Author: Josh Adams <ja...@owlcyberdefense.com>
AuthorDate: Wed Oct 19 08:05:19 2022 -0400

    Pass schemas to Exificient via String, not stream
    
    Passing the schemas in by stream resulted in not having correct path
    information and made it impossible for the DFDLCatalogResolver to
    resolve the paths to included schemas. Instead we want to pass the path
    of the schema in to Exificient and maintain that correct path
    information.
    
    DAFFODIL-1959
---
 daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
index 97dbdc8cc..a874f823d 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
@@ -707,7 +707,7 @@ object Main {
       val ef = DefaultEXIFactory.newInstance
       if (schemaUriOpt.isDefined && infosetType == InfosetType.EXISA) {
         val gf = GrammarFactory.newInstance
-        val grammar = gf.createGrammars(schemaUriOpt.get.toURL.openStream(), DFDLCatalogResolver.get)
+        val grammar = gf.createGrammars(schemaUriOpt.get.toString, DFDLCatalogResolver.get)
         ef.setGrammars(grammar)
       }
       Some(ef)