Significant improvements to XCNCIP2 ILS driver (#1672)

- Adds tests and fixes issues revealed by testing
- Improves code style
- Adds new functionality, including configuration settings for "fromAgency" and optional location loading via "Lookup Agency" service.

config/vufind/XCNCIP2.ini

@@ -5,6 +5,9 @@ url         = http://myuniversity.edu:8080/ncipv2/NCIPResponder
 ; Your library's Agency ID (ILSDefaultAgency setting in driver_config.properties):
 agency      = "My University"
 
+; Agency associated with your VuFind instance
+;fromAgency = 'My discovery portal'
+
 ; Pickup location definitions: CSV file
 ;
 ;     Format: [agency],[locationID],[locationDisplay]
@@ -22,6 +25,12 @@ agency      = "My University"
 ;         Agency2,12,Agency2 - Stacks
 pickupLocationsFile = "XCNCIP2_locations.txt"
 
+; If the NCIP responder is able to return pickup locations through the Lookup Agency
+; service, you could comment out the pickupLocationsFile and set
+; pickLocationFromNCIP to true. Pickup locations will be loaded by NCIP call then.
+;pickupLocationsFromNCIP = true
+
+
 ;-----------------------------------------------------------------
 ; Consortium settings below:
 ;-----------------------------------------------------------------

module/VuFind/src/VuFind/ILS/Driver/PluginManager.php

@@ -109,7 +109,7 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
         Virtua::class => InvokableFactory::class,
         Voyager::class => DriverWithDateConverterFactory::class,
         VoyagerRestful::class => VoyagerRestfulFactory::class,
-        XCNCIP2::class => InvokableFactory::class,
+        XCNCIP2::class => DriverWithDateConverterFactory::class,
     ];
 
     /**

module/VuFind/tests/fixtures/xcncip2/request/CancelRequestItemRequest.xml

+<?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:CancelRequestItem><ns1:UserId><ns1:AgencyId>patron agency</ns1:AgencyId><ns1:UserIdentifierType>Institution Id Number</ns1:UserIdentifierType><ns1:UserIdentifierValue>12345</ns1:UserIdentifierValue></ns1:UserId><ns1:RequestId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:RequestIdentifierValue>rq1</ns1:RequestIdentifierValue></ns1:RequestId><ns1:ItemId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId><ns1:RequestType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requesttype/requesttype.scm">Hold</ns1:RequestType><ns1:RequestScopeType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requestscopetype/requestscopetype.scm">Bibliographic Item</ns1:RequestScopeType></ns1:CancelRequestItem></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/request/CancelRequestItemRequestAuthInput.xml

+<?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:CancelRequestItem><ns1:AuthenticationInput><ns1:AuthenticationInputData>username</ns1:AuthenticationInputData><ns1:AuthenticationDataFormatType>text</ns1:AuthenticationDataFormatType><ns1:AuthenticationInputType>Username</ns1:AuthenticationInputType></ns1:AuthenticationInput><ns1:AuthenticationInput><ns1:AuthenticationInputData>password</ns1:AuthenticationInputData><ns1:AuthenticationDataFormatType>text</ns1:AuthenticationDataFormatType><ns1:AuthenticationInputType>Password</ns1:AuthenticationInputType></ns1:AuthenticationInput><ns1:UserId><ns1:AgencyId>patron agency</ns1:AgencyId><ns1:UserIdentifierType>Institution Id Number</ns1:UserIdentifierType><ns1:UserIdentifierValue>12345</ns1:UserIdentifierValue></ns1:UserId><ns1:RequestId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:RequestIdentifierValue>rq1</ns1:RequestIdentifierValue></ns1:RequestId><ns1:ItemId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId><ns1:RequestType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requesttype/requesttype.scm">Hold</ns1:RequestType><ns1:RequestScopeType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requestscopetype/requestscopetype.scm">Bibliographic Item</ns1:RequestScopeType></ns1:CancelRequestItem></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/request/LookupAgencyRequest.xml

+<?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:LookupAgency><ns1:AgencyId>Test agency</ns1:AgencyId><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Agency Address Information</ns1:AgencyElementType><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Agency User Privilege Type</ns1:AgencyElementType><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Application Profile Supported Type</ns1:AgencyElementType><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Authentication Prompt</ns1:AgencyElementType><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Consortium Agreement</ns1:AgencyElementType><ns1:AgencyElementType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyelementtype/agencyelementtype.scm">Organization Name Information</ns1:AgencyElementType></ns1:LookupAgency></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/request/LookupItemRequest.xml

+<?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

module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequest.xml

+<?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

module/VuFind/tests/fixtures/xcncip2/request/LookupItemSetRequestWithoutHeader.xml

+<?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

module/VuFind/tests/fixtures/xcncip2/request/LookupUserRequest.xml

+<?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:LookupUser><ns1:UserId><ns1:AgencyId>patron agency</ns1:AgencyId><ns1:UserIdentifierType>Institution Id Number</ns1:UserIdentifierType><ns1:UserIdentifierValue>patron1</ns1:UserIdentifierValue></ns1:UserId><ns1:LoanedItemsDesired /></ns1:LookupUser></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/request/RenewItemRequest.xml

+<?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:RenewItem><ns1:AuthenticationInput><ns1:AuthenticationInputData>username</ns1:AuthenticationInputData><ns1:AuthenticationDataFormatType>text</ns1:AuthenticationDataFormatType><ns1:AuthenticationInputType>Username</ns1:AuthenticationInputType></ns1:AuthenticationInput><ns1:AuthenticationInput><ns1:AuthenticationInputData>password</ns1:AuthenticationInputData><ns1:AuthenticationDataFormatType>text</ns1:AuthenticationDataFormatType><ns1:AuthenticationInputType>Password</ns1:AuthenticationInputType></ns1:AuthenticationInput><ns1:ItemId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId></ns1:RenewItem></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/request/RequestItemRequest.xml

+<?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:RequestItem><ns1:InitiationHeader><ns1:FromAgencyId><ns1:AgencyId>My portal</ns1:AgencyId></ns1:FromAgencyId><ns1:ToAgencyId><ns1:AgencyId>patron agency</ns1:AgencyId></ns1:ToAgencyId></ns1:InitiationHeader><ns1:UserId><ns1:AgencyId>patron agency</ns1:AgencyId><ns1:UserIdentifierType>Institution Id Number</ns1:UserIdentifierType><ns1:UserIdentifierValue>patron1</ns1:UserIdentifierValue></ns1:UserId><ns1:BibliographicId><ns1:BibliographicItemId><ns1:BibliographicItemIdentifier>bib1</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:ItemId><ns1:AgencyId>item agency</ns1:AgencyId><ns1:ItemIdentifierValue>item1</ns1:ItemIdentifierValue></ns1:ItemId><ns1:RequestType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requesttype/requesttype.scm">Hold</ns1:RequestType><ns1:RequestScopeType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/requestscopetype/requestscopetype.scm">Item</ns1:RequestScopeType><ns1:NeedBeforeDate>2020-12-20T00:00:00.000Z</ns1:NeedBeforeDate></ns1:RequestItem></ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/response/CancelRequestItemResponseAccepted.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?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:CancelRequestItemResponse>
+        <ns1:RequestId>
+            <ns1:AgencyId ns1:Scheme="https://www.library.sk/ncip/v2_02/schemes.scm">CBA001</ns1:AgencyId>
+            <ns1:RequestIdentifierType ns1:Scheme="https://www.library.sk/ncip/v2_02/schemes.scm">IDX</ns1:RequestIdentifierType>
+            <ns1:RequestIdentifierValue>cbvk_trx*13512707</ns1:RequestIdentifierValue>
+        </ns1:RequestId>
+        <ns1:UserId>
+            <ns1:AgencyId ns1:Scheme="https://www.library.sk/ncip/v2_02/schemes.scm">CBA001</ns1:AgencyId>
+            <ns1:UserIdentifierType ns1:Scheme="https://www.library.sk/ncip/v2_02/schemes.scm">INSTITUTION_ID_NUMBER</ns1:UserIdentifierType>
+            <ns1:UserIdentifierValue>0059085</ns1:UserIdentifierValue>
+        </ns1:UserId>
+    </ns1:CancelRequestItemResponse>
+</ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/response/CancelRequestItemResponseDenied.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?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:CancelRequestItemResponse>
+        <ns1:Problem>
+            <ns1:ProblemType ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/processingerrortype/cancelrequestitemprocessingerror.scm">Element Rule Violated</ns1:ProblemType>
+            <ns1:ProblemDetail>Error ARL WS CancelRequestItem request retcode = ERRNCIP215, retmsg = Error ARL WS NCIP CancelRequestItem, CHYBA - TRX záznam cbvk_trx*13502448 není možno smazat s modulu IPAC. code:ERRX003I#cbvk_trx*13502448</ns1:ProblemDetail>
+            <ns1:ProblemElement>CancelRequestItem</ns1:ProblemElement>
+        </ns1:Problem>
+    </ns1:CancelRequestItemResponse>
+</ns1:NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/response/CancelRequestItemResponseDeniedWithUserId.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?xml version="1.0" encoding="UTF-8"?>
+<NCIPMessage version="http://www.niso.org/schemas/ncip/v2_0/imp1/xsd/ncip_v2_0.xsd">
+    <CancelRequestItemResponse>
+        <ItemId>
+            <AgencyId Scheme="http://www.niso.org/ncip/v1_0/schemes/agencyidtype/agencyidtype.scm">ABA008</AgencyId>
+            <ItemIdentifierType Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/visibleitemidentifiertype/visibleitemidentifiertype.scm">Accession Number</ItemIdentifierType>
+            <ItemIdentifierValue>T015480</ItemIdentifierValue>
+        </ItemId>
+        <ResponseHeader>
+            <FromAgencyId>
+                <AgencyId>ABA008</AgencyId>
+            </FromAgencyId>
+            <ToAgencyId>
+                <AgencyId>CPK</AgencyId>
+            </ToAgencyId>
+        </ResponseHeader>
+        <UserId>
+            <AgencyId>ABA008</AgencyId>
+            <UserIdentifierType Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/visibleuseridentifiertype/visibleuseridentifiertype.scm">Institution Id Number</UserIdentifierType>
+            <UserIdentifierValue>C5452001</UserIdentifierValue>
+        </UserId>
+        <Problem>
+            <ProblemType Scheme="http://www.niso.org/ncip/v1_0/schemes/processingerrortype/generalprocessingerror.scm">Temporary Processing Failure</ProblemType>
+            <ProblemDetail>CancelRequestItem Error</ProblemDetail>
+            <ProblemElement>ItemIdentifier</ProblemElement>
+            <ProblemValue>Všeobecná operácia nad databázou
+                OpacModifyDataRec -&gt;
+                Získanie údajov výpožičky
+                [ID=-1?]
+                Neznáma chyba [-1]
+                []
+            </ProblemValue>
+        </Problem>
+    </CancelRequestItemResponse>
+</NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/response/LookupAgencyResponse.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" ns1:version="http://www.niso.org/schemas/ncip/v2_0/imp1/xsd/ncip_v2_0.xsd">
+    <ns1:LookupAgencyResponse>
+        <ns1:AgencyId ns1:Scheme="http://www.niso.org/ncip/v1_0/schemes/agencyelementtype/agencyelementtype.scm">My library</ns1:AgencyId>
+        <ns1:OrganizationNameInformation>
+            <ns1:OrganizationNameType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/organizationnametype/organizationnametype.scm">Translated Name</ns1:OrganizationNameType>
+            <ns1:OrganizationName>My personal library</ns1:OrganizationName>
+        </ns1:OrganizationNameInformation>
+        <ns1:AgencyAddressInformation>
+            <ns1:AgencyAddressRoleType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/agencyaddressroletype/agencyaddressroletype.scm">Official</ns1:AgencyAddressRoleType>
+            <ns1:PhysicalAddress>
+                <ns1:UnstructuredAddress>
+                    <ns1:UnstructuredAddressType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/unstructuredaddresstype/unstructuredaddresstype.scm">Newline-Delimited Text</ns1:UnstructuredAddressType>
+                    <ns1:UnstructuredAddressData>Some street 123, City 1</ns1:UnstructuredAddressData>
+                </ns1:UnstructuredAddress>
+                <ns1:PhysicalAddressType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/physicaladdresstype/physicaladdresstype.scm">Street Address</ns1:PhysicalAddressType>
+            </ns1:PhysicalAddress>
+        </ns1:AgencyAddressInformation>
+        <ns1:Ext>
+            <ns1:LocationName>
+                <ns1:LocationNameInstance>
+                    <ns1:LocationNameLevel>1</ns1:LocationNameLevel>
+                    <ns1:LocationNameValue>Main library</ns1:LocationNameValue>
+                    <ns1:Ext>
+                        <ns1:PhysicalAddress>
+                            <ns1:UnstructuredAddress>
+                                <ns1:UnstructuredAddressType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/unstructuredaddresstype/unstructuredaddresstype.scm">Newline-Delimited Text</ns1:UnstructuredAddressType>
+                                <ns1:UnstructuredAddressData>Some street 123, City 1</ns1:UnstructuredAddressData>
+                            </ns1:UnstructuredAddress>
+                            <ns1:PhysicalAddressType>Street Address</ns1:PhysicalAddressType>
+                        </ns1:PhysicalAddress>
+                    </ns1:Ext>
+                </ns1:LocationNameInstance>
+                <ns1:LocationNameInstance>
+                    <ns1:LocationNameLevel>2</ns1:LocationNameLevel>
+                    <ns1:LocationNameValue>Stacks</ns1:LocationNameValue>
+                    <ns1:Ext>
+                        <ns1:PhysicalAddress>
+                            <ns1:UnstructuredAddress>
+                                <ns1:UnstructuredAddressType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/unstructuredaddresstype/unstructuredaddresstype.scm">Newline-Delimited Text</ns1:UnstructuredAddressType>
+                                <ns1:UnstructuredAddressData>Some street 123, City 1</ns1:UnstructuredAddressData>
+                            </ns1:UnstructuredAddress>
+                            <ns1:PhysicalAddressType>Street Address</ns1:PhysicalAddressType>
+                        </ns1:PhysicalAddress>
+                    </ns1:Ext>
+                </ns1:LocationNameInstance>
+            </ns1:LocationName>
+        </ns1:Ext>
+    </ns1:LookupAgencyResponse>
+</ns1:NCIPMessage>
+

module/VuFind/tests/fixtures/xcncip2/response/LookupAgencyResponseWithoutLocations.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?xml version="1.0" encoding="UTF-8"?>
+<NCIPMessage xmlns="http://www.niso.org/2008/ncip">
+    <LookupAgencyResponse>
+        <AgencyId>My University</AgencyId>
+        <OrganizationNameInformation>
+            <OrganizationNameType>Official Name</OrganizationNameType>
+            <OrganizationName>My University library</OrganizationName>
+        </OrganizationNameInformation>
+        <AgencyAddressInformation>
+            <physicalAddress>
+                <UnstructuredAddress>
+                    <UnstructuredAddressType>Newline-Delimited Text</UnstructuredAddressType>
+                    <UnstructuredAddressData>Some Street 58, Some City</UnstructuredAddressData>
+                </UnstructuredAddress>
+            </physicalAddress>
+        </AgencyAddressInformation>
+        <AgencyAddressInformation>
+            <electronicAddress>
+                <ElectronicAddressType>tel</ElectronicAddressType>
+                <ElectronicAddressData>475 209 126</ElectronicAddressData>
+            </electronicAddress>
+        </AgencyAddressInformation>
+        <AgencyAddressInformation>
+            <electronicAddress>
+                <ElectronicAddressType>http</ElectronicAddressType>
+                <ElectronicAddressData>library.myuniverity.edu</ElectronicAddressData>
+            </electronicAddress>
+        </AgencyAddressInformation>
+        <AgencyAddressInformation>
+            <electronicAddress>
+                <ElectronicAddressType>mailto</ElectronicAddressType>
+                <ElectronicAddressData>library@myuniversity.edu</ElectronicAddressData>
+            </electronicAddress>
+        </AgencyAddressInformation>
+    </LookupAgencyResponse>
+</NCIPMessage>
\ No newline at end of file

module/VuFind/tests/fixtures/xcncip2/response/LookupItem.xml

+HTTP/1.1 200 OK
+Content-Type: application/xml
+Date: Wed, 18 Mar 2015 11:49:40 GMT
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ns1:NCIPMessage xmlns:ns1="http://www.niso.org/2008/ncip" xmlns:ns2="https://ncip.knihovny.cz/ILSDI/ncip/2015/extensions" ns1:version="http://www.niso.org/schemas/ncip/v2_02/ncip_v2_02.xsd">
+    <ns1:LookupItemResponse>
+        <ns1:ItemId>
+            <ns1:AgencyId>Agency from lookup item</ns1:AgencyId>
+            <ns1:ItemIdentifierType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/visibleitemidentifiertype/visibleitemidentifiertype.scm">Barcode</ns1:ItemIdentifierType>
+            <ns1:ItemIdentifierValue>318300321322</ns1:ItemIdentifierValue>
+        </ns1:ItemId>
+        <ns1:ItemTransaction>
+            <ns1:CurrentBorrower>
+                <ns1:UserId>
+                    <ns1:AgencyId>OPG001</ns1:AgencyId>
+                    <ns1:UserIdentifierType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/visibleuseridentifiertype/visibleuseridentifiertype.scm">Institution Id Number</ns1:UserIdentifierType>
+                    <ns1:UserIdentifierValue>99046</ns1:UserIdentifierValue>
+                </ns1:UserId>
+            </ns1:CurrentBorrower>
+        </ns1:ItemTransaction>
+        <ns1:ItemOptionalFields>
+            <ns1:BibliographicDescription>
+                <ns1:Author>Prichard, Katharine Susannah, 1883-1969</ns1:Author>
+                <ns1:BibliographicItemId>
+                    <ns1:BibliographicItemIdentifier>KN3183000000046386</ns1:BibliographicItemIdentifier>
+                </ns1:BibliographicItemId>
+                <ns1:PlaceOfPublication>Praha</ns1:PlaceOfPublication>
+                <ns1:PublicationDate>1975</ns1:PublicationDate>
+                <ns1:Publisher>Svoboda</ns1:Publisher>
+                <ns1:Title>Sharn, má naděje a láska</ns1:Title>
+                <ns1:BibliographicLevel ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/bibliographiclevel/bibliographiclevel.scm">Monograph</ns1:BibliographicLevel>
+                <ns1:Language ns1:Scheme="http://lcweb.loc.gov/standards/iso639-2/bibcodes.html">cze</ns1:Language>
+                <ns1:MediumType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/mediumtype/mediumtype.scm">Book</ns1:MediumType>
+            </ns1:BibliographicDescription>
+            <ns1:ItemUseRestrictionType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemuserestrictiontype/itemuserestrictiontype.scm">Limited Circulation, Normal Loan Period</ns1:ItemUseRestrictionType>
+            <ns1:CirculationStatus ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/circulationstatus/circulationstatus.scm">On Loan</ns1:CirculationStatus>
+            <ns1:HoldQueueLength>0</ns1:HoldQueueLength>
+            <ns1:ItemDescription>
+                <ns1:CallNumber>Q</ns1:CallNumber>
+                <ns1:ItemDescriptionLevel ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/itemdescriptionlevel/itemdescriptionlevel.scm">Bibliographic Item</ns1:ItemDescriptionLevel>
+            </ns1:ItemDescription>
+            <ns1:Location>
+                <ns1:LocationType ns1:Scheme="http://www.niso.org/ncip/v1_0/imp1/schemes/locationtype/locationtype.scm">Permanent Location</ns1:LocationType>
+                <ns1:LocationName>
+                    <ns1:LocationNameInstance>
+                        <ns1:LocationNameLevel>1</ns1:LocationNameLevel>
+                        <ns1:LocationNameValue>Středisko Opava VF</ns1:LocationNameValue>
+                    </ns1:LocationNameInstance>
+                </ns1:LocationName>
+            </ns1:Location>
+            <ns1:DateDue>2019-11-17T23:00:00Z</ns1:DateDue>
+        </ns1:ItemOptionalFields>
+    </ns1:LookupItemResponse>
+</ns1:NCIPMessage>
+