Compare revisions

David Maus · David Maus · David Maus · David Maus · David Maus · David Maus
--- a/.gitignore
+++ b/.gitignore
 /tmp
 /resources/auxdata
 /public/repertorium/repository.*
 /public/repertorium/xml.xsd
 /public/beacon.txt
 /public/sitemap.xml
 /resources/schema/*.xsd
\ No newline at end of file
+/nbproject
--- a/Makefile
+++ b/Makefile
@@ -4,23 +4,23 @@ server:
 .PHONY: mets
 mets:
-	calabash.cmd -o result=resources/daten/repertorium/mets.xml resources/xproc/repertorium/mets.xpl
+	calabash -o result=resources/daten/repertorium/mets.xml resources/xproc/repertorium/mets.xpl
 .PHONY: solr
 solr:
-	calabash.cmd resources/xproc/repertorium/solr.xpl
+	calabash resources/xproc/repertorium/solr.xpl
-	calabash.cmd -i resources/mets.xml resources/xproc/fulltext/fulltext.xpl
+	calabash -i resources/mets.xml resources/xproc/fulltext/fulltext.xpl
 .PHONY: normdaten
 normdaten:
-	calabash.cmd -i resources/daten/edition/register/orte.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/edition/register/orte.xml resources/xproc/normdaten.xpl
-	calabash.cmd -i resources/daten/edition/register/personen.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/edition/register/personen.xml resources/xproc/normdaten.xpl
-	calabash.cmd -i resources/daten/repertorium/register/orte.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/repertorium/register/orte.xml resources/xproc/normdaten.xpl
-	calabash.cmd -i resources/daten/repertorium/register/personen.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/repertorium/register/personen.xml resources/xproc/normdaten.xpl
 .PHONY: linkmap
 linkmap:
-	calabash.cmd -i resources/daten/edition/diarium/diarium.xml -o resources/daten/edition/diarium/linkmap.xml resources/xproc/edition/linkmap.xpl
+	calabash -i resources/daten/edition/diarium/diarium.xml -o resources/daten/edition/diarium/linkmap.xml resources/xproc/edition/linkmap.xpl
 .PHONY: deploy
 deploy:
@@ -28,15 +28,15 @@ deploy:
 .PHONY: sitemap
 sitemap:
-	calabash.cmd -i resources/mets.xml -o public/sitemap.xml resources/xproc/sitemap.xpl
+	calabash -i resources/mets.xml -o public/sitemap.xml resources/xproc/sitemap.xpl
 .PHONY: repository
 repository:
-	calabash.cmd -o public/repertorium/repository.xml resources/xproc/repertorium/oais.xpl
+	calabash -o public/repertorium/repository.xml resources/xproc/repertorium/oais.xpl
 .PHONY: beacon
 beacon: linkmap
-	transform.cmd -o:public/beacon.txt -xsl:resources/xproc/edition/beacon.xsl resources/daten/edition/diarium/linkmap.xml
+	transform -o:public/beacon.txt -xsl:resources/xproc/edition/beacon.xsl resources/daten/edition/diarium/linkmap.xml
 .PHONY: publish
 publish: mets linkmap sitemap repository beacon solr deploy
--- a/README.md
+++ b/README.md
+## Primary dependencies
+- php
+- php extension openssl
+- php extension xsl
+## build dependencies
+- xmlcalabash
+## Download required libraries
+```bash
+php bin/composer.phar install
+```
+## Start a local server
+```bash
+php -S 127.0.0.1:9999 -t public public/index.php
+```
+## Run the make file
+On unix and on windows using the git bash you can run:
+```bash
+make target
+```
--- a/bin/composer.phar
+++ b/bin/composer.phar
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,10 @@
        }
    },
    "require": {
+        "ext-openssl": "*",
+        "ext-xsl": "*",
        "silex/silex": "^2.0",
-        "hab/solr": "dev-master",
+        "hab/solr": "dev-master#ef528a52d57493ad2ae575037e42442075135f62",
        "hab/paginator": "dev-master",
        "twig/twig": "~1.0",
        "symfony/twig-bridge": "^3.2"
@@ -14,11 +16,11 @@
    "repositories": [
        {
            "type": "git",
-            "url":  "git@github.com:dmj/php-solr.git"
+            "url":  "https://git.hab.de/dmj/php-solr.git"
        },
        {
            "type": "git",
-            "url":  "git@github.com:dmj/php-paginator.git"
+            "url":  "https://git.hab.de/dmj/php-paginator.git"
        }
    ]
 }
--- a/composer.lock
+++ b/composer.lock
--- a/resources/daten/edition/diarium/1600.xml
+++ b/resources/daten/edition/diarium/1600.xml
@@ -238,7 +238,7 @@
                <head><date when="1600-06-10">den 10 Jun<ex>ÿ</ex>
                        <c>♂</c>
                    </date></head>
-                <p>biß <rs ref="register.xml#Capranica" type="place">Caprarolo</rs> stadt, alda ein
+                <p>biß <rs ref="register.xml#Caprarola" type="place">Caprarolo</rs> stadt, alda ein
                        Palatiu<ex>m</ex> sampt einem garten vnd <w>fontanen</w><note type="translation">Brunnen</note> zusehen. <rs ref="register.xml#Viterbo" type="place">Viterbo</rs>
                    <foreign xml:lang="it">alla campana</foreign><note type="translation">Zur
                        Glocke</note> 3 ½ meill, <rs ref="register.xml#Montefiascone" type="place">Montefiasco<ex>n</ex></rs> stadt, <rs ref="register.xml#Bolsena" type="place">Bulzano</rs> stadt dabeÿ ein grosser Lago, <rs ref="register.xml#San_Lorenzo_Nuovo" type="place">S. Lorenzo</rs> stadt al

--- a/resources/daten/edition/diarium/linkmap.xml
+++ b/resources/daten/edition/diarium/linkmap.xml
--- a/resources/daten/edition/diarium/register.xml
+++ b/resources/daten/edition/diarium/register.xml
--- a/resources/daten/repertorium/mss/Augusteer/1-17-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/1-17-aug-2f.xml
@@ -48,7 +48,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Lebenslauf">
                <locus from="1v" to="1v"/>
-                <author>Georg Lorenzen</author>
+                <author ref="../../register.xml#Georg_Lorenzen">Georg Lorenzen</author>
                <title type="uniform">Lebenslauf Georg Lorenzen</title>
                <date type="coverage" from="1560" to="1625"/>
                <rubric>Zu Jesu Christy Namen amen</rubric>

--- a/resources/daten/repertorium/mss/Augusteer/11-17-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/11-17-aug-2f.xml
@@ -43,7 +43,6 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Reisebericht">
                <locus from="410r" to="411r"/>
-                <author>unbekannt</author>
                <respStmt>
                  <resp ref="http://id.loc.gov/vocabulary/relators/red">Schreiber/Redaktor</resp>
                  <name>unbekannt</name>

--- a/resources/daten/repertorium/mss/Augusteer/11-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/11-aug-2f.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Notizen">
                <locus from="118r" to="118v"/>
-                <author>Erhart Lesser</author>
+                <author ref="../../register.xml#Erhart_Lesser">Erhart Lesser</author>
                <title type="uniform">Haushaltsliste Erhart Lesser</title>
                <date type="coverage" from="1576" to="1576"/>
                <rubric>Was mir Erhartus lesser, Jerlich Jm Heußlichen wesen Aufgehett ahn allen überflus [...]</rubric>

--- a/resources/daten/repertorium/mss/Augusteer/15-5-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/15-5-aug-2f.xml
@@ -12,7 +12,6 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Testament">
                <locus from="412r" to="414v"/>
-                <author>unbekannt</author>
                <title type="uniform">Testament eines unbekannten Verfassers</title>
                <date type="coverage"/>

--- a/resources/daten/repertorium/mss/Augusteer/15-9-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/15-9-aug-2f.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Testament">
                <locus from="425r" to="440v"/>
-                <author>Susanna Neuthart</author>
+                <author ref="../../register.xml#Susanna_Neuthart">Susanna Neuthart</author>
                <title type="uniform">Testament Susanna Neuthart</title>
                <date type="coverage"/>

--- a/resources/daten/repertorium/mss/Augusteer/17-6-aug-4f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/17-6-aug-4f.xml
@@ -40,7 +40,7 @@
              <textLang mainLang="lat"/>
              <msItem class="../../register.xml#Tagebuch">
                <locus from="?" to="?"/>
-                <author ref="">Johannes Werner</author>
+                <author ref="../../register.xml#Johannes_Werner">Johannes Werner</author>
                <title type="uniform">Tagebuch Johannes Werner</title>
                <date type="coverage" from="1506" to="1521"/>
                <rubric>

--- a/resources/daten/repertorium/mss/Augusteer/18-9-aug-4.xml
+++ b/resources/daten/repertorium/mss/Augusteer/18-9-aug-4.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Gestaendnis">
                <locus from="238r" to="238r"/>
-                <author>Kerck/Kirchner</author>
+                <author ref="../../register.xml#Kerck_Kirchner">Kerck/Kirchner</author>
                <respStmt>
                  <resp ref="http://id.loc.gov/vocabulary/relators/red">Schreiber/Redaktor</resp>
                  <name>Unbekannt</name>

--- a/resources/daten/repertorium/mss/Augusteer/27-10-aug-2f-2.xml
+++ b/resources/daten/repertorium/mss/Augusteer/27-10-aug-2f-2.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="nld"/>
              <msItem class="../../register.xml#Reisebericht">
                <locus from="151" to="156"/>
-                <author>Pieter Willemsz Verhoeff</author>
+                <author ref="../../register.xml#Pieter_Willemsz_Verhoeff">Pieter Willemsz Verhoeff</author>
                <respStmt>
                  <resp ref="http://id.loc.gov/vocabulary/relators/red">Schreiber/Redaktor</resp>
                  <name>unbekannt</name>

--- a/resources/daten/repertorium/mss/Augusteer/33-24-aug-4f-2.xml
+++ b/resources/daten/repertorium/mss/Augusteer/33-24-aug-4f-2.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Reisebericht">
                <locus from="266r" to="350v"/>
-                <author>Burcardum</author>
+                <author ref="../../register.xml#Burcardum">Burcardum</author>
                <respStmt>
                  <resp ref="http://id.loc.gov/vocabulary/relators/red">Schreiber/Redaktor</resp>
                  <name>Unbekannt</name>

--- a/resources/daten/repertorium/mss/Augusteer/36-13-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/36-13-aug-2f.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Testament">
                <locus from="141r" to="156v"/>
-                <author>Erik Larsson Sparre</author>
+                <author ref="../../register.xml#Erik_Larsson_Sparre">Erik Larsson Sparre</author>
                <title type="uniform">Testament Erik Larsson Sparre (Juli 1599)</title>
                <date type="coverage" notBefore="1500" notAfter="1600">16. Jhd.</date>
                <rubric>Klage vnd letzter Will.</rubric>

--- a/resources/daten/repertorium/mss/Augusteer/37-14-aug-2f.xml
+++ b/resources/daten/repertorium/mss/Augusteer/37-14-aug-2f.xml
@@ -12,7 +12,7 @@
              <textLang mainLang="deu"/>
              <msItem class="../../register.xml#Reisebericht">
                <locus from="458r" to="484r"/>
-                <author>Christoff von Lanningen</author>
+                <author ref="../../register.xml#Christoff_von_Lanningen">Christoff von Lanningen</author>
                <title type="uniform">Reisebericht Christoff von Lanningen</title>
                <date type="coverage" from="1609-03-16" to="1609-06-10"/>
                <rubric>Underthänige Relation meiner Christoff von Lanningen über mir gnädig anbefohlene reyse nacher Italia de dato 10. Junio 1609. zu 2. Theil abgethailt.</rubric>
No results found