Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "#4466 oai links updated" 
This reverts commit 52edd3e.
  • Loading branch information
@ptrckb @asmecher
ptrckb authored and asmecher committed Mar 11, 2019
1 parent a3b5665 commit 0e21a53
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
18 changes: 9 additions & 9 deletions classes/oai/OAI.inc.php
View file
Expand Up @@ -278,10 +278,10 @@ function Identify() {
}
$response .= "\t\t<description>\n" .
"\t\t\t<oai-identifier\n" .
"\t\t\t\txmlns=\"https://www.openarchives.org/OAI/2.0/oai-identifier\"\n" .
"\t\t\t\txmlns=\"http://www.openarchives.org/OAI/2.0/oai-identifier\"\n" .
"\t\t\t\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" .
"\t\t\t\txsi:schemaLocation=\"https://www.openarchives.org/OAI/2.0/oai-identifier\n" .
"\t\t\t\t\thttps://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n" .
"\t\t\t\txsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai-identifier\n" .
"\t\t\t\t\thttp://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n" .
"\t\t\t\t<scheme>oai</scheme>\n" .
"\t\t\t\t<repositoryIdentifier>" . $this->config->repositoryId . "</repositoryIdentifier>\n" .
"\t\t\t\t<delimiter>" . $info->delimiter . "</delimiter>\n" .
Expand Down Expand Up @@ -606,11 +606,11 @@ function ListSets() {
if (isset($set->description)) {
$response .= "\t\t\t<setDescription>\n" .
"\t\t\t\t<oai_dc:dc\n" .
"\t\t\t\t\txmlns:oai_dc=\"https://www.openarchives.org/OAI/2.0/oai_dc/\"\n" .
"\t\t\t\t\txmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\"\n" .
"\t\t\t\t\txmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" .
"\t\t\t\t\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" .
"\t\t\t\t\txsi:schemaLocation=\"https://www.openarchives.org/OAI/2.0/oai_dc/\n" .
"\t\t\t\t\t\thttps://www.openarchives.org/OAI/2.0/oai_dc.xsd\">\n" .
"\t\t\t\t\txsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai_dc/\n" .
"\t\t\t\t\t\thttp://www.openarchives.org/OAI/2.0/oai_dc.xsd\">\n" .
"\t\t\t\t\t<dc:description>" . OAIUtils::prepOutput($set->description) . "</dc:description>\n" .
"\t\t\t\t</oai_dc:dc>\n" .
"\t\t\t</setDescription>\n";
Expand Down Expand Up @@ -667,10 +667,10 @@ function response($response, $printParams = true) {

echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" .
"<?xml-stylesheet type=\"text/xsl\" href=\"" . PKPRequest::getBaseUrl() . "/lib/pkp/xml/oai2.xsl\" ?>\n" .
"<OAI-PMH xmlns=\"https://www.openarchives.org/OAI/2.0/\"\n" .
"<OAI-PMH xmlns=\"http://www.openarchives.org/OAI/2.0/\"\n" .
"\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" .
"\txsi:schemaLocation=\"https://www.openarchives.org/OAI/2.0/\n" .
"\t\thttps://www.openarchives.org/OAI/2.0/OAI-PMH.xsd\">\n" .
"\txsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/\n" .
"\t\thttp://www.openarchives.org/OAI/2.0/OAI-PMH.xsd\">\n" .
"\t<responseDate>" . OAIUtils::UTCDate() . "</responseDate>\n" .
"\t<request";

Expand Down
4 changes: 2 additions & 2 deletions plugins/oaiMetadataFormats/dc/PKPOAIMetadataFormatPlugin_DC.inc.php
View file
Expand Up @@ -42,11 +42,11 @@ static function getMetadataPrefix() {
}

static function getSchema() {
return 'https://www.openarchives.org/OAI/2.0/oai_dc.xsd';
return 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd';
}

static function getNamespace() {
return 'https://www.openarchives.org/OAI/2.0/oai_dc/';
return 'http://www.openarchives.org/OAI/2.0/oai_dc/';
}
}

Expand Down
6 changes: 3 additions & 3 deletions plugins/oaiMetadataFormats/dc/PKPOAIMetadataFormat_DC.inc.php
View file
Expand Up @@ -22,11 +22,11 @@ function toXml($dataObject, $format = null) {
$dcDescription = $dataObject->extractMetadata(new Dc11Schema());

$response = "<oai_dc:dc\n" .
"\txmlns:oai_dc=\"https://www.openarchives.org/OAI/2.0/oai_dc/\"\n" .
"\txmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\"\n" .
"\txmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" .
"\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" .
"\txsi:schemaLocation=\"https://www.openarchives.org/OAI/2.0/oai_dc/\n" .
"\thttps://www.openarchives.org/OAI/2.0/oai_dc.xsd\">\n";
"\txsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai_dc/\n" .
"\thttp://www.openarchives.org/OAI/2.0/oai_dc.xsd\">\n";

foreach($dcDescription->getProperties() as $propertyName => $property) { /* @var $property MetadataProperty */
if ($dcDescription->hasStatement($propertyName)) {
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/oai/FunctionalOaiBaseTestCase.inc.php
View file
Expand Up @@ -51,7 +51,7 @@ public function setUp() {
}

protected function &getXPath($namespaces) {
$namespaces['oai'] = 'https://www.openarchives.org/OAI/2.0/';
$namespaces['oai'] = 'http://www.openarchives.org/OAI/2.0/';

// Call the web service
$dom =& $this->webService->call($this->webServiceRequest);
Expand Down
26 changes: 13 additions & 13 deletions xml/oai2.xsl
View file
Expand Up @@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:oai="https://www.openarchives.org/OAI/2.0/"
xmlns:oai="http://www.openarchives.org/OAI/2.0/"
>

<xsl:output method="html"/>
Expand Down Expand Up @@ -267,7 +267,7 @@ p.intro {
Identify / OAI-Identifier
-->

<xsl:template match="id:oai-identifier" xmlns:id="https://www.openarchives.org/OAI/2.0/oai-identifier">
<xsl:template match="id:oai-identifier" xmlns:id="http://www.openarchives.org/OAI/2.0/oai-identifier">
<h2>OAI-Identifier</h2>
<table class="values">
<tr><td class="key">Scheme</td>
Expand All @@ -286,7 +286,7 @@ p.intro {
Identify / EPrints
-->

<xsl:template match="ep:eprints" xmlns:ep="https://www.openarchives.org/OAI/1.1/eprints">
<xsl:template match="ep:eprints" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
<h2>EPrints Description</h2>
<h3>Content</h3>
<xsl:apply-templates select="ep:content"/>
Expand All @@ -305,7 +305,7 @@ p.intro {
<xsl:apply-templates select="ep:comment"/>
</xsl:template>

<xsl:template match="ep:content|ep:dataPolicy|ep:metadataPolicy|ep:submissionPolicy" xmlns:ep="https://www.openarchives.org/OAI/1.1/eprints">
<xsl:template match="ep:content|ep:dataPolicy|ep:metadataPolicy|ep:submissionPolicy" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
<xsl:if test="ep:text">
<p><xsl:value-of select="ep:text" /></p>
</xsl:if>
Expand All @@ -314,7 +314,7 @@ p.intro {
</xsl:if>
</xsl:template>

<xsl:template match="ep:comment" xmlns:ep="https://www.openarchives.org/OAI/1.1/eprints">
<xsl:template match="ep:comment" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
<h3>Comment</h3>
<div><xsl:value-of select="."/></div>
</xsl:template>
Expand All @@ -324,14 +324,14 @@ p.intro {
Identify / Friends
-->

<xsl:template match="fr:friends" xmlns:fr="https://www.openarchives.org/OAI/2.0/friends/">
<xsl:template match="fr:friends" xmlns:fr="http://www.openarchives.org/OAI/2.0/friends/">
<h2>Friends</h2>
<ul>
<xsl:apply-templates select="fr:baseURL"/>
</ul>
</xsl:template>

<xsl:template match="fr:baseURL" xmlns:fr="https://www.openarchives.org/OAI/2.0/friends/">
<xsl:template match="fr:baseURL" xmlns:fr="http://www.openarchives.org/OAI/2.0/friends/">
<li><xsl:value-of select="."/>
<xsl:text> </xsl:text>
<a class="link" href="{.}?verb=Identify">Identify</a></li>
Expand All @@ -342,13 +342,13 @@ p.intro {
Identify / Branding
-->

<xsl:template match="br:branding" xmlns:br="https://www.openarchives.org/OAI/2.0/branding/">
<xsl:template match="br:branding" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
<h2>Branding</h2>
<xsl:apply-templates select="br:collectionIcon"/>
<xsl:apply-templates select="br:metadataRendering"/>
</xsl:template>

<xsl:template match="br:collectionIcon" xmlns:br="https://www.openarchives.org/OAI/2.0/branding/">
<xsl:template match="br:collectionIcon" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
<h3>Icon</h3>
<xsl:choose>
<xsl:when test="link!=''">
Expand All @@ -360,7 +360,7 @@ p.intro {
</xsl:choose>
</xsl:template>

<xsl:template match="br:metadataRendering" xmlns:br="https://www.openarchives.org/OAI/2.0/branding/">
<xsl:template match="br:metadataRendering" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
<h3>Metadata Rendering Rule</h3>
<table class="values">
<tr><td class="key">URL</td>
Expand All @@ -378,7 +378,7 @@ p.intro {
Identify / Gateway
-->

<xsl:template match="gw:gateway" xmlns:gw="https://www.openarchives.org/OAI/2.0/gateway/x">
<xsl:template match="gw:gateway" xmlns:gw="http://www.openarchives.org/OAI/2.0/gateway/x">
<h2>Gateway Information</h2>
<table class="values">
<tr><td class="key">Source</td>
Expand All @@ -397,7 +397,7 @@ p.intro {
</table>
</xsl:template>

<xsl:template match="gw:gatewayAdmin" xmlns:gw="https://www.openarchives.org/OAI/2.0/gateway/">
<xsl:template match="gw:gatewayAdmin" xmlns:gw="http://www.openarchives.org/OAI/2.0/gateway/">
<tr><td class="key">Admin</td>
<td class="value"><xsl:value-of select="."/></td></tr>
</xsl:template>
Expand Down Expand Up @@ -548,7 +548,7 @@ p.intro {

<!-- oai_dc record -->

<xsl:template match="oai_dc:dc" xmlns:oai_dc="https://www.openarchives.org/OAI/2.0/oai_dc/" >
<xsl:template match="oai_dc:dc" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" >
<div class="dcdata">
<h3>Dublin Core Metadata (oai_dc)</h3>
<table class="dcdata">
Expand Down
2 changes: 1 addition & 1 deletion xml/onixFilter.xsl
View file
Expand Up @@ -13,7 +13,7 @@
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:oai="https://www.openarchives.org/OAI/2.0/"
xmlns:oai="http://www.openarchives.org/OAI/2.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
>
<xsl:param name="listName" /><!-- this is handed in via XSLTransformer->setParameters() -->
Expand Down

0 comments on commit 0e21a53

Please sign in to comment.