louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Korrigierte PDF/A schema extension beschreibung und test derselben

Browse Source
This commit is contained in:
Jochen Stärk
2017-11-29 15:11:53 +01:00
parent 3b63223f9d
commit e570f83e4a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java
View File

@@ -43,7 +43,7 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
public String prefix = null; public String prefix = null;
public void setZUGFeRDVersion(int ver) { protected void setZUGFeRDVersion(int ver) {
namespace=ZUGFeRDExporter.getNamespaceForVersion(ver); namespace=ZUGFeRDExporter.getNamespaceForVersion(ver);
prefix=ZUGFeRDExporter.getPrefixForVersion(ver); prefix=ZUGFeRDExporter.getPrefixForVersion(ver);
} }
@@ -76,15 +76,15 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
return li; return li;
} }
public XMPSchemaPDFAExtensions(XMPMetadata metadata) { public XMPSchemaPDFAExtensions(XMPMetadata metadata, int ZFVersion) {
super(metadata); super(metadata);
setZUGFeRDVersion(ZUGFeRDExporter.DefaultZUGFeRDVersion); setZUGFeRDVersion(ZFVersion);
attachExtensions(metadata, true); attachExtensions(metadata, true);
} }
public XMPSchemaPDFAExtensions(XMPMetadata metadata, boolean withZF) { public XMPSchemaPDFAExtensions(XMPMetadata metadata, int ZFVersion, boolean withZF) {
super(metadata); super(metadata);
setZUGFeRDVersion(ZUGFeRDExporter.DefaultZUGFeRDVersion); setZUGFeRDVersion(ZFVersion);
attachExtensions(metadata, withZF); attachExtensions(metadata, withZF);
} }

1
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
View File

@@ -116,6 +116,7 @@ public class ZUGFeRDExporter implements Closeable {
} }
} }
@Deprecated
public void setZUGFeRDVersion(int ver) { public void setZUGFeRDVersion(int ver) {
if (ver == 1) { if (ver == 1) {
ZUGFeRD1PullProvider z1p = new ZUGFeRD1PullProvider(); ZUGFeRD1PullProvider z1p = new ZUGFeRD1PullProvider();

4
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
View File

@@ -176,8 +176,8 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
metadata.addSchema(zf); metadata.addSchema(zf);
} }
XMPSchemaPDFAExtensions pdfaex = new XMPSchemaPDFAExtensions(metadata, attachZugferdHeaders); XMPSchemaPDFAExtensions pdfaex = new XMPSchemaPDFAExtensions(metadata, ZFVersion, attachZugferdHeaders);
pdfaex.setZUGFeRDVersion(ZFVersion);
metadata.addSchema(pdfaex); metadata.addSchema(pdfaex);
} }

1
src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
View File

@@ -379,6 +379,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
assertFalse(pdfContent.indexOf("(via mustangproject.org") == -1); assertFalse(pdfContent.indexOf("(via mustangproject.org") == -1);
// check for pdf-a schema extension // check for pdf-a schema extension
assertFalse(pdfContent.indexOf("<fx:ConformanceLevel>EXTENDED</fx:ConformanceLevel>") == -1); assertFalse(pdfContent.indexOf("<fx:ConformanceLevel>EXTENDED</fx:ConformanceLevel>") == -1);
assertFalse(pdfContent.indexOf("<pdfaSchema:prefix>fx</pdfaSchema:prefix>") == -1);
assertFalse(pdfContent.indexOf("urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended") == -1); assertFalse(pdfContent.indexOf("urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended") == -1);
} }