From 105e31dbbdab97eb7b5b82a9da576296e75cc643 Mon Sep 17 00:00:00 2001 From: Arno Kaimbacher Date: Mon, 7 Jun 2021 10:05:22 +0200 Subject: [PATCH] - EditorController.php und SubmiotController.php: correct referenceTypes - also in *_create_document_references_table.php correct referenceTypes - correct LicencesTableSeeder.php: open access licences --- .../Controllers/Publish/EditorController.php | 2 +- .../Controllers/Publish/SubmitController.php | 2 +- ...05025_create_document_references_table.php | 5 ++- database/seeds/LicencesTableSeeder.php | 33 ++++++++++++------- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Publish/EditorController.php b/app/Http/Controllers/Publish/EditorController.php index 68e6e34..973bbab 100644 --- a/app/Http/Controllers/Publish/EditorController.php +++ b/app/Http/Controllers/Publish/EditorController.php @@ -172,7 +172,7 @@ class EditorController extends Controller $keywordTypes = ['uncontrolled' => 'uncontrolled', 'swd' => 'swd']; - $referenceTypes = ["rdr-id", "doi", "handle", "isbn", "issn", "url", "urn"]; + $referenceTypes = ["DOI", "Handle", "ISBN", "ISSN", "URL", "URN"]; $referenceTypes = array_combine($referenceTypes, $referenceTypes); $relationTypes = [ diff --git a/app/Http/Controllers/Publish/SubmitController.php b/app/Http/Controllers/Publish/SubmitController.php index c8bfb9c..58780c9 100644 --- a/app/Http/Controllers/Publish/SubmitController.php +++ b/app/Http/Controllers/Publish/SubmitController.php @@ -105,7 +105,7 @@ class SubmitController extends Controller $keywordTypes = ['uncontrolled' => 'uncontrolled', 'swd' => 'swd']; - $referenceTypes = ["rdr-id", "doi", "handle", "isbn", "issn", "url", "urn"]; + $referenceTypes = ["DOI", "Handle", "ISBN", "ISSN", "URL", "URN"]; $referenceTypes = array_combine($referenceTypes, $referenceTypes); $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", diff --git a/database/migrations/2019_09_02_105025_create_document_references_table.php b/database/migrations/2019_09_02_105025_create_document_references_table.php index e882e2e..fc660c4 100644 --- a/database/migrations/2019_09_02_105025_create_document_references_table.php +++ b/database/migrations/2019_09_02_105025_create_document_references_table.php @@ -23,8 +23,11 @@ class CreateDocumentReferencesTable extends Migration $table->enum( 'type', - ["doi", "handle", "isbn", "issn", "url", "urn"] + ["DOI", "Handle", "ISBN", "ISSN", "URL", "URN"] ); + // ALTER TABLE gba.document_references + // DROP CONSTRAINT document_references_type_check + // , ADD CONSTRAINT document_references_type_check CHECK (type::text = ANY (ARRAY['DOI'::character varying, 'Handle'::character varying, 'ISBN'::character varying, 'ISSN'::character varying, 'URL'::character varying, 'URN'::character varying]::text[])); $table->enum( 'relation', ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", diff --git a/database/seeds/LicencesTableSeeder.php b/database/seeds/LicencesTableSeeder.php index d2578c1..0783f61 100644 --- a/database/seeds/LicencesTableSeeder.php +++ b/database/seeds/LicencesTableSeeder.php @@ -17,30 +17,39 @@ class LicencesTableSeeder extends Seeder DB::table('document_licences')->insert([ [ 'active' => true, - 'comment_internal' => "Lediglich die Namensnennung ist zwingend.", + 'comment_internal' => "Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use..", 'desc_markup' => '

Dieser Inhalt is unter einer Creative Commons License lizenziert.

', - 'desc_text' => "Diese Lizenz erlaubt anderen, Ihr Werk/Ihren Inhalt zu verbreiten, zu remixen, zu verbessern und darauf aufzubauen, auch kommerziell, solange Sie als Urheber des Originals genannt werden. Dies ist die freieste CC-Lizenz, empfohlen für maximale Verbreitung und Nutzung des lizenzierten Materials.", - 'language' => 'de', + 'desc_text' => "You are free to: + Share — copy and redistribute the material in any medium or format + Adapt — remix, transform, and build upon the material + for any purpose, even commercially. + This license is acceptable for Free Cultural Works. + The licensor cannot revoke these freedoms as long as you follow the license terms.", + 'language' => 'en', 'link_licence' => 'https://creativecommons.org/licenses/by/3.0/de/deed.de', - 'link_logo' => 'https://i.creativecommons.org/l/by/3.0/de/88x31.png', + 'link_logo' => 'https://licensebuttons.net/l/by/4.0/88x31.png', 'mime_type' => 'text/html', - 'name_long' => 'Creative Commons - Namensnennung (CC BY)', - 'name' => 'CC BY', + 'name_long' => 'Creative Commons Attribution 4.0 International (CC BY 4.0)', + 'name' => 'CC-BY-4.0', 'pod_allowed' => true, 'sort_order' => 1, ], [ 'active' => true, - 'comment_internal' => "Namensnennung-BearbeitungUnterGleichenBedingungen\r\n\r\nIn Einschränkung zur CC-BY-Lizenz muss hier bei der Weiterverabeitung die Lizenz beibehalten werden.", + 'comment_internal' => "Attribution — You must give appropriate credit, provide a link to the license, + and indicate if changes were made. You may do so in any reasonable manner, + but not in any way that suggests the licensor endorses you or your use. + ShareAlike — If you remix, transform, or build upon the material, + you must distribute your contributions under the same license as the original.", 'desc_markup' => '

Dieser Inhalt ist unter einer Creative Commons-Lizenz lizenziert.

', 'desc_text' => "Diese Lizenz erlaubt es anderen, Ihr Werk/Ihren Inhalt zu verbreiten, zu remixen, zu verbessern und darauf aufzubauen, auch kommerziell, solange Sie als Urheber des Originals genannt werden und die auf Ihrem Werk/Inhalt basierenden neuen Werke unter denselben Bedingungen veröffentlicht werden. Diese Lizenz wird oft mit \"Copyleft\"-Lizenzen im Bereich freier und Open Source Software verglichen. Alle neuen Werke/Inhalte, die auf Ihrem aufbauen, werden unter derselben Lizenz stehen, also auch kommerziell nutzbar sein. Dies ist die Lizenz, die auch von der Wikipedia eingesetzt wird, empfohlen für Material, für das eine Einbindung von Wikipedia-Material oder anderen so lizenzierten Inhalten sinnvoll sein kann.", - 'language' => 'de', - 'link_licence' => 'https://creativecommons.org/licenses/by-sa/3.0/de/deed.de', - 'link_logo' => 'https://i.creativecommons.org/l/by-sa/3.0/de/88x31.png', + 'language' => 'en', + 'link_licence' => 'https://creativecommons.org/licenses/by-sa/4.0/deed.en', + 'link_logo' => 'https://licensebuttons.net/l/by-sa/4.0/88x31.png', 'mime_type' => 'text/html', - 'name_long' => 'Creative Commons - Namensnennung - Weitergabe unter gleichen Bedingungen (CC BY-SA)', - 'name' => 'CC BY-SA', + 'name_long' => 'Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)', + 'name' => 'CC-BY-SA-4.0', 'pod_allowed' => true, 'sort_order' => 2, ],