From f8368d24b71540ee2ef4e453e1db08710623ea73 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Tue, 15 Sep 2020 11:55:42 +0200
Subject: [PATCH] Update ItemElementType schema to that one accepted by
xcnciptoolkit
---
module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php | 4 ++--
.../tests/fixtures/xcncip2/request/LookupItemRequest.xml | 2 +-
.../tests/fixtures/xcncip2/request/LookupItemSetRequest.xml | 2 +-
.../xcncip2/request/LookupItemSetRequestWithoutHeader.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
index 5d86a3e51f3..f6fca260750 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
@@ -490,7 +490,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
// Add the desired data list:
foreach ($desiredParts as $current) {
$xml .= '<ns1:ItemElementType ' .
- 'ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/' .
+ 'ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/' .
'itemelementtype/itemelementtype.scm">' .
htmlspecialchars($current) . '</ns1:ItemElementType>';
}
@@ -1867,7 +1867,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
$this->getInitiationHeaderXml($agency) .
$this->getItemIdXml($agency, $itemId, $idType) .
'<ns1:ItemElementType ' .
- 'ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/' .
+ 'ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/' .
'itemelementtype/itemelementtype.scm">' .
'Bibliographic Description</ns1:ItemElementType>' .
'</ns1:LookupItem></ns1:NCIPMessage>';
diff --git a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemRequest.xml b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemRequest.xml
index b71b2c7cda7..7a01ee9304e 100644
--- a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemRequest.xml
+++ b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemRequest.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItem><ns1:InitiationHeader><ns1:FromAgencyId><ns1:AgencyId>My portal</ns1:AgencyId></ns1:FromAgencyId><ns1:ToAgencyId><ns1:AgencyId>Test agency</ns1:AgencyId></ns1:ToAgencyId></ns1:InitiationHeader><ns1:ItemId><ns1:AgencyId>Test agency</ns1:AgencyId><ns1:ItemIdentifierType>Accession Number</ns1:ItemIdentifierType><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType></ns1:LookupItem></ns1:NCIPMessage>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItem><ns1:InitiationHeader><ns1:FromAgencyId><ns1:AgencyId>My portal</ns1:AgencyId></ns1:FromAgencyId><ns1:ToAgencyId><ns1:AgencyId>Test agency</ns1:AgencyId></ns1:ToAgencyId></ns1:InitiationHeader><ns1:ItemId><ns1:AgencyId>Test agency</ns1:AgencyId><ns1:ItemIdentifierType>Accession Number</ns1:ItemIdentifierType><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType></ns1:LookupItem></ns1:NCIPMessage>
\ No newline at end of file
diff --git a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequest.xml b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequest.xml
index b68b2b4d916..6fa753667b4 100644
--- a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequest.xml
+++ b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequest.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItemSet><ns1:InitiationHeader><ns1:FromAgencyId><ns1:AgencyId>My portal</ns1:AgencyId></ns1:FromAgencyId><ns1:ToAgencyId><ns1:AgencyId>Test agency</ns1:AgencyId></ns1:ToAgencyId></ns1:InitiationHeader><ns1:BibliographicId><ns1:BibliographicItemId><ns1:BibliographicItemIdentifier>1</ns1:BibliographicItemIdentifier><ns1:BibliographicItemIdentifierCode ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/bibliographicitemidentifiercode/bibliographicitemidentifiercode.scm">Legal Deposit Number</ns1:BibliographicItemIdentifierCode></ns1:BibliographicItemId></ns1:BibliographicId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Circulation Status</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Electronic Resource</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Hold Queue Length</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Item Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Item Use Restriction Type</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Location</ns1:ItemElementType></ns1:LookupItemSet></ns1:NCIPMessage>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItemSet><ns1:InitiationHeader><ns1:FromAgencyId><ns1:AgencyId>My portal</ns1:AgencyId></ns1:FromAgencyId><ns1:ToAgencyId><ns1:AgencyId>Test agency</ns1:AgencyId></ns1:ToAgencyId></ns1:InitiationHeader><ns1:BibliographicId><ns1:BibliographicItemId><ns1:BibliographicItemIdentifier>1</ns1:BibliographicItemIdentifier><ns1:BibliographicItemIdentifierCode ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/bibliographicitemidentifiercode/bibliographicitemidentifiercode.scm">Legal Deposit Number</ns1:BibliographicItemIdentifierCode></ns1:BibliographicItemId></ns1:BibliographicId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Circulation Status</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Electronic Resource</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Hold Queue Length</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Item Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Item Use Restriction Type</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Location</ns1:ItemElementType></ns1:LookupItemSet></ns1:NCIPMessage>
\ No newline at end of file
diff --git a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequestWithoutHeader.xml b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequestWithoutHeader.xml
index a4232ee4c48..531fb258ab3 100644
--- a/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequestWithoutHeader.xml
+++ b/module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequestWithoutHeader.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItemSet><ns1:BibliographicId><ns1:BibliographicItemId><ns1:BibliographicItemIdentifier>1</ns1:BibliographicItemIdentifier><ns1:BibliographicItemIdentifierCode ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/bibliographicitemidentifiercode/bibliographicitemidentifiercode.scm">Legal Deposit Number</ns1:BibliographicItemIdentifierCode></ns1:BibliographicItemId></ns1:BibliographicId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Circulation Status</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Electronic Resource</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Hold Queue Length</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Item Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Item Use Restriction Type</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemelementtype/itemelementtype.scm">Location</ns1:ItemElementType></ns1:LookupItemSet></ns1:NCIPMessage>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd"><ns1:LookupItemSet><ns1:BibliographicId><ns1:BibliographicItemId><ns1:BibliographicItemIdentifier>1</ns1:BibliographicItemIdentifier><ns1:BibliographicItemIdentifierCode ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/bibliographicitemidentifiercode/bibliographicitemidentifiercode.scm">Legal Deposit Number</ns1:BibliographicItemIdentifierCode></ns1:BibliographicItemId></ns1:BibliographicId><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Bibliographic Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Circulation Status</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Electronic Resource</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Hold Queue Length</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Item Description</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Item Use Restriction Type</ns1:ItemElementType><ns1:ItemElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/itemelementtype/itemelementtype.scm">Location</ns1:ItemElementType></ns1:LookupItemSet></ns1:NCIPMessage>
\ No newline at end of file
--
GitLab