- composer updates

- DatasetExtension.php_ erweitert um EmbargoDate- und CreatedAt-Attribute
- dc:type im OAI ist nun nur Dataset
- datacite: Anzeige Erstellungsdatum und EmbargoDatum
- Im Frontend nun: "Datum der Freischaltung"
This commit is contained in:
Arno Kaimbacher 2020-04-02 07:50:08 +02:00
parent fd4b0eb87d
commit 82665ab35c
5 changed files with 443 additions and 159 deletions

View File

@ -108,7 +108,7 @@ trait DatasetExtension
"PublishedDate", "PublishedYear", "PublishedDate", "PublishedYear",
"PublisherName", "PublisherPlace", "PublisherName", "PublisherPlace",
"PublicationState", "PublicationState",
"ServerDateCreated", "EmbargoDate", "CreatedAt",
"ServerDateModified", "ServerDateModified",
"ServerDatePublished", "ServerDatePublished",
"ServerDateDeleted", "ServerDateDeleted",
@ -132,8 +132,8 @@ trait DatasetExtension
// Initialize available date fields and set up date validator // Initialize available date fields and set up date validator
// if the particular field is present // if the particular field is present
$dateFields = array( $dateFields = array(
'ServerDateCreated', 'PublishedDate', 'EmbargoDate', 'CreatedAt', 'PublishedDate',
'ServerDateModified', 'ServerDatePublished', 'ServerDateDeleted', 'EmbargoDate' 'ServerDatePublished', 'ServerDateDeleted', 'EmbargoDate'
); );
foreach ($dateFields as $fieldName) { foreach ($dateFields as $fieldName) {
$this->getField($fieldName) $this->getField($fieldName)

478
composer.lock generated
View File

@ -1200,16 +1200,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.32.0", "version": "2.32.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "7410a349613bf32d02d8aaed1c669698ddd2b718" "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7410a349613bf32d02d8aaed1c669698ddd2b718", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f10e22cf546704fab1db4ad4b9dedbc5c797a0dc",
"reference": "7410a349613bf32d02d8aaed1c669698ddd2b718", "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1277,7 +1277,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-24T16:01:47+00:00" "time": "2020-03-31T13:43:19+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@ -1919,16 +1919,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9" "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9", "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
"reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9", "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1991,20 +1991,34 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-24T13:10:00+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T11:41:10+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.0.5", "version": "v5.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44" "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/a0b51ba9938ccc206d9284de7eb527c2d4550b44", "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
"reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44", "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2044,20 +2058,34 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-04T09:41:09+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "a980d87a659648980d89193fd8b7a7ca89d97d21" "reference": "346636d2cae417992ecfd761979b2ab98b339a45"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21", "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45",
"reference": "a980d87a659648980d89193fd8b7a7ca89d97d21", "reference": "346636d2cae417992ecfd761979b2ab98b339a45",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2100,20 +2128,34 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-23T14:41:43+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "89aa4b9ac6f1f35171b8621b24f60477312085be" "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/89aa4b9ac6f1f35171b8621b24f60477312085be", "url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358",
"reference": "89aa4b9ac6f1f35171b8621b24f60477312085be", "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2156,20 +2198,34 @@
], ],
"description": "Symfony ErrorHandler Component", "description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-26T11:45:31+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d" "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
"reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d", "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2226,7 +2282,21 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-04T09:32:40+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/event-dispatcher-contracts", "name": "symfony/event-dispatcher-contracts",
@ -2288,16 +2358,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357" "reference": "5729f943f9854c5781984ed4907bbb817735776b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357", "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b",
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357", "reference": "5729f943f9854c5781984ed4907bbb817735776b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2333,20 +2403,34 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-14T07:42:58+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648" "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62f92509c9abfd1f73e17b8cf1b72c0bdac6611b",
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648", "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2388,20 +2472,34 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-13T19:40:01+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "8c8734486dada83a6041ab744709bdc1651a8462" "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/8c8734486dada83a6041ab744709bdc1651a8462", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f356a489e51856b99908005eb7f2c51a1dfc95dc",
"reference": "8c8734486dada83a6041ab744709bdc1651a8462", "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2492,20 +2590,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-02-29T10:31:38+00:00" "time": "2020-03-30T14:59:15+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.0.5", "version": "v5.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c" "reference": "481b7d6da88922fb1e0d86a943987722b08f3955"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c", "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955",
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c", "reference": "481b7d6da88922fb1e0d86a943987722b08f3955",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2554,20 +2652,34 @@
"mime", "mime",
"mime-type" "mime-type"
], ],
"time": "2020-02-04T09:41:09+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2579,7 +2691,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2612,20 +2724,34 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"time": "2020-01-13T11:15:53+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-iconv", "name": "symfony/polyfill-iconv",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git", "url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e" "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/926832ce51059bb58211b7b2080a88e0c3b5328e", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ad6d62792bfbcfc385dd34b424d4fcf9712a32c8",
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e", "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2637,7 +2763,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2671,20 +2797,34 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-01-13T11:15:53+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a" "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a", "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2698,7 +2838,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2733,20 +2873,34 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-01-17T12:01:36+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2758,7 +2912,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2792,20 +2946,34 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-01-13T11:15:53+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf" "reference": "37b0976c78b94856543260ce09b460a7bc852747"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", "reference": "37b0976c78b94856543260ce09b460a7bc852747",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2814,7 +2982,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2847,20 +3015,34 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-01-13T11:15:53+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
"version": "v1.14.0", "version": "v1.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php73.git", "url": "https://github.com/symfony/polyfill-php73.git",
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675" "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675", "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2869,7 +3051,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.14-dev" "dev-master": "1.15-dev"
} }
}, },
"autoload": { "autoload": {
@ -2905,20 +3087,34 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2020-01-13T11:15:53+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7" "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7", "url": "https://api.github.com/repos/symfony/process/zipball/3e40e87a20eaf83a1db825e1fa5097ae89042db3",
"reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7", "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2954,20 +3150,34 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-07T20:06:44+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "4124d621d0e445732520037f888a0456951bde8c" "reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/4124d621d0e445732520037f888a0456951bde8c", "url": "https://api.github.com/repos/symfony/routing/zipball/0f562fa613e288d7dbae6c63abbc9b33ed75a8f8",
"reference": "4124d621d0e445732520037f888a0456951bde8c", "reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3030,7 +3240,21 @@
"uri", "uri",
"url" "url"
], ],
"time": "2020-02-25T12:41:09+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T11:41:10+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
@ -3092,16 +3316,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "0a19a77fba20818a969ef03fdaf1602de0546353" "reference": "4e54d336f2eca5facad449d0b0118bb449375b76"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353", "url": "https://api.github.com/repos/symfony/translation/zipball/4e54d336f2eca5facad449d0b0118bb449375b76",
"reference": "0a19a77fba20818a969ef03fdaf1602de0546353", "reference": "4e54d336f2eca5facad449d0b0118bb449375b76",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3164,7 +3388,21 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-02-04T09:32:40+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
@ -3225,16 +3463,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.4.5", "version": "v4.4.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "2572839911702b0405479410ea7a1334bfab0b96" "reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/2572839911702b0405479410ea7a1334bfab0b96", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5a0c2d93006131a36cf6f767d10e2ca8333b0d4a",
"reference": "2572839911702b0405479410ea7a1334bfab0b96", "reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3297,7 +3535,21 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2020-02-24T13:10:00+00:00" "funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -3350,16 +3602,16 @@
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v3.6.1", "version": "v3.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "8f7961f7b9deb3b432452c18093cf16f88205902" "reference": "786a947e57086cf236cefdee80784634224b99fa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8f7961f7b9deb3b432452c18093cf16f88205902", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/786a947e57086cf236cefdee80784634224b99fa",
"reference": "8f7961f7b9deb3b432452c18093cf16f88205902", "reference": "786a947e57086cf236cefdee80784634224b99fa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3369,10 +3621,12 @@
}, },
"require-dev": { "require-dev": {
"ext-filter": "*", "ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
}, },
"suggest": { "suggest": {
"ext-filter": "Required to use the boolean validator." "ext-filter": "Required to use the boolean validator.",
"ext-pcre": "Required to use most of the library."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -3413,7 +3667,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-03-12T13:44:00+00:00" "time": "2020-03-27T23:36:02+00:00"
}, },
{ {
"name": "yajra/laravel-datatables-oracle", "name": "yajra/laravel-datatables-oracle",

View File

@ -350,7 +350,8 @@
<!-- dc:date: embargo date --> <!-- dc:date: embargo date -->
<xsl:apply-templates select="EmbargoDate" mode="oai_dc" /> <xsl:apply-templates select="EmbargoDate" mode="oai_dc" />
<!-- dc:type --> <!-- dc:type -->
<xsl:apply-templates select="@Type" mode="oai_dc" /> <!-- <xsl:apply-templates select="@Type" mode="oai_dc" /> -->
<dc:type>Dataset</dc:type>
<!-- dc:format --> <!-- dc:format -->
<xsl:apply-templates select="File/@MimeType" mode="oai_dc" /> <xsl:apply-templates select="File/@MimeType" mode="oai_dc" />
<!-- dc:identifier --> <!-- dc:identifier -->
@ -488,19 +489,20 @@
<dc:date> <dc:date>
<xsl:choose> <xsl:choose>
<xsl:when test="PublishedDate"> <xsl:when test="PublishedDate">
<xsl:value-of select="PublishedDate/@Year"/> <xsl:variable name="publishedDate" select="concat(
- <xsl:value-of select="format-number(PublishedDate/@Month,'00')"/> PublishedDate/@Year, '-',
- <xsl:value-of select="format-number(PublishedDate/@Day,'00')"/> format-number(PublishedDate/@Month,'00'), '-',
</xsl:when> format-number(PublishedDate/@Day,'00')
<xsl:when test="CompletedDate"> )" />
<xsl:value-of select="CompletedDate/@Year"/> <xsl:value-of select="$publishedDate" />
- <xsl:value-of select="format-number(CompletedDate/@Month,'00')"/> </xsl:when>
- <xsl:value-of select="format-number(CompletedDate/@Day,'00')"/>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="ServerDatePublished/@Year"/> <xsl:variable name="serverDatePublished" select="concat(
- <xsl:value-of select="format-number(ServerDatePublished/@Month,'00')"/> ServerDatePublished/@Year, '-',
- <xsl:value-of select="format-number(ServerDatePublished/@Day,'00')"/> format-number(ServerDatePublished/@Month,'00'), '-',
format-number(ServerDatePublished/@Day,'00')
)" />
<xsl:value-of select="$serverDatePublished" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</dc:date> </dc:date>
@ -517,7 +519,7 @@
<!-- für ListRecords --> <!-- für ListRecords -->
<xsl:template match="@Type" mode="oai_dc"> <!-- <xsl:template match="@Type" mode="oai_dc">
<dc:type> <dc:type>
<xsl:value-of select="." /> <xsl:value-of select="." />
</dc:type> </dc:type>
@ -525,7 +527,7 @@
<xsl:text>data-type:</xsl:text> <xsl:text>data-type:</xsl:text>
<xsl:value-of select="." /> <xsl:value-of select="." />
</dc:type> </dc:type>
</xsl:template> </xsl:template> -->
<xsl:template match="File/@MimeType" mode="oai_dc"> <xsl:template match="File/@MimeType" mode="oai_dc">
<dc:format> <dc:format>

View File

@ -73,15 +73,18 @@
<contributors> <contributors>
<xsl:apply-templates select="PersonContributor" mode="oai_datacite" /> <xsl:apply-templates select="PersonContributor" mode="oai_datacite" />
</contributors> </contributors>
<dates>
<xsl:call-template name="RdrDate2" mode="oai_datacite" />
</dates>
<resourceType resourceTypeGeneral="Dataset"> <resourceType resourceTypeGeneral="Dataset">
<xsl:text>Dataset</xsl:text> <xsl:text>Dataset</xsl:text>
<!-- <xsl:value-of select="@Type" /> --> <!-- <xsl:value-of select="@Type" /> -->
</resourceType> </resourceType>
<xsl:if test="Reference"> <xsl:if test="Reference">
<relatedIdentifiers> <relatedIdentifiers>
<xsl:apply-templates select="Reference" mode="oai_datacite" /> <xsl:apply-templates select="Reference" mode="oai_datacite" />
</relatedIdentifiers> </relatedIdentifiers>
</xsl:if> </xsl:if>
<rightsList> <rightsList>
<xsl:apply-templates select="Licence" mode="oai_datacite" /> <xsl:apply-templates select="Licence" mode="oai_datacite" />
</rightsList> </rightsList>
@ -112,6 +115,31 @@
</resource> </resource>
</xsl:template> </xsl:template>
<xsl:template name="RdrDate2" mode="oai_datacite">
<xsl:if test="EmbargoDate">
<date>
<xsl:attribute name="dataType">Available</xsl:attribute>
<xsl:variable name="embargoDate" select="concat(
EmbargoDate/@Year, '-',
format-number(EmbargoDate/@Month,'00'), '-',
format-number(EmbargoDate/@Day,'00')
)" />
<xsl:value-of select="$embargoDate" />
</date>
</xsl:if>
<xsl:if test="CreatedAt">
<date>
<xsl:attribute name="dataType">created</xsl:attribute>
<xsl:variable name="createdAt" select="concat(
CreatedAt/@Year, '-',
format-number(CreatedAt/@Month,'00'), '-',
format-number(CreatedAt/@Day,'00')
)" />
<xsl:value-of select="$createdAt" />
</date>
</xsl:if>
</xsl:template>
<xsl:template match="Coverage" mode="oai_datacite"> <xsl:template match="Coverage" mode="oai_datacite">
<geoLocation> <geoLocation>
<geoLocationBox> <geoLocationBox>
@ -173,7 +201,7 @@
<xsl:value-of select="@Value"/> <xsl:value-of select="@Value"/>
</title> </title>
</xsl:template> </xsl:template>
<xsl:template match="TitleAdditional" mode="oai_datacite"> <xsl:template match="TitleAdditional" mode="oai_datacite">
<title> <title>
<xsl:if test="@Language != ''"> <xsl:if test="@Language != ''">
<xsl:attribute name="xml:lang"> <xsl:attribute name="xml:lang">
@ -191,34 +219,34 @@
<xsl:template match="Subject" mode="oai_datacite"> <xsl:template match="Subject" mode="oai_datacite">
<subject> <subject>
<xsl:if test="@Language != ''"> <xsl:if test="@Language != ''">
<xsl:attribute name="xml:lang"> <xsl:attribute name="xml:lang">
<xsl:value-of select="@Language" /> <xsl:value-of select="@Language" />
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:value-of select="@Value" /> <xsl:value-of select="@Value" />
</subject> </subject>
</xsl:template> </xsl:template>
<xsl:template match="Reference" mode="oai_datacite"> <xsl:template match="Reference" mode="oai_datacite">
<relatedIdentifier> <relatedIdentifier>
<xsl:attribute name="relatedIdentifierType"> <xsl:attribute name="relatedIdentifierType">
<xsl:value-of select="@Type" /> <xsl:value-of select="@Type" />
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="relationType"> <xsl:attribute name="relationType">
<xsl:value-of select="@Relation" /> <xsl:value-of select="@Relation" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="@Value" /> <xsl:value-of select="@Value" />
</relatedIdentifier> </relatedIdentifier>
</xsl:template> </xsl:template>
<xsl:template match="PersonContributor" mode="oai_datacite"> <xsl:template match="PersonContributor" mode="oai_datacite">
<contributor> <contributor>
<contributorName> <contributorName>
<xsl:if test="@NameType != ''"> <xsl:if test="@NameType != ''">
<xsl:attribute name="nameType"> <xsl:attribute name="nameType">
<xsl:value-of select="@NameType" /> <xsl:value-of select="@NameType" />
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:value-of select="@LastName" /> <xsl:value-of select="@LastName" />
</contributorName> </contributorName>

View File

@ -98,10 +98,10 @@
<p class="dataset__abstract">Size: {{ $dataset->files()->count() }} </p> <p class="dataset__abstract">Size: {{ $dataset->files()->count() }} </p>
@if($dataset->embargo_date != null) @if($dataset->embargo_date != null)
<p class="dataset__abstract">Ende des Embargo-Zeitraums: <p class="dataset__abstract">Datum der Freischaltung:
{{ $dataset->embargo_date->toDateString() }}</p> {{ $dataset->embargo_date->toDateString() }}</p>
@else {{-- @else
<p class="dataset__abstract">Ende des Embargo-Zeitraums: - </p> <p class="dataset__abstract">Datum der Freischaltung: - </p> --}}
@endif @endif
@if($dataset->hasEmbargoPassed() == true) @if($dataset->hasEmbargoPassed() == true)