Skip to content

Commit

Permalink
[MAINTENANCE] Use https for openarchives.org, kitodo.org and slub-dre…
Browse files Browse the repository at this point in the history
…sden.de (#1454)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil authored Feb 2, 2025
1 parent 3e9b1d1 commit 94fbcce
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Classes/Controller/OaiPmhController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions Documentation/Introduction/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,31 +107,31 @@ Screenshots

Some examples of Kitodo.Presentation in action on the `Digital Collection of SLUB Dresden <https://digital.slub-dresden.de/>`_:

http://digital.slub-dresden.de/id457052678
https://digital.slub-dresden.de/id457052678

.. figure:: ../Images/Introduction/Digitale_Sammlungen_Colloquia_Lutheri.png
:width: 820px
:alt: Mscr.Dresd.A.180.d

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
:alt: Newspaper issue with full-text switched on

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
:alt: All Years Overview of a Newspaper Title

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
Expand Down
4 changes: 2 additions & 2 deletions Resources/Public/Stylesheets/OaiPmh.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ p.intro {
<xsl:apply-templates select="/oai:OAI-PMH" />
<xsl:call-template name="quicklinks"/>
<h2><a name="moreinfo">About the XSLT</a></h2>
<p>An XSLT file has converted the <a href="http://www.openarchives.org">OAI-PMH 2.0</a> responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.<br />
<p>An XSLT file has converted the <a href="https://www.openarchives.org">OAI-PMH 2.0</a> responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.<br />
The original XSLT file was created by <a href="http://www.ecs.soton.ac.uk/people/cjg">Christopher Gutteridge</a> at the University of Southampton as part of the <a href="http://software.eprints.org">GNU EPrints system</a>, and is freely redistributable under the <a href="http://www.gnu.org">GPL</a>.<br />
It was adapted to <a href="http://kitodo.org">Kitodo.Presentation</a> by <a href="mailto:sebastian.meyer@slub-dresden.de">Sebastian Meyer</a> at the Saxon State and University Library Dresden.</p>
It was adapted to <a href="https://kitodo.org/">Kitodo.Presentation</a> by <a href="mailto:sebastian.meyer@slub-dresden.de">Sebastian Meyer</a> at the Saxon State and University Library Dresden.</p>
</body>
</html>
</xsl:template>
Expand Down
6 changes: 3 additions & 3 deletions Tests/Fixtures/Common/documents_1.csv
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions Tests/Fixtures/Common/documents_1.solr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion Tests/Fixtures/Common/documents_fulltext.csv
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tests/Fixtures/Common/documents_fulltext.solr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/Format/modsAuthorNoAutRoleTerm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
</mods:location>
</mods:relatedItem>
<mods:identifier type="kxp">1703800435</mods:identifier>
<mods:identifier type="purl">http://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="purl">https://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="urn">urn:nbn:de:bsz:14-db-id17038004351</mods:identifier>
<mods:location>
<mods:physicalLocation valueURI="https://ld.zdb-services.de/resource/organisations/DE-14">DE-14
Expand All @@ -119,7 +119,7 @@
<mods:extension>
</mods:extension>
<mods:recordInfo>
<mods:recordIdentifier source="http://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
<mods:recordIdentifier source="https://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
</mods:recordIdentifier>
</mods:recordInfo>
</mods:mods>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/Format/modsAuthorWithAutRoleTerm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</mods:location>
</mods:relatedItem>
<mods:identifier type="kxp">1703800435</mods:identifier>
<mods:identifier type="purl">http://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="purl">https://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="urn">urn:nbn:de:bsz:14-db-id17038004351</mods:identifier>
<mods:location>
<mods:physicalLocation valueURI="https://ld.zdb-services.de/resource/organisations/DE-14">DE-14
Expand All @@ -144,7 +144,7 @@
<mods:extension>
</mods:extension>
<mods:recordInfo>
<mods:recordIdentifier source="http://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
<mods:recordIdentifier source="https://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
</mods:recordIdentifier>
</mods:recordInfo>
</mods:mods>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/Format/modsOriginInfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</mods:location>
</mods:relatedItem>
<mods:identifier type="kxp">1703800435</mods:identifier>
<mods:identifier type="purl">http://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="purl">https://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="urn">urn:nbn:de:bsz:14-db-id17038004351</mods:identifier>
<mods:location>
<mods:physicalLocation valueURI="https://ld.zdb-services.de/resource/organisations/DE-14">DE-14
Expand All @@ -127,7 +127,7 @@
<mods:extension>
</mods:extension>
<mods:recordInfo>
<mods:recordIdentifier source="http://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
<mods:recordIdentifier source="https://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
</mods:recordIdentifier>
</mods:recordInfo>
</mods:mods>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</mods:location>
</mods:relatedItem>
<mods:identifier type="kxp">1703800435</mods:identifier>
<mods:identifier type="purl">http://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="purl">https://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="urn">urn:nbn:de:bsz:14-db-id17038004351</mods:identifier>
<mods:location>
<mods:physicalLocation valueURI="https://ld.zdb-services.de/resource/organisations/DE-14">DE-14
Expand All @@ -131,7 +131,7 @@
<mods:extension>
</mods:extension>
<mods:recordInfo>
<mods:recordIdentifier source="http://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
<mods:recordIdentifier source="https://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435
</mods:recordIdentifier>
</mods:recordInfo>
</mods:mods>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/MetsDocument/av_beispiel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</mods:location>
</mods:relatedItem>
<mods:identifier type="kxp">1703800435</mods:identifier>
<mods:identifier type="purl">http://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="purl">https://digital.slub-dresden.de/id1703800435</mods:identifier>
<mods:identifier type="urn">urn:nbn:de:bsz:14-db-id17038004351</mods:identifier>
<mods:location>
<mods:physicalLocation valueURI="https://ld.zdb-services.de/resource/organisations/DE-14">DE-14</mods:physicalLocation>
Expand All @@ -107,7 +107,7 @@
<mods:extension>
</mods:extension>
<mods:recordInfo>
<mods:recordIdentifier source="http://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435</mods:recordIdentifier>
<mods:recordIdentifier source="https://digital.slub-dresden.de/oai/">oai:de:slub-dresden:db:id-1703800435</mods:recordIdentifier>
</mods:recordInfo>
</mods:mods>
</mets:xmlData>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Functional/Api/OaiPmhTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public function correctlyRespondsOnBadVerb()
self::assertStringNotContainsString('nastyVerb', (string) $xml->request);

// For bad verbs, the <request> 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());
}

Expand Down

0 comments on commit 94fbcce

Please sign in to comment.