update dependencies, allowing new rng folder and old relaxng folder r…

…efs #5
TEIC · Nov 27, 2023 · dbbb801 · dbbb801
1 parent 6ae4f04
commit dbbb801
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>pl.psnc.dl.ege.tei</groupId>
   <artifactId>tei-converter</artifactId>
-  <version>0.6.4</version>
+  <version>0.6.5</version>
   <name>EGE TEI Converter</name>
   <properties>
 
@@ -145,7 +145,7 @@
     <dependency>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio-tiff</artifactId>
-        <version>3.1.1</version>
+        <version>3.9.4</version>
     </dependency>
     <dependency>
 	<groupId>com.thaiopensource</groupId>

diff --git a/src/main/java/pl/psnc/dl/ege/tei/Format.java b/src/main/java/pl/psnc/dl/ege/tei/Format.java
@@ -19,7 +19,7 @@ public enum Format {
     ODDJSON("oddjson","application/json","oddjson","ODDC", "Compiled TEI ODD", "text", "Source ODD spec in JSON notation", "text", false, 10),
     ODT("odt","application/vnd.oasis.opendocument.text","odt","TEI", "TEI P5 XML Document", "text", "OpenOffice Text (.odt)", "text", true, 8),
     RDF("rdf","application/rdf+xml","rdf","TEI", "TEI P5 XML Document", "text", "RDF XML", "text", true, 5),
-    RELAXNG("relaxng","application/xml-relaxng","relaxng","ODDC", "Compiled TEI ODD", "text", "RELAX NG schema", "text", true, 10),
+    RELAXNG("relaxng","application/xml-relaxng","rng","ODDC", "Compiled TEI ODD", "text", "RELAX NG schema", "text", true, 10),
     RNC("rnc","application/relaxng-compact","rnc","ODDC", "Compiled TEI ODD", "text", "RELAX NG compact schema", "text", false, 10),
     TEXT("txt","text/plain",    "txt","TEI", "TEI P5 XML Document", "text", "Plain text",   "text", true, 15),
     XHTML("xhtml","application/xhtml+xml","html","TEI", "TEI P5 XML Document", "text", "xHTML", "text", true, 9),

diff --git a/src/main/java/pl/psnc/dl/ege/tei/TEIConverter.java b/src/main/java/pl/psnc/dl/ege/tei/TEIConverter.java
@@ -287,8 +287,17 @@ else if (Format.RELAXNG.getMimeType().equals(toMimeType)) {
 				profile = EGEConstants.DEFAULT_PROFILE;
 			}
 			properties.put("extension", "rng");
-			performXsltTransformation(inputStream, outputStream, Format.RELAXNG
-					.getProfile(), profile,"to", properties);
+			//if new renamed rng to stylesheet folder is not found use the old folder relaxng, see https://github.com/TEIC/tei-converter/issues/5
+			if (!new File(
+					ConverterConfiguration.STYLESHEETS_PATH + File.separator + "profiles"
+							+ File.separator + profile + File.separator + Format.RELAXNG
+							.getProfile()
+							+ File.separator + "to" + ".xsl").exists()){
+				performXsltTransformation(inputStream, outputStream, "relaxng", profile, "to", properties);
+			} else {
+				performXsltTransformation(inputStream, outputStream, Format.RELAXNG
+						.getProfile(), profile, "to", properties);
+			}
 		}
 		// TEI to RNC
 		else if (Format.RNC.getMimeType().equals(toMimeType)