From 06effbb2f72c2120b19c0f457acce23af8f3a60c Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Tue, 21 Apr 2020 21:52:00 +0200
Subject: [PATCH] - Ausbesserungen oai_datacite.xslt remove empty xmlns="" -
 editor edit view: Abstracts in einer Textarea

---
 public/datasetxml2oai-pmh.xslt                |  8 ++++--
 public/prefixes/oai_datacite.xslt             | 28 +++++++++----------
 .../views/workflow/editor/_form.blade.php     |  5 ++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/public/datasetxml2oai-pmh.xslt b/public/datasetxml2oai-pmh.xslt
index d05651b..32a45e0 100644
--- a/public/datasetxml2oai-pmh.xslt
+++ b/public/datasetxml2oai-pmh.xslt
@@ -162,8 +162,12 @@
         <metadataPrefix>
           <xsl:text>oai_datacite</xsl:text>
         </metadataPrefix>
-        <schema>http://schema.datacite.org/meta/kernel-4.1/metadata.xsd</schema>
-        <metadataNamespace>http://datacite.org/schema/kernel-4</metadataNamespace>
+        <schema>
+        <xsl:text>http://schema.datacite.org/meta/kernel-4.1/metadata.xsd</xsl:text>
+        </schema>
+        <metadataNamespace>
+        <xsl:text>http://datacite.org/schema/kernel-4</xsl:text>
+        </metadataNamespace>
       </metadataFormat>
     </ListMetadataFormats>
   </xsl:template>
diff --git a/public/prefixes/oai_datacite.xslt b/public/prefixes/oai_datacite.xslt
index 71c7e4a..085c463 100644
--- a/public/prefixes/oai_datacite.xslt
+++ b/public/prefixes/oai_datacite.xslt
@@ -38,8 +38,8 @@
     <xsl:output method="xml" indent="yes" />
 
     <xsl:template match="Rdr_Dataset" mode="oai_datacite">
-        <resource xmlns="http://datacite.org/schema/kernel-4" 
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.1/metadata.xsd">
+        <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" 
+            xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.1/metadata.xsd">
             <!-- <isReferenceQuality>true</isReferenceQuality>
       <schemaVersion>4.1</schemaVersion>
       <datacentreSymbol>RDR.GBA</datacentreSymbol> -->
@@ -115,7 +115,7 @@
         </resource>
     </xsl:template>
 
-    <xsl:template name="RdrDate2" mode="oai_datacite">
+    <xsl:template name="RdrDate2" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <xsl:if test="EmbargoDate">
             <date>
                 <xsl:attribute name="dataType">Available</xsl:attribute>
@@ -140,7 +140,7 @@
         </xsl:if>
     </xsl:template>
 
-    <xsl:template match="Coverage" mode="oai_datacite">
+    <xsl:template match="Coverage" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <geoLocation>
             <geoLocationBox>
                 <westBoundLongitude>
@@ -159,7 +159,7 @@
         </geoLocation>
     </xsl:template>
 
-    <xsl:template match="TitleAbstract" mode="oai_datacite">
+    <xsl:template match="TitleAbstract" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <description>
             <xsl:attribute name="xml:lang">
                 <xsl:value-of select="@Language" />
@@ -172,7 +172,7 @@
             <xsl:value-of select="@Value" />
         </description>
     </xsl:template>
-    <xsl:template match="TitleAbstractAdditional" mode="oai_datacite">
+    <xsl:template match="TitleAbstractAdditional" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <description>
             <xsl:attribute name="xml:lang">
                 <xsl:value-of select="@Language" />
@@ -186,7 +186,7 @@
         </description>
     </xsl:template>
 
-    <xsl:template match="TitleMain" mode="oai_datacite">
+    <xsl:template match="TitleMain" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <title>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -201,7 +201,7 @@
             <xsl:value-of select="@Value"/>
         </title>
     </xsl:template>
-    <xsl:template match="TitleAdditional" mode="oai_datacite">
+    <xsl:template match="TitleAdditional" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <title>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -217,7 +217,7 @@
         </title>
     </xsl:template>
 
-    <xsl:template match="Subject" mode="oai_datacite">
+    <xsl:template match="Subject" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <subject>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -228,7 +228,7 @@
         </subject>
     </xsl:template>
 
-    <xsl:template match="Reference" mode="oai_datacite">
+    <xsl:template match="Reference" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <relatedIdentifier>
             <xsl:attribute name="relatedIdentifierType">
                 <xsl:value-of select="@Type" />
@@ -240,7 +240,7 @@
         </relatedIdentifier>
     </xsl:template>
 
-    <xsl:template match="PersonContributor" mode="oai_datacite">
+    <xsl:template match="PersonContributor" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <contributor>
             <contributorName>
                 <xsl:if test="@NameType != ''">
@@ -254,7 +254,7 @@
     </xsl:template>
 
 
-    <xsl:template match="PersonAuthor" mode="oai_datacite">
+    <xsl:template match="PersonAuthor" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">    
         <creator>
             <creatorName>
                 <xsl:if test="@NameType != ''">
@@ -291,13 +291,13 @@
         </creator>
     </xsl:template>
 
-    <xsl:template match="File/@MimeType" mode="oai_datacite">
+    <xsl:template match="File/@MimeType" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <format>
             <xsl:value-of select="." />
         </format>
     </xsl:template>
 
-    <xsl:template match="Licence" mode="oai_datacite">
+    <xsl:template match="Licence" mode="oai_datacite" xmlns="http://datacite.org/schema/kernel-4">
         <rights>
             <xsl:if test="@LinkLicence != ''">
                 <xsl:attribute name="rightsURI">
diff --git a/resources/views/workflow/editor/_form.blade.php b/resources/views/workflow/editor/_form.blade.php
index f59d3a6..07ce77b 100644
--- a/resources/views/workflow/editor/_form.blade.php
+++ b/resources/views/workflow/editor/_form.blade.php
@@ -195,9 +195,10 @@
                 <td>
                     <input v-bind:name="'abstracts[' +  index +'][id]'" readonly class="form-control" v-model="abstract.id" hidden />
 
-                    <input type="text" :id="'abstracts['+ index +'][value]'"
+                    <textarea rows="4" cols="40" :id="'abstracts['+ index +'][value]'"
                         :name="'abstracts['+index+'][value]'" v-validate="'required|min:4|max:2500'" v-model="abstract.value"
-                        class="form-control">
+                        class="form-control"></textarea>
+                       
                 </td>
                 <td>
                     <template v-if="abstract.type == 'Abstract'">