Merge pull request #28 from spdx/htmlfix

Improve the HTML only file format
spdx · Apr 14, 2018 · f56759c · f56759c
2 parents 7b196ef + 7f0b4f9
commit f56759c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/org/spdx/licenselistpublisher/licensegenerator/LicenseHtmlFormatWriter.java b/src/org/spdx/licenselistpublisher/licensegenerator/LicenseHtmlFormatWriter.java
@@ -20,6 +20,7 @@
 import java.nio.charset.Charset;
 import java.util.Set;
 
+import org.spdx.html.InvalidLicenseTemplateException;
 import org.spdx.licenseTemplate.SpdxLicenseTemplateHelper;
 import org.spdx.rdfparser.license.LicenseException;
 import org.spdx.rdfparser.license.SpdxListedLicense;
@@ -82,7 +83,11 @@ public void writeLicense(SpdxListedLicense license, boolean deprecated, String d
 		String licBaseHtmlFileName = formLicenseHTMLFileName(license.getLicenseId());
 		String licHtmlFileName = licBaseHtmlFileName + ".html";
 		File htmlTextFile = new File(htmlFolder.getPath() + File.separator + licHtmlFileName);
-		Files.write(SpdxLicenseTemplateHelper.formatEscapeHTML(license.getLicenseText()), htmlTextFile, utf8);	
+		try {
+			Files.write(license.getLicenseTextHtml(), htmlTextFile, utf8);
+		} catch (InvalidLicenseTemplateException e) {
+			Files.write(SpdxLicenseTemplateHelper.formatEscapeHTML(license.getLicenseText()), htmlTextFile, utf8);
+		}	
 	}
 
 	/**
@@ -118,7 +123,11 @@ public void writeException(LicenseException exception, boolean deprecated, Strin
 			throws IOException {
 		String exceptionHtmlFileName = formLicenseHTMLFileName(exception.getLicenseExceptionId());
 		File htmlTextFile = new File(htmlFolder.getPath() + File.separator + exceptionHtmlFileName + ".html");
-		Files.write(SpdxLicenseTemplateHelper.formatEscapeHTML(exception.getLicenseExceptionText()), htmlTextFile, utf8);
+		try {
+			Files.write(exception.getExceptionTextHtml(), htmlTextFile, utf8);
+		} catch (InvalidLicenseTemplateException e) {
+			Files.write(SpdxLicenseTemplateHelper.formatEscapeHTML(exception.getLicenseExceptionText()), htmlTextFile, utf8);
+		}
 	}
 
 }