Skip to content
Snippets Groups Projects
Commit 29f55f40 authored by André Lahmann's avatar André Lahmann
Browse files

refs #4794: 

* removed legacy support from DAIA.php and FincILS.php
* removed legacy settings in DAIA.ini and FincILS.ini
parent c86b8f74
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
local/alpha/config/vufind/DAIA.ini
+ 0
− 7
View file @ 29f55f40
......@@ -20,10 +20,3 @@ relative_path = ../../../config/vufind/DAIA.ini
;
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
;[DAIA]
; refer to http://data.ub.uni-leipzig.de/ldinfo for setting up specific DAIA-urls
;baseUrl = http://data.ub.uni-leipzig.de/item/DE-15/finc/
; DAIATheca
; http://139.18.19.238:8080/DaiaThecaMssql/
\ No newline at end of file
local/config/vufind/DAIA.ini
+ 23
− 16
View file @ 29f55f40
......@@ -2,16 +2,7 @@
; http://gbv.github.io/daiaspec/daia.html#query-api
;
; The settings in the [DAIA] section will be used for all DAIA requests.
; The name of this section got refactored with VuFind 2.4, although the old
; configuration using the [Global] section still works, it should be replaced
; with the new [DAIA] section.
; Note: Settings for daiaResponseFormat and daiaIdPrefix are not supported if
; a pre VuFind 2.4 configuration with the [Global] section is used.
; i.e.:
; [Global]
; baseUrl = [your DAIA server base url]
; daiaIdPrefix = [this setting will have no effect]
; daiaResponseFormat = [this setting will have no effect]
; The name of this section got refactored with VuFind 2.4.
;
; A default DAIA call looks like this:
; https://daia.myuniversity.edu/?id=ppn:12345678&format=json
......@@ -23,6 +14,11 @@
; daiaResponseFormat = json
;
[DAIA]
; The base URL for the DAIA webservice.
;baseUrl = http://139.18.19.238:9080/daialibero/daia/
;baseUrl = http://139.18.19.238:9080/daiatheca/daia/
; The prefix prepended to the VuFind record Id resulting in the document URI
; used for the DAIA request (default = ppn:) (the prefix usually defines the
; field which the DAIA server uses for the loookup - e.g. ppn: or isbn:).
......@@ -31,10 +27,21 @@
; Set the requested DAIA response format: xml (default), json
;daiaResponseFormat = xml
[Global]
; The base URL for the DAIA webservice.
; refer to http://data.ub.uni-leipzig.de/ldinfo for setting up specific DAIA-urls
baseUrl = http://data.ub.uni-leipzig.de/item/ISIL/identifier/
; Set multiQuery to true if your DAIA webservice supports queries with multiple
; ids (cf. http://gbv.github.io/daiaspec/daia.html#query-api).
; Default is false.
;multiQuery = false
; If daiaContentTypes are set, the DAIA driver checks the Content-Type
; line in the DAIA response HTTP header for the configured values. If
; daiaContentTypes is not set, Content-Type HTTP header is NOT checked.
;
; expected Content-Types for DAIA XML format:
; (seperate multiple values by commata, for example:
; daiaContentTypes['xml'] = "application/xml, text/xml"
daiaContentTypes['xml'] = "application/xml"
; DAIATheca
; http://139.18.19.238:8080/DaiaThecaMssql/
\ No newline at end of file
; expected Content-Types for DAIA JSON format:
; (seperate multiple values by commata, for example:
; daiaContentTypes['xml'] = "application/json, application/javascript"
daiaContentTypes['json'] = "application/json"
local/dev/config/vufind/DAIA.ini.sample
+ 0
− 7
View file @ 29f55f40
......@@ -20,10 +20,3 @@ relative_path = ../../../config/vufind/DAIA.ini
;
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
;[DAIA]
; refer to http://data.ub.uni-leipzig.de/ldinfo for setting up specific DAIA-urls
;baseUrl = http://data.ub.uni-leipzig.de/item/DE-15/finc/
; DAIATheca
; http://139.18.19.238:8080/DaiaThecaMssql/
\ No newline at end of file
module/finc/src/finc/ILS/Driver/DAIA.php
+ 54
− 534
View file @ 29f55f40
This diff is collapsed.
module/finc/src/finc/ILS/Driver/FincILS.php
+ 16
− 40
View file @ 29f55f40
......@@ -103,49 +103,25 @@ class FincILS extends PAIA implements LoggerAwareInterface
{
parent::init();
// due to section naming changes in DAIA.ini switch legacySupport
if ($this->legacySupport) {
// set the ILS-specific recordId for interaction with ILS
// set the ILS-specific recordId for interaction with ILS
// get the ILS-specific identifier
if (!isset($this->config['Global']['ilsIdentifier'])) {
$this->debug(
"No ILS-specific identifier configured, setting ilsIdentifier=default."
);
$this->ilsIdentifier = "default";
} else {
$this->ilsIdentifier = $this->config['Global']['ilsIdentifier'];
}
// get ISIL from config if ILS-specific recordId is barcode for
// interaction with ILS
if (!isset($this->mainConfig['InstitutionInfo']['isil'])) {
$this->debug("No ISIL defined in section InstitutionInfo in config.ini.");
$this->isil = [];
} else {
$this->isil = $this->mainConfig['InstitutionInfo']['isil']->toArray();
}
// get the ILS-specific identifier
if (!isset($this->config['DAIA']['ilsIdentifier'])) {
$this->debug(
"No ILS-specific identifier configured, setting ilsIdentifier=default."
);
$this->ilsIdentifier = "default";
} else {
// set the ILS-specific recordId for interaction with ILS
// get the ILS-specific identifier
if (!isset($this->config['DAIA']['ilsIdentifier'])) {
$this->debug(
"No ILS-specific identifier configured, setting ilsIdentifier=default."
);
$this->ilsIdentifier = "default";
} else {
$this->ilsIdentifier = $this->config['DAIA']['ilsIdentifier'];
}
$this->ilsIdentifier = $this->config['DAIA']['ilsIdentifier'];
}
// get ISIL from config if ILS-specific recordId is barcode for
// interaction with ILS
if (!isset($this->mainConfig['InstitutionInfo']['isil'])) {
$this->debug("No ISIL defined in section InstitutionInfo in config.ini.");
$this->isil = [];
} else {
$this->isil = $this->mainConfig['InstitutionInfo']['isil']->toArray();
}
// get ISIL from config if ILS-specific recordId is barcode for
// interaction with ILS
if (!isset($this->mainConfig['InstitutionInfo']['isil'])) {
$this->debug("No ISIL defined in section InstitutionInfo in config.ini.");
$this->isil = [];
} else {
$this->isil = $this->mainConfig['InstitutionInfo']['isil']->toArray();
}
$this->_testILSConnections();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment