Improved support for DITA from Astoria CMS

rmraya · Dec 2, 2022 · f4e4ae3 · f4e4ae3
1 parent 3824c0a
commit f4e4ae3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ XML and JSON filters are configurable
 
 Version | Comment | Release Date
 :------:|---------|:-----------:
+2.11.0 | Improved support for DITA from Astoria CMS | December 2nd, 2022
 2.10.0 | Fixed DITA segmentation | November 22nd, 2022
 2.9.1 | Fixed joining of XLIFF 2.0 files and improved PHP Array support | October 22nd, 2022
 2.9.0 | Added support for PHP Arrays | October 21st, 2022

diff --git a/lib/openxliff.jar b/lib/openxliff.jar
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@
 sonar.projectKey=OpenXLIFF
 # this is the name displayed in the SonarQube UI
 sonar.projectName=OpenXLIFF
-sonar.projectVersion=2.9.0
+sonar.projectVersion=2.11.0
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # Since SonarQube 4.2, this property is optional if sonar.modules is set. 

diff --git a/src/com/maxprograms/converters/Constants.java b/src/com/maxprograms/converters/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 
 	public static final String TOOLID = "OpenXLIFF";
 	public static final String TOOLNAME = "OpenXLIFF Filters";
-	public static final String VERSION = "2.10.0";
-	public static final String BUILD = "20221124_1034";
+	public static final String VERSION = "2.11.0";
+	public static final String BUILD = "20221202_1152";
 
 	public static final String SUCCESS = "0";
 	public static final String ERROR = "1";

diff --git a/src/com/maxprograms/converters/ditamap/DitaParser.java b/src/com/maxprograms/converters/ditamap/DitaParser.java
@@ -318,6 +318,11 @@ private void recurse(Element e, String parentFile) throws IOException, SAXExcept
 				href = URLDecoder.decode(href, StandardCharsets.UTF_8);
 				try {
 					File file = new File(href);
+					if (file.getName().indexOf('#') != -1) {
+						// remove fragment identifier
+						file = new File(file.getParentFile(), file.getName().substring(0, file.getName().indexOf('#')));
+						href = file.getAbsolutePath();
+					}
 					if (file.exists()) {
 						if (dataLogger != null) {
 							if (dataLogger.isCancelled()) {