fix a bug in the SGJP inclusions; modify the catalog to resolve the inclusion properly
Change-Id: I6505884d0a919d3c3221d88a643811d6269b36e0
diff --git a/catalog.xml b/catalog.xml
index c707851..9641d2f 100644
--- a/catalog.xml
+++ b/catalog.xml
@@ -33,4 +33,14 @@
<!-- Map an xs:import or xs:include to an XSLT stylesheet which ends with a certain suffix to an XSLT stylesheet located relative to this XML catalog -->
<!--<uriSuffix uriSuffix="docbook.xsl" uri="../../docbook/xsl/fo/docbook.xsl"/>-->
+
+<!-- <uriSuffix uriSuffix="NKJP_1M_header.xml" uri="test/resources/nkjp2korap_sample2/NKJP_1M_header.xml"/>
+ <uri name="NKJP_1M_header.xml" uri="test/resources/nkjp2korap_sample2/NKJP_1M_header.xml"/>
+these two won't work for xi:include
+ -->
+<!-- <system systemId="file:/home/piotr/projects/NKJP2KorAP/test/resources/nkjp2korap_sample2/KOT/NKJP_1M_header.xml" uri="test/resources/nkjp2korap_sample2/NKJP_1M_header.xml"/>
+this one does work for inclusions, but it's too brutal
+ -->
+ <systemSuffix systemIdSuffix="NKJP_1M_header.xml" uri="test/resources/nkjp2korap_sample2/NKJP_1M_header.xml"/>
+ <!-- for inclusions of the main corpus header -->
</catalog>
\ No newline at end of file
diff --git a/test/resources/nkjp2korap_sample2/HellerPodgladanie/text.xml b/test/resources/nkjp2korap_sample2/HellerPodgladanie/text.xml
index 5e7ab49..cd4e542 100644
--- a/test/resources/nkjp2korap_sample2/HellerPodgladanie/text.xml
+++ b/test/resources/nkjp2korap_sample2/HellerPodgladanie/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/IsakowiczZaleskiMoje/text.xml b/test/resources/nkjp2korap_sample2/IsakowiczZaleskiMoje/text.xml
index d8e379c..08ef7e0 100644
--- a/test/resources/nkjp2korap_sample2/IsakowiczZaleskiMoje/text.xml
+++ b/test/resources/nkjp2korap_sample2/IsakowiczZaleskiMoje/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/KOT/text.xml b/test/resources/nkjp2korap_sample2/KOT/text.xml
index bf91b94..9618794 100644
--- a/test/resources/nkjp2korap_sample2/KOT/text.xml
+++ b/test/resources/nkjp2korap_sample2/KOT/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/KolakowskiOco/text.xml b/test/resources/nkjp2korap_sample2/KolakowskiOco/text.xml
index d5a9478..73b330a 100644
--- a/test/resources/nkjp2korap_sample2/KolakowskiOco/text.xml
+++ b/test/resources/nkjp2korap_sample2/KolakowskiOco/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/MysliwskiKamien/text.xml b/test/resources/nkjp2korap_sample2/MysliwskiKamien/text.xml
index 0547fce..a17e4db 100644
--- a/test/resources/nkjp2korap_sample2/MysliwskiKamien/text.xml
+++ b/test/resources/nkjp2korap_sample2/MysliwskiKamien/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/WilkWilczy/text.xml b/test/resources/nkjp2korap_sample2/WilkWilczy/text.xml
index 897b83a..6c14da3 100644
--- a/test/resources/nkjp2korap_sample2/WilkWilczy/text.xml
+++ b/test/resources/nkjp2korap_sample2/WilkWilczy/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>
diff --git a/test/resources/nkjp2korap_sample2/ZycieWarszawy_Zycie/text.xml b/test/resources/nkjp2korap_sample2/ZycieWarszawy_Zycie/text.xml
index 095ead3..49fff89 100644
--- a/test/resources/nkjp2korap_sample2/ZycieWarszawy_Zycie/text.xml
+++ b/test/resources/nkjp2korap_sample2/ZycieWarszawy_Zycie/text.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<teiCorpus xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:nkjp="http://www.nkjp.pl/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0">
- <xi:include href="KORBA_header.xml"/>
+ <xi:include href="NKJP_1M_header.xml"/>
<TEI>
<xi:include href="header.xml"/>
<text>