From 15c7df78c7a6c4cd8f197291861e79de44d60559 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Thu, 19 Sep 2019 16:10:15 +0200
Subject: [PATCH] - add TiteAdditional and TitleAbstractAdditional - addapt
 datasetxml2oai-pmh.xslt - neww title name

---
 app/Library/Xml/DatasetExtension.php  | 14 +++++++--
 public/datasetxml2oai-pmh.xslt        | 21 +++++++++++--
 public/prefixes/oai_datacite.xslt     | 44 +++++++++++++++++++++++++++
 resources/views/layouts/app.blade.php |  4 +--
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/app/Library/Xml/DatasetExtension.php b/app/Library/Xml/DatasetExtension.php
index b57acc7..40ab858 100644
--- a/app/Library/Xml/DatasetExtension.php
+++ b/app/Library/Xml/DatasetExtension.php
@@ -23,12 +23,22 @@ trait DatasetExtension
     protected $externalFields = array(
         'TitleMain' => array(
             'model' => Title::class,
-            'options' => array('type' => ['Main', 'Alternative', 'Sub', 'Translated', 'Other']),
+            'options' => array('type' => ['Main']),
+            'fetch' => 'eager'
+        ),
+        'TitleAdditional' => array(
+            'model' => Title::class,
+            'options' => array('type' => ['Alternative', 'Sub', 'Translated', 'Other']),
             'fetch' => 'eager'
         ),
         'TitleAbstract' => array(
             'model' => Description::class,
-            'options' => array('type' => ['Abstract', 'Methods', 'Technical_info', 'Series_information', 'Other']),
+            'options' => array('type' => ['Abstract']),
+            'fetch' => 'eager'
+        ),
+        'TitleAbstractAdditional' => array(
+            'model' => Description::class,
+            'options' => array('type' => ['Methods', 'Technical_info', 'Series_information', 'Other']),
             'fetch' => 'eager'
         ),
         'Licence' => array(
diff --git a/public/datasetxml2oai-pmh.xslt b/public/datasetxml2oai-pmh.xslt
index b29628d..4e4fe75 100644
--- a/public/datasetxml2oai-pmh.xslt
+++ b/public/datasetxml2oai-pmh.xslt
@@ -315,8 +315,12 @@
     <oai_dc:dc xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
       <!-- dc:title -->
       <xsl:apply-templates select="TitleMain" mode="oai_dc" />
+      <!-- dc:title -->
+      <xsl:apply-templates select="TitleAdditional" mode="oai_dc" />
       <!-- dc:description -->
       <xsl:apply-templates select="TitleAbstract" mode="oai_dc" />
+       <!-- dc:description -->
+      <xsl:apply-templates select="TitleAbstractAdditional" mode="oai_dc" />
       <!-- dc:subject -->
       <xsl:apply-templates select="Subject" mode="oai_dc" />
       <!--<dc:creator>-->
@@ -397,6 +401,11 @@
       <xsl:value-of select="@Value"/>
     </dc:title>
   </xsl:template>
+  <xsl:template match="TitleAdditional" mode="oai_dc">
+    <dc:title>
+      <xsl:value-of select="@Value"/>
+    </dc:title>
+  </xsl:template>
 
   <xsl:template match="TitleAbstract" mode="oai_dc">
     <dc:description>
@@ -406,12 +415,20 @@
       <xsl:value-of select="@Value" />
     </dc:description>
   </xsl:template>
+  <xsl:template match="TitleAbstractAdditional" mode="oai_dc">
+    <dc:description>
+      <xsl:attribute name="xml:lang">
+        <xsl:value-of select="@Language" />
+      </xsl:attribute>
+      <xsl:value-of select="@Value" />
+    </dc:description>
+  </xsl:template>
 
   <xsl:template match="Subject" mode="oai_dc">
     <dc:subject>
-      <xsl:if test="@language != ''">
+      <xsl:if test="@Language != ''">
         <xsl:attribute name="xml:lang">
-          <xsl:value-of select="php:functionString('Oai_Model_Language::getLanguageCode', @Language, 'part1')" />
+          <xsl:value-of select="@Language" />
         </xsl:attribute>
       </xsl:if>
       <xsl:value-of select="@Value" />
diff --git a/public/prefixes/oai_datacite.xslt b/public/prefixes/oai_datacite.xslt
index ae2e1be..bdfb093 100644
--- a/public/prefixes/oai_datacite.xslt
+++ b/public/prefixes/oai_datacite.xslt
@@ -55,6 +55,7 @@
             </creators>
             <titles>
                 <xsl:apply-templates select="TitleMain" mode="oai_datacite" />
+                <xsl:apply-templates select="TitleAdditional" mode="oai_datacite" />
             </titles>
             <publisher>
                 <xsl:value-of select="@PublisherName" />
@@ -62,6 +63,9 @@
             <publicationYear>
                 <xsl:value-of select="ServerDatePublished/@Year"/>
             </publicationYear>
+            <subjects>
+                <xsl:apply-templates select="Subject" mode="oai_datacite" />
+            </subjects>
             <language>
                 <xsl:value-of select="@Language" />
             </language>
@@ -86,6 +90,7 @@
             </formats>
             <descriptions>
                 <xsl:apply-templates select="TitleAbstract" mode="oai_datacite" />
+                <xsl:apply-templates select="TitleAbstractAdditional" mode="oai_datacite" />
             </descriptions>
             <geoLocations>
                 <xsl:apply-templates select="Coverage" mode="oai_datacite" />
@@ -133,6 +138,19 @@
             <xsl:value-of select="@Value" />
         </description>
     </xsl:template>
+    <xsl:template match="TitleAbstractAdditional" mode="oai_datacite">
+        <description>
+            <xsl:attribute name="xml:lang">
+                <xsl:value-of select="@Language" />
+            </xsl:attribute>
+            <xsl:if test="@Type != ''">
+                <xsl:attribute name="descriptionType">
+                    <xsl:value-of select="@Type" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@Value" />
+        </description>
+    </xsl:template>
 
     <xsl:template match="TitleMain" mode="oai_datacite">
         <title>
@@ -149,6 +167,32 @@
             <xsl:value-of select="@Value"/>
         </title>
     </xsl:template>
+     <xsl:template match="TitleAdditional" mode="oai_datacite">
+        <title>
+            <xsl:if test="@Language != ''">
+                <xsl:attribute name="xml:lang">
+                    <xsl:value-of select="@Language" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="@Type != '' and @Type != 'Main'">
+                <xsl:attribute name="titleType">
+                    <xsl:value-of select="@Type" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@Value"/>
+        </title>
+    </xsl:template>
+
+    <xsl:template match="Subject" mode="oai_datacite">
+        <subject>
+     <xsl:if test="@Language != ''">
+        <xsl:attribute name="xml:lang">
+          <xsl:value-of select="@Language" />
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:value-of select="@Value" /> 
+      </subject>
+  </xsl:template>
 
     <xsl:template match="PersonContributor" mode="oai_datacite">
         <contributor>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 5b98a94..1ef5478 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -8,7 +8,7 @@
     <!-- Basic Page Needs
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->
     <meta charset="utf-8">
-    <title>RDR - For Scientists</title>
+    <title>RDR - Geology Geophysics Meteorology</title>
     <meta name="description" content="An awesome one page website">
     <meta name="author" content="Arno Kaimbacher">
     <meta name="csrf-token" content="{{ csrf_token() }}">
@@ -46,7 +46,7 @@
 
 <body class="layout-home-html">
     <div id="trynewsite">
-        <span>Repository Demo</span>
+        <span>RDR Testphase</span>
     </div>
 
     <!-- Menu -->