From c69ce1567f852a02fc1d0c3a7b101fcdb3920c58 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 26 Jan 2025 09:38:18 +0100 Subject: [PATCH 1/3] Use https for digital.slub-dresden.de Signed-off-by: Stefan Weil --- Documentation/Introduction/Index.rst | 8 ++++---- Tests/Fixtures/Common/documents_1.csv | 6 +++--- Tests/Fixtures/Common/documents_1.solr.json | 6 +++--- Tests/Fixtures/Common/documents_fulltext.csv | 2 +- Tests/Fixtures/Common/documents_fulltext.solr.json | 2 +- Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml | 4 ++-- Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml | 4 ++-- Tests/Fixtures/Format/modsOriginInfo.xml | 4 ++-- .../Format/modsOriginInfoWithEditionElectronicEd.xml | 4 ++-- Tests/Fixtures/MetsDocument/av_beispiel.xml | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst index ca9a7bb94c..64ffc4d48c 100644 --- a/Documentation/Introduction/Index.rst +++ b/Documentation/Introduction/Index.rst @@ -107,7 +107,7 @@ Screenshots Some examples of Kitodo.Presentation in action on the `Digital Collection of SLUB Dresden `_: -http://digital.slub-dresden.de/id457052678 +https://digital.slub-dresden.de/id457052678 .. figure:: ../Images/Introduction/Digitale_Sammlungen_Colloquia_Lutheri.png :width: 820px @@ -115,7 +115,7 @@ http://digital.slub-dresden.de/id457052678 Mscr.Dresd.A.180.d -http://digital.slub-dresden.de/id416971482-19060601 +https://digital.slub-dresden.de/id416971482-19060601 .. figure:: ../Images/Introduction/Digitale_Sammlungen_The_Daily_1906.png :width: 820px @@ -123,7 +123,7 @@ http://digital.slub-dresden.de/id416971482-19060601 Newspaper Issue with Full-text Switched on -http://digital.slub-dresden.de/id501434038 +https://digital.slub-dresden.de/id501434038 .. figure:: ../Images/Introduction/Digitale_Sammlungen_Dresdner_Nachrichten.png :width: 820px @@ -131,7 +131,7 @@ http://digital.slub-dresden.de/id501434038 All Years Overview of a Newspaper Title -http://digital.slub-dresden.de/id501434038-1942 +https://digital.slub-dresden.de/id501434038-1942 .. figure:: ../Images/Introduction/Digitale_Sammlungen_Dresdner_Nachrichten_1942.png :width: 820px diff --git a/Tests/Fixtures/Common/documents_1.csv b/Tests/Fixtures/Common/documents_1.csv index 7567013927..56733f5187 100644 --- a/Tests/Fixtures/Common/documents_1.csv +++ b/Tests/Fixtures/Common/documents_1.csv @@ -1,8 +1,8 @@ "tx_dlf_documents",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","tstamp","crdate","cruser_id","deleted","hidden","starttime","endtime","fe_group","prod_id","location","record_id","opac_id","union_id","urn","purl","title","title_sorting","author","year","place","thumbnail","structure","partof","volume","volume_sorting","license","terms","restrictions","out_of_print","rights_info","collections","mets_label","mets_orderlabel","owner","solrcore","status","document_format" -,1001,20000,1631775000,1631775000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml","oai:de:slub-dresden:db:id-476251419","476251419","476251419","urn:nbn:de:bsz:14-db-id476251419","http://digital.slub-dresden.de/id476251419","10 Keyboard pieces - Go. S. 658","10 Keyboard pieces - Go. S. 658",,"[1759-1800]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_tif/jpegs/00000003.tif.thumbnail.jpg",59,0,,,,,,,,2,"10 Keyboard pieces - Go. S. 658","10 Keyboard pieces - Go. S. 658",10001,1,0,"METS" -,1002,20000,1631774000,1631774000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_mets.xml","oai:de:slub-dresden:db:id-476248086","476248086","476248086","urn:nbn:de:bsz:14-db-id4762480864","http://digital.slub-dresden.de/id476248086","6 Sacred songs - Go. S. 591","6 Sacred songs - Go. S. 591",,"[1840-1860]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_tif/jpegs/00000001.tif.thumbnail.jpg",59,0,,,,,,,,2,"6 Sacred songs - Go. S. 591","6 Sacred songs - Go. S. 591",10001,1,0,"METS" -,1003,20000,1631776000,1631776000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_mets.xml","oai:de:slub-dresden:db:id-476251729","476251729","476251729","urn:nbn:de:bsz:14-db-id4762517292","http://digital.slub-dresden.de/id476251729","6 Fugues - Go. S. 317","6 Fugues - Go. S. 317",,"[um 1820]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_tif/jpegs/00000001.tif.thumbnail.jpg",59,0,,,,,,,,2,"6 Fugues - Go. S. 317","6 Fugues - Go. S. 317",10001,1,0,"METS" +,1001,20000,1631775000,1631775000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml","oai:de:slub-dresden:db:id-476251419","476251419","476251419","urn:nbn:de:bsz:14-db-id476251419","https://digital.slub-dresden.de/id476251419","10 Keyboard pieces - Go. S. 658","10 Keyboard pieces - Go. S. 658",,"[1759-1800]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_tif/jpegs/00000003.tif.thumbnail.jpg",59,0,,,,,,,,2,"10 Keyboard pieces - Go. S. 658","10 Keyboard pieces - Go. S. 658",10001,1,0,"METS" +,1002,20000,1631774000,1631774000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_mets.xml","oai:de:slub-dresden:db:id-476248086","476248086","476248086","urn:nbn:de:bsz:14-db-id4762480864","https://digital.slub-dresden.de/id476248086","6 Sacred songs - Go. S. 591","6 Sacred songs - Go. S. 591",,"[1840-1860]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_tif/jpegs/00000001.tif.thumbnail.jpg",59,0,,,,,,,,2,"6 Sacred songs - Go. S. 591","6 Sacred songs - Go. S. 591",10001,1,0,"METS" +,1003,20000,1631776000,1631776000,2,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_mets.xml","oai:de:slub-dresden:db:id-476251729","476251729","476251729","urn:nbn:de:bsz:14-db-id4762517292","https://digital.slub-dresden.de/id476251729","6 Fugues - Go. S. 317","6 Fugues - Go. S. 317",,"[um 1820]","[S.l.]","https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_tif/jpegs/00000001.tif.thumbnail.jpg",59,0,,,,,,,,2,"6 Fugues - Go. S. 317","6 Fugues - Go. S. 317",10001,1,0,"METS" "tx_dlf_collections",,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","tstamp","crdate","cruser_id","deleted","sys_language_uid","l18n_parent","l18n_diffsource","hidden","fe_group","fe_cruser_id","fe_admin_lock","label","index_name","index_search","oai_name","description","thumbnail","priority","documents","owner","status" ,1101,20000,1631279509,1631279509,2,0,0,0,"a:8:{s:5:"label";N;s:10:"index_name";N;s:8:"oai_name";N;s:11:"description";N;s:9:"documents";N;s:5:"owner";N;s:6:"status";N;s:16:"sys_language_uid";N;}",0,,0,0,"Musik","Musik",,"music",,,3,0,0,0 diff --git a/Tests/Fixtures/Common/documents_1.solr.json b/Tests/Fixtures/Common/documents_1.solr.json index 834b977815..d05a0fc2e3 100644 --- a/Tests/Fixtures/Common/documents_1.solr.json +++ b/Tests/Fixtures/Common/documents_1.solr.json @@ -11,7 +11,7 @@ "type": "manuscript", "title": "10 Keyboard pieces - Go. S. 658", "record_id": "oai:de:slub-dresden:db:id-476251419", - "purl": "http://digital.slub-dresden.de/id476251419", + "purl": "https://digital.slub-dresden.de/id476251419", "location": "https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml", "urn": "urn:nbn:de:bsz:14-db-id4762514197", "collection": [ @@ -480,7 +480,7 @@ "type": "manuscript", "title": "6 Sacred songs - Go. S. 591", "record_id": "oai:de:slub-dresden:db:id-476248086", - "purl": "http://digital.slub-dresden.de/id476248086", + "purl": "https://digital.slub-dresden.de/id476248086", "location": "https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_mets.xml", "urn": "urn:nbn:de:bsz:14-db-id4762480864", "collection": [ @@ -768,7 +768,7 @@ "type": "manuscript", "title": "6 Fugues - Go. S. 317", "record_id": "oai:de:slub-dresden:db:id-476251729", - "purl": "http://digital.slub-dresden.de/id476251729", + "purl": "https://digital.slub-dresden.de/id476251729", "location": "https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_mets.xml", "urn": "urn:nbn:de:bsz:14-db-id4762517292", "collection": [ diff --git a/Tests/Fixtures/Common/documents_fulltext.csv b/Tests/Fixtures/Common/documents_fulltext.csv index 0faf7a49e0..f77f690391 100644 --- a/Tests/Fixtures/Common/documents_fulltext.csv +++ b/Tests/Fixtures/Common/documents_fulltext.csv @@ -1,6 +1,6 @@ "tx_dlf_documents",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","tstamp","crdate","cruser_id","deleted","hidden","starttime","endtime","fe_group","prod_id","location","record_id","opac_id","union_id","urn","purl","title","title_sorting","author","year","place","thumbnail","structure","partof","volume","volume_sorting","license","terms","restrictions","out_of_print","rights_info","collections","mets_label","mets_orderlabel","owner","solrcore","status","document_format" -,533223312,20000,1652331576,1652331576,0,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/aufdesun_351357262/aufdesun_351357262_mets.xml","oai:de:slub-dresden:db:id-351357262","351357262","351357262","urn:nbn:de:bsz:14-db-id3513572628","http://digital.slub-dresden.de/id351357262","Auf der Suche nach Zukunft: Das Beispiel Pieschen","Auf der Suche nach Zukunft: Das Beispiel Pieschen",,1990,"Dresden","https://digital.slub-dresden.de/data/kitodo/aufdesun_351357262/aufdesun_351357262_tif/jpegs/00000001.tif.small.jpg",40,0,,,,,,,,2,"Auf der Suche nach Zukunft: Das Beispiel Pieschen","Auf der Suche nach Zukunft: Das Beispiel Pieschen",3,1,0,"METS" +,533223312,20000,1652331576,1652331576,0,0,0,0,0,,,"https://digital.slub-dresden.de/data/kitodo/aufdesun_351357262/aufdesun_351357262_mets.xml","oai:de:slub-dresden:db:id-351357262","351357262","351357262","urn:nbn:de:bsz:14-db-id3513572628","https://digital.slub-dresden.de/id351357262","Auf der Suche nach Zukunft: Das Beispiel Pieschen","Auf der Suche nach Zukunft: Das Beispiel Pieschen",,1990,"Dresden","https://digital.slub-dresden.de/data/kitodo/aufdesun_351357262/aufdesun_351357262_tif/jpegs/00000001.tif.small.jpg",40,0,,,,,,,,2,"Auf der Suche nach Zukunft: Das Beispiel Pieschen","Auf der Suche nach Zukunft: Das Beispiel Pieschen",3,1,0,"METS" "tx_dlf_collections",,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","tstamp","crdate","cruser_id","deleted","sys_language_uid","l18n_parent","l18n_diffsource","hidden","fe_group","fe_cruser_id","fe_admin_lock","label","index_name","index_search","oai_name","description","thumbnail","priority","documents","owner","status" ,119128558,20000,1631522234,1631522234,2,0,0,0,"...",0,,0,0,"Saxonica","Saxonica",,"saxonica",,,3,0,0,0 diff --git a/Tests/Fixtures/Common/documents_fulltext.solr.json b/Tests/Fixtures/Common/documents_fulltext.solr.json index 72d2db3171..e6b10bd40d 100644 --- a/Tests/Fixtures/Common/documents_fulltext.solr.json +++ b/Tests/Fixtures/Common/documents_fulltext.solr.json @@ -13,7 +13,7 @@ "toplevel": true, "title": "Auf der Suche nach Zukunft: Das Beispiel Pieschen", "record_id": "oai:de:slub-dresden:db:id-351357262", - "purl": "http://digital.slub-dresden.de/id351357262", + "purl": "https://digital.slub-dresden.de/id351357262", "location": "https://digital.slub-dresden.de/data/kitodo/aufdesun_351357262/aufdesun_351357262_mets.xml", "urn": "urn:nbn:de:bsz:14-db-id3513572628", "title_usi": ["Auf der Suche nach Zukunft: Das Beispiel Pieschen"], diff --git a/Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml b/Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml index 645502e814..efc0ef099d 100644 --- a/Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml +++ b/Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml @@ -103,7 +103,7 @@ 1703800435 - http://digital.slub-dresden.de/id1703800435 + https://digital.slub-dresden.de/id1703800435 urn:nbn:de:bsz:14-db-id17038004351 DE-14 @@ -119,7 +119,7 @@ - oai:de:slub-dresden:db:id-1703800435 + oai:de:slub-dresden:db:id-1703800435 diff --git a/Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml b/Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml index 2f6d26f8c2..8df5835a9f 100644 --- a/Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml +++ b/Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml @@ -128,7 +128,7 @@ 1703800435 - http://digital.slub-dresden.de/id1703800435 + https://digital.slub-dresden.de/id1703800435 urn:nbn:de:bsz:14-db-id17038004351 DE-14 @@ -144,7 +144,7 @@ - oai:de:slub-dresden:db:id-1703800435 + oai:de:slub-dresden:db:id-1703800435 diff --git a/Tests/Fixtures/Format/modsOriginInfo.xml b/Tests/Fixtures/Format/modsOriginInfo.xml index 987d3fd95b..f51ef8cf62 100644 --- a/Tests/Fixtures/Format/modsOriginInfo.xml +++ b/Tests/Fixtures/Format/modsOriginInfo.xml @@ -111,7 +111,7 @@ 1703800435 - http://digital.slub-dresden.de/id1703800435 + https://digital.slub-dresden.de/id1703800435 urn:nbn:de:bsz:14-db-id17038004351 DE-14 @@ -127,7 +127,7 @@ - oai:de:slub-dresden:db:id-1703800435 + oai:de:slub-dresden:db:id-1703800435 diff --git a/Tests/Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml b/Tests/Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml index d1f9ffe4f6..a94ca8ec72 100644 --- a/Tests/Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml +++ b/Tests/Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml @@ -115,7 +115,7 @@ 1703800435 - http://digital.slub-dresden.de/id1703800435 + https://digital.slub-dresden.de/id1703800435 urn:nbn:de:bsz:14-db-id17038004351 DE-14 @@ -131,7 +131,7 @@ - oai:de:slub-dresden:db:id-1703800435 + oai:de:slub-dresden:db:id-1703800435 diff --git a/Tests/Fixtures/MetsDocument/av_beispiel.xml b/Tests/Fixtures/MetsDocument/av_beispiel.xml index bc2804366c..bfee0119fe 100644 --- a/Tests/Fixtures/MetsDocument/av_beispiel.xml +++ b/Tests/Fixtures/MetsDocument/av_beispiel.xml @@ -96,7 +96,7 @@ 1703800435 - http://digital.slub-dresden.de/id1703800435 + https://digital.slub-dresden.de/id1703800435 urn:nbn:de:bsz:14-db-id17038004351 DE-14 @@ -107,7 +107,7 @@ - oai:de:slub-dresden:db:id-1703800435 + oai:de:slub-dresden:db:id-1703800435 From 5753a64a53e285a07317b0dd64b7f9c2c37e252b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 1 Feb 2025 09:29:41 +0100 Subject: [PATCH 2/3] Use https for kitodo.org Signed-off-by: Stefan Weil --- Resources/Public/Stylesheets/OaiPmh.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Public/Stylesheets/OaiPmh.xsl b/Resources/Public/Stylesheets/OaiPmh.xsl index e4b01754b3..7349d6bd13 100644 --- a/Resources/Public/Stylesheets/OaiPmh.xsl +++ b/Resources/Public/Stylesheets/OaiPmh.xsl @@ -160,7 +160,7 @@ p.intro {

About the XSLT

An XSLT file has converted the OAI-PMH 2.0 responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.
The original XSLT file was created by Christopher Gutteridge at the University of Southampton as part of the GNU EPrints system, and is freely redistributable under the GPL.
- It was adapted to Kitodo.Presentation by Sebastian Meyer at the Saxon State and University Library Dresden.

+ It was adapted to Kitodo.Presentation by Sebastian Meyer at the Saxon State and University Library Dresden.

From e5bd50469b90f2fbae36d69b35a209238999b7d3 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 1 Feb 2025 23:17:05 +0100 Subject: [PATCH 3/3] Use https for www.openarchives.org (not for XML namespace) Don't use https for XML namespace. Signed-off-by: Stefan Weil --- Classes/Controller/OaiPmhController.php | 4 ++-- Resources/Public/Stylesheets/OaiPmh.xsl | 2 +- Tests/Functional/Api/OaiPmhTest.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/Controller/OaiPmhController.php b/Classes/Controller/OaiPmhController.php index 8858a5b5e7..9ba6c61fbe 100644 --- a/Classes/Controller/OaiPmhController.php +++ b/Classes/Controller/OaiPmhController.php @@ -173,7 +173,7 @@ protected function getUrlParams() /** * Get unqualified Dublin Core data. - * @see http://www.openarchives.org/OAI/openarchivesprotocol.html#dublincore + * @see https://www.openarchives.org/OAI/openarchivesprotocol.html#dublincore * * @access private * @@ -845,7 +845,7 @@ protected function generateOutputForDocumentList(array $documentListSet) protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments) { // The cursor specifies how many elements have already been returned in previous requests - // See http://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl + // See https://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl $currentCursor = $documentListSet['metadata']['cursor']; if (count($documentListSet['elements']) !== 0) { diff --git a/Resources/Public/Stylesheets/OaiPmh.xsl b/Resources/Public/Stylesheets/OaiPmh.xsl index 7349d6bd13..adf373660e 100644 --- a/Resources/Public/Stylesheets/OaiPmh.xsl +++ b/Resources/Public/Stylesheets/OaiPmh.xsl @@ -158,7 +158,7 @@ p.intro {

About the XSLT

-

An XSLT file has converted the OAI-PMH 2.0 responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.
+

An XSLT file has converted the OAI-PMH 2.0 responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.
The original XSLT file was created by Christopher Gutteridge at the University of Southampton as part of the GNU EPrints system, and is freely redistributable under the GPL.
It was adapted to Kitodo.Presentation by Sebastian Meyer at the Saxon State and University Library Dresden.

diff --git a/Tests/Functional/Api/OaiPmhTest.php b/Tests/Functional/Api/OaiPmhTest.php index 1295d5f01e..884e9d1604 100644 --- a/Tests/Functional/Api/OaiPmhTest.php +++ b/Tests/Functional/Api/OaiPmhTest.php @@ -105,8 +105,8 @@ public function correctlyRespondsOnBadVerb() self::assertStringNotContainsString('nastyVerb', (string) $xml->request); // For bad verbs, the element must not contain any attributes - // - http://www.openarchives.org/OAI/openarchivesprotocol.html#XMLResponse - // - http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions + // - https://www.openarchives.org/OAI/openarchivesprotocol.html#XMLResponse + // - https://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions self::assertEmpty($xml->request->attributes()); }