Fixed catalog

rmraya · Sep 22, 2019 · d2d5499 · d2d5499
1 parent 6a9b12a
commit d2d5499
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/lib/openxliff.jar b/lib/openxliff.jar
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 = "1.6.0";
-	public static final String BUILD = "20190909_1218";
+	public static final String VERSION = "1.5.1";
+	public static final String BUILD = "20190922_0931";
 
 	public static final String SUCCESS = "0";
 	public static final String ERROR = "1";

diff --git a/src/com/maxprograms/validation/Xliff20.java b/src/com/maxprograms/validation/Xliff20.java
@@ -884,7 +884,13 @@ private boolean validateInlineElements(Element e) {
 	}
 
 	private Source getSource(String string) {
-		String location = resolver.matchPublic(string);
+		String location = resolver.matchURI(string);
+		if (location == null) {
+			location = resolver.matchPublic(string); 
+		}
+		if (location == null) {
+			location = resolver.matchSystem("", string);
+		}
 		Source source = new StreamSource(location);
 		return source;
 	}

diff --git a/src/com/maxprograms/xml/Catalog.java b/src/com/maxprograms/xml/Catalog.java
@@ -49,8 +49,6 @@ public Catalog(String catalogFile)
 		if (!workDir.endsWith(File.separator)) {
 			workDir = workDir + File.separator;
 		}
-		String[] catalogs = new String[1];
-		catalogs[0] = file.toURI().toURL().toString();
 
 		systemCatalog = new Hashtable<>();
 		publicCatalog = new Hashtable<>();
@@ -74,6 +72,13 @@ private void recurse(Element root)
 
 			if (!child.getAttributeValue("xml:base", "").equals("")) {
 				base = child.getAttributeValue("xml:base");
+				File b = new File(base);
+				if (!b.isAbsolute()) {
+					base = XMLUtils.getAbsolutePath(workDir, base);
+					if (!base.endsWith(File.separator)) {
+						base = base + File.separator;
+					}
+				}
 			}
 
 			if (child.getName().equals("system") && !systemCatalog.containsKey(child.getAttributeValue("systemId"))) {
@@ -173,17 +178,16 @@ private static boolean validate(String uri) {
 		return file.exists();
 	}
 
-	private String makeAbsolute(String uri) throws URISyntaxException {
-		URI b = new URI(base);
-		URI u = b.resolve(uri).normalize();
-		if (!u.isAbsolute()) {
-			URI work = new URI(workDir);
+	private String makeAbsolute(String uri) throws IOException {
+		File f = new File(base + uri);
+		if (!f.isAbsolute()) {
 			if (!base.isEmpty()) {
-				work = work.resolve(base);
+				return XMLUtils.getAbsolutePath(base, uri);
+			} else {				
+				return XMLUtils.getAbsolutePath(workDir, uri);
 			}
-			u = work.resolve(uri).normalize();
 		}
-		return u.toString();
+		return base + uri;
 	}
 
 	private Hashtable<String, String> getSystemCatalogue() {
@@ -324,8 +328,10 @@ public String matchURI(String uri) {
 			}
 			try {
 				URI u = new URI(uri).normalize();
-				return u.toString();
-			} catch (URISyntaxException e) {
+				if (u.toURL().getProtocol().startsWith("file")) {
+					return u.toString();
+				}
+			} catch (URISyntaxException | MalformedURLException e) {
 				// ignore
 			}
 		}