geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- capitalize dataset tite types

Browse Source 
- oai: added dc creator
This commit is contained in:
Arno Kaimbacher 2019-09-16 17:34:57 +02:00
parent 3a67bba19a
commit 8f040c2770
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Library/Xml/DatasetExtension.php
View File

@ -23,12 +23,12 @@ trait DatasetExtension
protected $externalFields = array( protected $externalFields = array(
'TitleMain' => array( 'TitleMain' => array(
'model' => Title::class, 'model' => Title::class,
'options' => array('type' => ['main', 'alternative', 'sub', 'translated', 'other']), 'options' => array('type' => ['Main', 'Alternative', 'Sub', 'Translated', 'Other']),
'fetch' => 'eager' 'fetch' => 'eager'
), ),
'TitleAbstract' => array( 'TitleAbstract' => array(
'model' => Description::class, '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' 'fetch' => 'eager'
), ),
'Licence' => array( 'Licence' => array(

5
database/migrations/2019_08_28_083836_create_documents_table.php
View File

@ -15,8 +15,9 @@ class CreateDocumentsTable extends Migration
{ {
Schema::create('documents', function (Blueprint $table) { Schema::create('documents', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');
$table->string('contributing_corporation', 50)->nullable(); $table->string('contributing_corporation', 255)->nullable();
$table->string('creating_corporation', 50); $table->string('creating_corporation', 255);
$table->string('publisher_name', 255)->nullable();
$table->dateTime('embargo_date')->nullable(); $table->dateTime('embargo_date')->nullable();
$table->integer('project_id')->unsigned()->nullable(); $table->integer('project_id')->unsigned()->nullable();
$table->foreign('project_id')->references('id')->on('projects'); $table->foreign('project_id')->references('id')->on('projects');

10
public/datasetxml2oai-pmh.xslt
View File

@ -418,7 +418,7 @@
</dc:subject> </dc:subject>
</xsl:template> </xsl:template>
<!-- <xsl:template match="PersonAuthor|PersonEditor" mode="oai_dc"> <xsl:template match="PersonAuthor|PersonEditor" mode="oai_dc">
<dc:creator> <dc:creator>
<xsl:value-of select="@LastName" /> <xsl:value-of select="@LastName" />
<xsl:if test="@FirstName != ''"> <xsl:if test="@FirstName != ''">
@ -431,7 +431,7 @@
<xsl:text>)</xsl:text> <xsl:text>)</xsl:text>
</xsl:if> </xsl:if>
</dc:creator> </dc:creator>
</xsl:template> --> </xsl:template>
<xsl:template match="PersonContributor" mode="oai_dc"> <xsl:template match="PersonContributor" mode="oai_dc">
<dc:contributor> <dc:contributor>
@ -503,6 +503,12 @@
</dc:identifier> </dc:identifier>
</xsl:template> </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"> <xsl:template match="@Language" mode="oai_dc">
<dc:language> <dc:language>
<xsl:value-of select="." /> <xsl:value-of select="." />

4
resources/views/publish/create-step1.blade.php
View File

@ -236,9 +236,9 @@
</fieldset> </fieldset>
<fieldset id="fieldset-publisher"> <fieldset id="fieldset-publisher">
<legend>Publisher</legend> <legend>Creating Corporation</legend>
<div class="pure-u-1 pure-u-md-1-2 pure-div"> <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' => {!! Form::text('CreatingCorporation', null, ['readonly', 'class' =>
'pure-u-23-24', 'v-model' => 'dataset.creating_corporation', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!} 'pure-u-23-24', 'v-model' => 'dataset.creating_corporation', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
</div> </div>

12
routes/web.php
View File

@ -272,14 +272,14 @@ Route::group(['middleware' => ['permission:settings']], function () {
Route::patch('settings/document/update/{id}', [ Route::patch('settings/document/update/{id}', [
'as' => 'settings.document.update', 'uses' => 'Settings\DatasetController@update', 'as' => 'settings.document.update', 'uses' => 'Settings\DatasetController@update',
]); ]);
Route::get('settings/file/download/{id}', [ // Route::get('settings/file/download/{id}', [
'as' => 'settings.file.download', 'uses' => 'Settings\DatasetController@download', // 'as' => 'settings.file.download', 'uses' => 'Settings\DatasetController@download',
]); // ]);
// //============================================================================================================= // //=============================================================================================================
// //=================================================setting file============================================= // //=================================================setting file=============================================
// Route::get('settings/file/download/{id}', [ Route::get('settings/file/download/{id}', [
// 'as' => 'file.download', 'uses' => 'Settings\FileController@download', 'as' => 'settings.file.download', 'uses' => 'Settings\FileController@download',
// ]); ]);
//=================================================setting mimetype============================================= //=================================================setting mimetype=============================================
Route::get('/settings/mimetype', [ Route::get('/settings/mimetype', [