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
+/tmp
+/resources/auxdata
+/public/repertorium/repository.*
+/public/repertorium/xml.xsd
+/public/beacon.txt
+/public/sitemap.xml
+/resources/schema/*.xsd
+/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.cmd -i resources/mets.xml resources/xproc/fulltext/fulltext.xpl
+	calabash resources/xproc/repertorium/solr.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.cmd -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.cmd -i resources/daten/repertorium/register/personen.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/edition/register/orte.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/edition/register/personen.xml resources/xproc/normdaten.xpl
+	calabash -i resources/daten/repertorium/register/orte.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/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/Novissimi/53-1-Novissimi-8.xml
+++ b/resources/daten/repertorium/mss/Novissimi/53-1-Novissimi-8.xml
@@ -31,7 +31,7 @@
          <msIdentifier>
            <institution ref="http://d-nb.info/gnd/8989-8">Herzog August Bibliothek
              Wolfenbüttel</institution>
-            <collection>Noviss.</collection>
+            <collection>Novissimi in Octav</collection>
            <idno>Cod. Guelf. 53.1 Noviss. 8°</idno>
          </msIdentifier>
          <msPart>

--- a/resources/daten/repertorium/mss/Novissimi/53-2-Novissimi-8.xml
+++ b/resources/daten/repertorium/mss/Novissimi/53-2-Novissimi-8.xml
@@ -30,7 +30,7 @@
          <msIdentifier>
            <institution ref="http://d-nb.info/gnd/8989-8">Herzog August Bibliothek
              Wolfenbüttel</institution>
-            <collection>Noviss.</collection>
+            <collection>Novissimi in Octav</collection>
            <idno>Cod. Guelf. 53.2 Noviss. 8°</idno>
          </msIdentifier>
          <msPart>

--- a/resources/daten/repertorium/mss/Novissimi/53-novissimi-8.xml
+++ b/resources/daten/repertorium/mss/Novissimi/53-novissimi-8.xml
@@ -30,7 +30,7 @@
          <msIdentifier>
            <institution ref="http://d-nb.info/gnd/8989-8">Herzog August Bibliothek
              Wolfenbüttel</institution>
-            <collection>Noviss.</collection>
+            <collection>Novissimi in Octav</collection>
            <idno>Cod. Guelf. 53 Noviss. 8°</idno>
          </msIdentifier>
          <msPart>

--- a/resources/daten/repertorium/register.xml
+++ b/resources/daten/repertorium/register.xml
--- a/resources/xproc/repertorium/oais-tei.xsl
+++ b/resources/xproc/repertorium/oais-tei.xsl
@@ -18,11 +18,13 @@
    </xsl:copy>
  </xsl:template>

-  <xsl:template match="@ref[parent::author]">
+  <xsl:template match="@ref[starts-with(., '../../register.xml')]">
    <xsl:if test="document(.)/idno[@type = 'URI']">
      <xsl:attribute name="ref" select="document(.)/idno[@type = 'URI']"/>
    </xsl:if>
-    <xsl:attribute name="n" select="document(.)/persName[@type = 'display']"/>
+    <xsl:if test="parent::author">
+      <xsl:attribute name="n" select="document(.)/persName[@type = 'display']"/>
+    </xsl:if>
  </xsl:template>

  <xsl:template match="ref[ends-with(@target, '.xml')]">

--- a/resources/xslt/tgn2tei.xsl
+++ b/resources/xslt/tgn2tei.xsl
@@ -23,9 +23,9 @@
    <xsl:template match="schema:Place[geo:lat and geo:long]">
      <location>
        <geo>
-          <xsl:value-of select="geo:long"/>
-          <xsl:text> </xsl:text>
          <xsl:value-of select="geo:lat"/>
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="geo:long"/>
        </geo>
      </location>
    </xsl:template>

--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@

 require_once __DIR__ . '/composer/autoload_real.php';

-return ComposerAutoloaderInit8a9318ad96e1e6602a968c996fe31931::getLoader();
+return ComposerAutoloaderInitc2781241b06cffdb64225f5dd1f3e406::getLoader();
--- a/vendor/bin/var-dump-server
+++ b/vendor/bin/var-dump-server
+#!/usr/bin/env sh
+
+dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../symfony/var-dumper/Resources/bin" && pwd)
+
+if [ -d /proc/cygdrive ]; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
+fi
+
+"${dir}/var-dump-server" "$@"
--- a/vendor/bin/var-dump-server.bat
+++ b/vendor/bin/var-dump-server.bat
+@ECHO OFF
+setlocal DISABLEDELAYEDEXPANSION
+SET BIN_TARGET=%~dp0/../symfony/var-dumper/Resources/bin/var-dump-server
+php "%BIN_TARGET%" %*
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -37,8 +37,8 @@ namespace Composer\Autoload;
 *
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
 */
 class ClassLoader
 {
@@ -60,7 +60,7 @@ class ClassLoader
    public function getPrefixes()
    {
        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
        }

        return array();
@@ -279,7 +279,7 @@ class ClassLoader
     */
    public function setApcuPrefix($apcuPrefix)
    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
    }

    /**
@@ -374,10 +374,14 @@ class ClassLoader

        $first = $class[0];
        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                            return $file;
                        }
                    }
No results found