From 8f040c277032fde3780ee35cf47cf58d83dc7d69 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Mon, 16 Sep 2019 17:34:57 +0200
Subject: [PATCH] - capitalize dataset tite types - oai: added dc creator

---
 app/Library/Xml/DatasetExtension.php                 |  4 ++--
 .../2019_08_28_083836_create_documents_table.php     |  5 +++--
 public/datasetxml2oai-pmh.xslt                       | 10 ++++++++--
 resources/views/publish/create-step1.blade.php       |  4 ++--
 routes/web.php                                       | 12 ++++++------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/Library/Xml/DatasetExtension.php b/app/Library/Xml/DatasetExtension.php
index 42a61f3..453bbb7 100644
--- a/app/Library/Xml/DatasetExtension.php
+++ b/app/Library/Xml/DatasetExtension.php
@@ -23,12 +23,12 @@ trait DatasetExtension
     protected $externalFields = array(
         'TitleMain' => array(
             'model' => Title::class,
-            'options' => array('type' => ['main', 'alternative', 'sub', 'translated', 'other']),
+            'options' => array('type' => ['Main', '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', 'Methods', 'Technical_info', 'Series_information', 'Other']),
             'fetch' => 'eager'
         ),
         'Licence' => array(
diff --git a/database/migrations/2019_08_28_083836_create_documents_table.php b/database/migrations/2019_08_28_083836_create_documents_table.php
index 17524f4..00294e2 100644
--- a/database/migrations/2019_08_28_083836_create_documents_table.php
+++ b/database/migrations/2019_08_28_083836_create_documents_table.php
@@ -15,8 +15,9 @@ class CreateDocumentsTable extends Migration
     {
         Schema::create('documents', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('contributing_corporation', 50)->nullable();
-            $table->string('creating_corporation', 50);
+            $table->string('contributing_corporation', 255)->nullable();
+            $table->string('creating_corporation', 255);
+            $table->string('publisher_name', 255)->nullable();
             $table->dateTime('embargo_date')->nullable();
             $table->integer('project_id')->unsigned()->nullable();
             $table->foreign('project_id')->references('id')->on('projects');
diff --git a/public/datasetxml2oai-pmh.xslt b/public/datasetxml2oai-pmh.xslt
index 8799dc4..b29628d 100644
--- a/public/datasetxml2oai-pmh.xslt
+++ b/public/datasetxml2oai-pmh.xslt
@@ -418,7 +418,7 @@
     </dc:subject>
   </xsl:template>
 
-  <!-- <xsl:template match="PersonAuthor|PersonEditor" mode="oai_dc">
+  <xsl:template match="PersonAuthor|PersonEditor" mode="oai_dc">
     <dc:creator>
       <xsl:value-of select="@LastName" />
       <xsl:if test="@FirstName != ''">
@@ -431,7 +431,7 @@
         <xsl:text>)</xsl:text>
       </xsl:if>
     </dc:creator>
-  </xsl:template> -->
+  </xsl:template>
 
   <xsl:template match="PersonContributor" mode="oai_dc">
     <dc:contributor>
@@ -503,6 +503,12 @@
     </dc:identifier>
   </xsl:template>
 
+ <xsl:template match="@CreatingCorporation" mode="oai_dc">
+    <dc:language>
+      <xsl:value-of select="." />
+    </dc:language>
+  </xsl:template> 
+
   <xsl:template match="@Language" mode="oai_dc">
     <dc:language>
       <xsl:value-of select="." />
diff --git a/resources/views/publish/create-step1.blade.php b/resources/views/publish/create-step1.blade.php
index d70a752..9ed301e 100644
--- a/resources/views/publish/create-step1.blade.php
+++ b/resources/views/publish/create-step1.blade.php
@@ -236,9 +236,9 @@
                 </fieldset>  
 
                 <fieldset id="fieldset-publisher">
-                    <legend>Publisher</legend>
+                    <legend>Creating Corporation</legend>
                     <div class="pure-u-1 pure-u-md-1-2 pure-div">
-                        {!! Form::label('CreatingCorporation', 'Creating Corporation') !!} 
+                        {!! Form::label('CreatingCorporation', 'Corporation Name') !!} 
                         {!! Form::text('CreatingCorporation', null, ['readonly', 'class' =>
                         'pure-u-23-24', 'v-model' => 'dataset.creating_corporation', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
                     </div>
diff --git a/routes/web.php b/routes/web.php
index 2fd27ad..2650b62 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -272,14 +272,14 @@ Route::group(['middleware' => ['permission:settings']], function () {
     Route::patch('settings/document/update/{id}', [
         'as' => 'settings.document.update', 'uses' => 'Settings\DatasetController@update',
     ]);
-    Route::get('settings/file/download/{id}', [
-        'as' => 'settings.file.download', 'uses' => 'Settings\DatasetController@download',
-    ]);
+    // Route::get('settings/file/download/{id}', [
+    //     'as' => 'settings.file.download', 'uses' => 'Settings\DatasetController@download',
+    // ]);
     // //=============================================================================================================
     // //=================================================setting file=============================================
-    // Route::get('settings/file/download/{id}', [
-    //     'as' => 'file.download', 'uses' => 'Settings\FileController@download',
-    // ]);
+    Route::get('settings/file/download/{id}', [
+        'as' => 'settings.file.download', 'uses' => 'Settings\FileController@download',
+    ]);
 
     //=================================================setting mimetype=============================================
     Route::get('/settings/mimetype', [