Merge branch 'master' into instance/fid_mewi

* renamed language files (de.ini -> de-finc.ini)
* merge of new DAIA driver

local/alpha/languages/de.ini → local/alpha/languages/de-finc.ini

@@ -8,7 +8,7 @@
 ; vufind2/local/languages
 ;
 
-@parent_ini = "../../languages/de.ini"
+@parent_ini = "../../languages/de-finc.ini"
 
 ;
 ;       Add ALPHA-specific customization after this header.

local/config/vufind/DAIA.ini

-[DAIA]
+; DAIA driver expects a DAIA Query API as specified in:
+; 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]
+;
+; A default DAIA call looks like this:
+; https://daia.myuniversity.edu/?id=ppn:12345678&format=json
+;
+; This default DAIA call would be configured as:
+; [DAIA]
+; baseUrl = https://daia.myuniversity.edu
+; daiaidprefix = ppn:
+; daiaResponseFormat = json
+;
+
+; 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:).
+;daiaIdPrefix = "ppn:"
+
+; 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/
 

local/config/vufind/FincDAIA.ini

-[DAIA]
+;[DAIA]
 ; this config configures the extended DAIA-Driver FincDAIA
 ; refer to ticket #4499 for further info on configuring it
-baseUrl        = http://data.ub.uni-leipzig.de/item/ISIL/identifier/
-ilsIdentifier = "default"
+;baseUrl        = http://data.ub.uni-leipzig.de/item/ISIL/identifier/
+;ilsIdentifier = "default"
 ;ISIL = "ISIL"
 
 ; config-examples:
@@ -17,4 +17,9 @@ ilsIdentifier = "default"
 ; ilsIdentifier = "record_id"
 
 ; default
-; ilsIdentifier = "default"
\ No newline at end of file
+; ilsIdentifier = "default"
+
+[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/

local/dev/languages/de.ini → local/dev/languages/de-finc.ini

@@ -8,7 +8,7 @@
 ; vufind2/local/languages
 ;
 
-@parent_ini = "../../languages/de.ini"
+@parent_ini = "../../languages/de-finc.ini"
 
 ;
 ;       Add DEV-specific customization after this header.

local/languages/de.ini → local/languages/de-finc.ini

+@parent_ini = "../../../languages/de.ini"
 ; Formate entsprechend der format_map_de15.properties
 Book                               = Buch
 eBook                              = E-Book