Revert "Merge branch 'main' of https://github.com/deutschestextarchiv…

…/copadocs" This reverts commit 291d784, reversing changes made to 60813d2.
deutschestextarchiv · Aug 24, 2023 · 47a4f2b · 47a4f2b
1 parent 291d784
commit 47a4f2b
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 57 deletions.
diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_ao_1866_11_09.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_ao_1866_11_09.xml
@@ -40,7 +40,7 @@
 <forename>Ignaz</forename>
 <surname>L.</surname>
 </persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur (Amtsbürgschaft 1600 Fl, Pension 1400 Fl)</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_12_a.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_12_a.xml
@@ -39,7 +39,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_12_b.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_12_b.xml
@@ -39,7 +39,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_26.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_09_26.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_10_24.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_10_24.xml
@@ -39,7 +39,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_11_22.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_11_22.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_12_25.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_12_25.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_12_30.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1866_12_30.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_07_a.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_07_a.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_07_b.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_07_b.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_09.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_01_09.xml
@@ -39,7 +39,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_03_09.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_03_09.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_08_29_a.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_08_29_a.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_08_29_b.xml b/...b_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_1867_08_29_b.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_a.xml b/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_a.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_b.xml b/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_b.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_c.xml b/...fb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_po_ca1866-69_c.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_pp_1867_01_07.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_pp_1867_01_07.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_pp_1867_08_19.xml b/...kfb_01145_l_m_kreis-kassa-controlleur_1820_1866-69_pp2-po16/kfb_01145_l_pp_1867_08_19.xml
@@ -38,7 +38,7 @@
 <person sex="m" xml:id="kfb1145l">
 <persName>
 <forename>Ignaz</forename> <surname>L.</surname></persName>
-<birth notAfter="1820" notBefore="1819"/>
+<birth notAfter="20" notBefore="1819" when="1819/20"/>
 <death when="1874"/>
 <occupation>Kreis-Kassa-Controlleur</occupation>
 <residence><geo decls="#WGS">48.3668041 10.8986971</geo>Augsburg</residence>

diff --git a/xslt/letter-header.xsl b/xslt/letter-header.xsl
@@ -150,19 +150,7 @@
       </tr>
       <tr>
         <th>geboren</th>
-        <td><xsl:choose>
-            <xsl:when test="t:birth[@cert='unknown']">
-              <i>unbekannt</i>
-            </xsl:when>
-            <xsl:when test="birth[@cert='when']">
-              <xsl:value-of select="t:birth/@when"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="t:birth/@notBefore"/>
-              <xsl:text>/</xsl:text>
-              <xsl:value-of select="t:birth/@notAfter"/>
-            </xsl:otherwise>
-          </xsl:choose></td>
+        <td><xsl:value-of select="t:birth/@when"/></td>
       </tr>
       <tr>
         <th>gestorben</th>

diff --git a/xslt/list.xsl b/xslt/list.xsl
@@ -60,19 +60,7 @@
     <xsl:text>&#x9;</xsl:text>
 
     <!-- birth date -->
-    <xsl:choose>
-            </xsl:when>
-            <xsl:when test="birth[@cert='when']">
-              <xsl:value-of select="t:birth/@when"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!--<xsl:value-of select="t:birth/@notBefore"/>
-              <xsl:text>/</xsl:text>
-              <xsl:value-of select="t:birth/@notAfter"/>-->
-              <xsl:value-of select="normalize-space(concat(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@notBefore, ' ', /t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@notAfter))"/>
-            </xsl:otherwise>
-          </xsl:choose>
-    <!--<xsl:value-of select="normalize-space(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@when)"/>-->
+    <xsl:value-of select="normalize-space(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@when)"/>
     <xsl:text>&#x9;</xsl:text>
 
     <!-- entry date -->

diff --git a/xslt/patient-records.xsl b/xslt/patient-records.xsl
@@ -28,18 +28,7 @@
     <xsl:text>&#x9;</xsl:text>
 
     <!-- birth date -->
-    <!--<xsl:value-of select="normalize-space(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@when)"/>-->
-    <xsl:choose>
-            <xsl:when test="birth[@cert='when']">
-              <xsl:value-of select="t:birth/@when"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!--<xsl:value-of select="t:birth/@notBefore"/>
-              <xsl:text>/</xsl:text>
-              <xsl:value-of select="t:birth/@notAfter"/>-->
-              <xsl:value-of select="normalize-space(concat(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@notBefore, ' ', /t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@notAfter))"/>
-            </xsl:otherwise>
-          </xsl:choose>
+    <xsl:value-of select="normalize-space(/t:TEI/t:teiHeader/t:profileDesc/t:particDesc/t:person[1]/t:birth/@when)"/>
     <xsl:text>&#x9;</xsl:text>
 
     <!-- entry date -->