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

- composer updates

Browse Source 
- IndexController.php: save crators with nameType 'Personal'
- change datacite to version 4.3
- date elements in datacite have the attribute dateType
This commit is contained in:
Arno Kaimbacher 2020-05-06 13:17:40 +02:00
parent cf996de390
commit 9d8625225f
4 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Publish/IndexController.php
View File

@ -378,7 +378,7 @@ class IndexController extends Controller
} else { } else {
$dataPerson = new Person($person); $dataPerson = new Person($person);
$dataPerson->status = true; $dataPerson->status = true;
$dataPerson->name_type = "Organizational"; $dataPerson->name_type = "Personal";
$dataset->persons()->save($dataPerson, $pivot_data); $dataset->persons()->save($dataPerson, $pivot_data);
} }
} }
@ -409,7 +409,7 @@ class IndexController extends Controller
} else { } else {
$dataContributor = new Person($contributor); $dataContributor = new Person($contributor);
$dataContributor->status = true; $dataContributor->status = true;
$dataContributor->name_type = "Organizational"; // $dataContributor->name_type = "Organizational";
$dataset->persons()->save($dataContributor, $pivot_data); $dataset->persons()->save($dataContributor, $pivot_data);
} }
} }

115
composer.lock generated
View File

@ -1215,21 +1215,22 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.32.2", "version": "2.33.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc" "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
"reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"php": "^7.1.8 || ^8.0", "php": "^7.1.8 || ^8.0",
"symfony/polyfill-mbstring": "^1.0",
"symfony/translation": "^3.4 || ^4.0 || ^5.0" "symfony/translation": "^3.4 || ^4.0 || ^5.0"
}, },
"require-dev": { "require-dev": {
@ -1292,7 +1293,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-31T13:43:19+00:00" "time": "2020-04-20T15:05:43+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@ -1934,7 +1935,7 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
@ -2024,7 +2025,7 @@
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.0.7", "version": "v5.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
@ -2091,7 +2092,7 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
@ -2161,7 +2162,7 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
@ -2231,7 +2232,7 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
@ -2373,7 +2374,7 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
@ -2436,16 +2437,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b" "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2",
"reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2501,20 +2502,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-30T14:07:33+00:00" "time": "2020-04-18T20:40:08+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc" "reference": "1799a6c01f0db5851f399151abdb5d6393fec277"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f356a489e51856b99908005eb7f2c51a1dfc95dc", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1799a6c01f0db5851f399151abdb5d6393fec277",
"reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc", "reference": "1799a6c01f0db5851f399151abdb5d6393fec277",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2605,20 +2606,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-30T14:59:15+00:00" "time": "2020-04-28T18:47:42+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.0.7", "version": "v5.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "481b7d6da88922fb1e0d86a943987722b08f3955" "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
"reference": "481b7d6da88922fb1e0d86a943987722b08f3955", "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2681,7 +2682,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-27T16:56:45+00:00" "time": "2020-04-17T03:29:44+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -3120,16 +3121,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3" "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/3e40e87a20eaf83a1db825e1fa5097ae89042db3", "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
"reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3", "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3179,20 +3180,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-04-15T15:56:18+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8" "reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/0f562fa613e288d7dbae6c63abbc9b33ed75a8f8", "url": "https://api.github.com/repos/symfony/routing/zipball/67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c",
"reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8", "reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3269,7 +3270,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-30T11:41:10+00:00" "time": "2020-04-21T19:59:53+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
@ -3331,16 +3332,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "4e54d336f2eca5facad449d0b0118bb449375b76" "reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/4e54d336f2eca5facad449d0b0118bb449375b76", "url": "https://api.github.com/repos/symfony/translation/zipball/8272bbd2b7e220ef812eba2a2b30068a5c64b191",
"reference": "4e54d336f2eca5facad449d0b0118bb449375b76", "reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3417,7 +3418,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-04-12T16:45:36+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
@ -3478,16 +3479,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.4.7", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a" "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/5a0c2d93006131a36cf6f767d10e2ca8333b0d4a", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c587e04ce5d1aa62d534a038f574d9a709e814cf",
"reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a", "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3564,7 +3565,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-04-12T16:14:02+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -3617,20 +3618,20 @@
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v3.6.3", "version": "v3.6.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "1b3103013797f04521c6cae5560f604649484066" "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
"reference": "1b3103013797f04521c6cae5560f604649484066", "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.4 || ^7.0", "php": "^5.4 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.5", "phpoption/phpoption": "^1.5",
"symfony/polyfill-ctype": "^1.9" "symfony/polyfill-ctype": "^1.9"
}, },
@ -3676,7 +3677,17 @@
"env", "env",
"environment" "environment"
], ],
"time": "2020-04-12T15:18:03+00:00" "funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
"type": "tidelift"
}
],
"time": "2020-05-02T13:46:13+00:00"
}, },
{ {
"name": "yajra/laravel-datatables-oracle", "name": "yajra/laravel-datatables-oracle",

2
public/datasetxml2oai-pmh.xslt
View File

@ -163,7 +163,7 @@
<xsl:text>oai_datacite</xsl:text> <xsl:text>oai_datacite</xsl:text>
</metadataPrefix> </metadataPrefix>
<schema> <schema>
<xsl:text>http://schema.datacite.org/meta/kernel-4.1/metadata.xsd</xsl:text> <xsl:text>http://schema.datacite.org/meta/kernel-4.3/metadata.xsd</xsl:text>
</schema> </schema>
<metadataNamespace> <metadataNamespace>
<xsl:text>http://datacite.org/schema/kernel-4</xsl:text> <xsl:text>http://datacite.org/schema/kernel-4</xsl:text>

8
public/prefixes/oai_datacite.xslt
View File

@ -39,9 +39,9 @@
<xsl:template match="Rdr_Dataset" mode="oai_datacite"> <xsl:template match="Rdr_Dataset" mode="oai_datacite">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.3/metadata.xsd">
<!-- <isReferenceQuality>true</isReferenceQuality> <!-- <isReferenceQuality>true</isReferenceQuality>
<schemaVersion>4.1</schemaVersion> <schemaVersion>4.3</schemaVersion>
<datacentreSymbol>RDR.GBA</datacentreSymbol> --> <datacentreSymbol>RDR.GBA</datacentreSymbol> -->
<identifier> <identifier>
<xsl:text>oai:</xsl:text> <xsl:text>oai:</xsl:text>
@ -121,7 +121,7 @@
xmlns="http://datacite.org/schema/kernel-4"> xmlns="http://datacite.org/schema/kernel-4">
<xsl:if test="EmbargoDate"> <xsl:if test="EmbargoDate">
<date> <date>
<xsl:attribute name="dataType">Available</xsl:attribute> <xsl:attribute name="dateType">Available</xsl:attribute>
<xsl:variable name="embargoDate" select="concat( <xsl:variable name="embargoDate" select="concat(
EmbargoDate/@Year, '-', EmbargoDate/@Year, '-',
format-number(EmbargoDate/@Month,'00'), '-', format-number(EmbargoDate/@Month,'00'), '-',
@ -132,7 +132,7 @@
</xsl:if> </xsl:if>
<xsl:if test="CreatedAt"> <xsl:if test="CreatedAt">
<date> <date>
<xsl:attribute name="dataType">created</xsl:attribute> <xsl:attribute name="dateType">created</xsl:attribute>
<xsl:variable name="createdAt" select="concat( <xsl:variable name="createdAt" select="concat(
CreatedAt/@Year, '-', CreatedAt/@Year, '-',
format-number(CreatedAt/@Month,'00'), '-', format-number(CreatedAt/@Month,'00'), '-',