From bd0a12aec308440f103a92f3b730e883175cde3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= <lahmann@ub.uni-leipzig.de>
Date: Wed, 1 Apr 2015 16:49:59 +0200
Subject: [PATCH] * updated .ini files
---
.../config/vufind/{DAIA.ini => SolrAI.ini} | 8 +++----
.../{FincDAIA.ini => SolrMarcRemoteFinc.ini} | 21 ++----------------
fid_mewi/alpha/languages/en.ini | 17 ++++++++++++++
.../config/vufind/{DAIA.ini => SolrAI.ini} | 4 ++--
.../{FincDAIA.ini => SolrMarcRemoteFinc.ini} | 19 +---------------
...{FincDAIA.ini.sample => SolrAI.ini.sample} | 22 ++-----------------
...i.sample => SolrMarcRemoteFinc.ini.sample} | 15 ++++---------
fid_mewi/dev/languages/en.ini | 17 ++++++++++++++
fid_mewi/languages/en.ini | 18 +++++++++++++++
9 files changed, 67 insertions(+), 74 deletions(-)
rename fid_mewi/alpha/config/vufind/{DAIA.ini => SolrAI.ini} (77%)
rename fid_mewi/alpha/config/vufind/{FincDAIA.ini => SolrMarcRemoteFinc.ini} (66%)
create mode 100644 fid_mewi/alpha/languages/en.ini
rename fid_mewi/config/vufind/{DAIA.ini => SolrAI.ini} (87%)
rename fid_mewi/config/vufind/{FincDAIA.ini => SolrMarcRemoteFinc.ini} (65%)
rename fid_mewi/dev/config/vufind/{FincDAIA.ini.sample => SolrAI.ini.sample} (66%)
rename fid_mewi/dev/config/vufind/{DAIA.ini.sample => SolrMarcRemoteFinc.ini.sample} (64%)
create mode 100644 fid_mewi/dev/languages/en.ini
create mode 100644 fid_mewi/languages/en.ini
diff --git a/fid_mewi/alpha/config/vufind/DAIA.ini b/fid_mewi/alpha/config/vufind/SolrAI.ini
similarity index 77%
rename from fid_mewi/alpha/config/vufind/DAIA.ini
rename to fid_mewi/alpha/config/vufind/SolrAI.ini
index 277a8cd1eaa..72fa9e0b6eb 100644
--- a/fid_mewi/alpha/config/vufind/DAIA.ini
+++ b/fid_mewi/alpha/config/vufind/SolrAI.ini
@@ -2,14 +2,14 @@
;##################### DO NOT DELETE THIS HEADER ####################
;################### Leipzig University Library © 2015 ##############
;
-; This is the SIGEL-instance-specific ALPHA-INI-file and inherits
+; This is the ISIL-instance-specific ALPHA-INI-file and inherits
; all the settings from the INI-file defined in [Parent_Config] which
-; points to the SIGEL-instance-specific default INI-file located in
-; the folder vufind2/SIGEL/config/vufind
+; points to the ISIL-instance-specific default INI-file located in
+; the folder vufind2/ISIL/config/vufind
;
[Parent_Config]
-relative_path = ../../../config/vufind/DAIA.ini
+relative_path = ../../../config/vufind/SolrAI.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
diff --git a/fid_mewi/alpha/config/vufind/FincDAIA.ini b/fid_mewi/alpha/config/vufind/SolrMarcRemoteFinc.ini
similarity index 66%
rename from fid_mewi/alpha/config/vufind/FincDAIA.ini
rename to fid_mewi/alpha/config/vufind/SolrMarcRemoteFinc.ini
index 0959c2ada6c..aa3a3536e21 100644
--- a/fid_mewi/alpha/config/vufind/FincDAIA.ini
+++ b/fid_mewi/alpha/config/vufind/SolrMarcRemoteFinc.ini
@@ -4,12 +4,12 @@
;
; This is the ISIL-instance-specific ALPHA-INI-file and inherits
; all the settings from the INI-file defined in [Parent_Config] which
-; points to the ISIL-instance-specific default INI-file located in
+; points to the ISIL-instance-specific default INI-file located in
; the folder vufind2/ISIL/config/vufind
;
[Parent_Config]
-relative_path = ../../../config/vufind/FincDAIA.ini
+relative_path = ../../../config/vufind/SolrMarcRemoteFinc.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
@@ -22,20 +22,3 @@ relative_path = ../../../config/vufind/FincDAIA.ini
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
-;[DAIA]
-; this config configures the extended DAIA-Driver FincDAIA
-; refer to ticket #4499 for further info on configuring it
-
-; config-examples:
-
-; DE-15
-; baseUrl = http://data.ub.uni-leipzig.de/item/DE-15/barcode/
-; ilsIdentifier = "barcode"
-; ISIL = "DE-15"
-
-; DE-Gla 1
-; baseUrl = http://139.18.19.238:8080/DaiaThecaMssql/rs/DE-Gla%201/daia/
-; ilsIdentifier = "record_id"
-
-; default
-; ilsIdentifier = "default"
\ No newline at end of file
diff --git a/fid_mewi/alpha/languages/en.ini b/fid_mewi/alpha/languages/en.ini
new file mode 100644
index 00000000000..f69f984f289
--- /dev/null
+++ b/fid_mewi/alpha/languages/en.ini
@@ -0,0 +1,17 @@
+;####################################################################
+;##################### DO NOT DELETE THIS HEADER ####################
+;################### Leipzig University Library © 2015 ##############
+;
+; This is a ISIL-instance-specific ALPHA-LANGUAGE-file and inherits
+; all the settings from the LANGUAGE-file defined in @parent_ini which
+; points to the ISIL-instance-specific default LANGUAGE-file located in
+; the folder vufind2/ISIL/languages
+;
+
+@parent_ini = "../../languages/en.ini"
+
+;
+; Add ALPHA-specific customization after this header.
+;
+;##################### DO NOT DELETE THIS HEADER ####################
+;####################################################################
diff --git a/fid_mewi/config/vufind/DAIA.ini b/fid_mewi/config/vufind/SolrAI.ini
similarity index 87%
rename from fid_mewi/config/vufind/DAIA.ini
rename to fid_mewi/config/vufind/SolrAI.ini
index acb334b9798..4f1c04ec648 100644
--- a/fid_mewi/config/vufind/DAIA.ini
+++ b/fid_mewi/config/vufind/SolrAI.ini
@@ -2,13 +2,13 @@
;##################### DO NOT DELETE THIS HEADER ####################
;################### Leipzig University Library © 2015 ##############
;
-; This is the SIGEL-instance-specific default INI-file and inherits
+; This is the ISIL-instance-specific default INI-file and inherits
; all the settings from the INI-file defined in [Parent_Config] which
; points to the default INI-file located in the folder vufind2/local
;
[Parent_Config]
-relative_path = ../../../local/config/vufind/DAIA.ini
+relative_path = ../../../local/config/vufind/SolrAI.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
diff --git a/fid_mewi/config/vufind/FincDAIA.ini b/fid_mewi/config/vufind/SolrMarcRemoteFinc.ini
similarity index 65%
rename from fid_mewi/config/vufind/FincDAIA.ini
rename to fid_mewi/config/vufind/SolrMarcRemoteFinc.ini
index 294241197ef..fbfca738c5e 100644
--- a/fid_mewi/config/vufind/FincDAIA.ini
+++ b/fid_mewi/config/vufind/SolrMarcRemoteFinc.ini
@@ -8,7 +8,7 @@
;
[Parent_Config]
-relative_path = ../../../local/config/vufind/FincDAIA.ini
+relative_path = ../../../local/config/vufind/SolrMarcRemoteFinc.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
@@ -21,20 +21,3 @@ relative_path = ../../../local/config/vufind/FincDAIA.ini
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
-;[DAIA]
-; this config configures the extended DAIA-Driver FincDAIA
-; refer to ticket #4499 for further info on configuring it
-
-; config-examples:
-
-; DE-15
-; baseUrl = http://data.ub.uni-leipzig.de/item/DE-15/barcode/
-; ilsIdentifier = "barcode"
-; ISIL = "DE-15"
-
-; DE-Gla 1
-; baseUrl = http://139.18.19.238:8080/DaiaThecaMssql/rs/DE-Gla%201/daia/
-; ilsIdentifier = "record_id"
-
-; default
-; ilsIdentifier = "default"
diff --git a/fid_mewi/dev/config/vufind/FincDAIA.ini.sample b/fid_mewi/dev/config/vufind/SolrAI.ini.sample
similarity index 66%
rename from fid_mewi/dev/config/vufind/FincDAIA.ini.sample
rename to fid_mewi/dev/config/vufind/SolrAI.ini.sample
index 5989277c201..3a2ef5f97ae 100644
--- a/fid_mewi/dev/config/vufind/FincDAIA.ini.sample
+++ b/fid_mewi/dev/config/vufind/SolrAI.ini.sample
@@ -4,12 +4,12 @@
;
; This is the ISIL-instance-specific DEV-INI-file and inherits
; all the settings from the INI-file defined in [Parent_Config] which
-; points to the ISIL-instance-specific default INI-file located in
+; points to the ISIL-instance-specific default INI-file located in
; the folder vufind2/ISIL/config/vufind
;
[Parent_Config]
-relative_path = ../../../config/vufind/FincDAIA.ini
+relative_path = ../../../config/vufind/SolrAI.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
@@ -21,21 +21,3 @@ relative_path = ../../../config/vufind/FincDAIA.ini
;
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
-
-;[DAIA]
-; this config configures the extended DAIA-Driver FincDAIA
-; refer to ticket #4499 for further info on configuring it
-
-; config-examples:
-
-; DE-15
-; baseUrl = http://data.ub.uni-leipzig.de/item/DE-15/barcode/
-; ilsIdentifier = "barcode"
-; ISIL = "DE-15"
-
-; DE-Gla 1
-; baseUrl = http://139.18.19.238:8080/DaiaThecaMssql/rs/DE-Gla%201/daia/
-; ilsIdentifier = "record_id"
-
-; default
-; ilsIdentifier = "default"
\ No newline at end of file
diff --git a/fid_mewi/dev/config/vufind/DAIA.ini.sample b/fid_mewi/dev/config/vufind/SolrMarcRemoteFinc.ini.sample
similarity index 64%
rename from fid_mewi/dev/config/vufind/DAIA.ini.sample
rename to fid_mewi/dev/config/vufind/SolrMarcRemoteFinc.ini.sample
index cb7d0e92efa..545edbed095 100644
--- a/fid_mewi/dev/config/vufind/DAIA.ini.sample
+++ b/fid_mewi/dev/config/vufind/SolrMarcRemoteFinc.ini.sample
@@ -2,14 +2,14 @@
;##################### DO NOT DELETE THIS HEADER ####################
;################### Leipzig University Library © 2015 ##############
;
-; This is the SIGEL-instance-specific DEV-INI-file and inherits
+; This is the ISIL-instance-specific DEV-INI-file and inherits
; all the settings from the INI-file defined in [Parent_Config] which
-; points to the SIGEL-instance-specific default INI-file located in
-; the folder vufind2/SIGEL/config/vufind
+; points to the ISIL-instance-specific default INI-file located in
+; the folder vufind2/ISIL/config/vufind
;
[Parent_Config]
-relative_path = ../../../config/vufind/DAIA.ini
+relative_path = ../../../config/vufind/SolrMarcRemoteFinc.ini
; A comma-separated list of config sections from the parent which should be
; completely overwritten by the equivalent sections in this configuration;
@@ -21,10 +21,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
diff --git a/fid_mewi/dev/languages/en.ini b/fid_mewi/dev/languages/en.ini
new file mode 100644
index 00000000000..9bea60a1422
--- /dev/null
+++ b/fid_mewi/dev/languages/en.ini
@@ -0,0 +1,17 @@
+;####################################################################
+;##################### DO NOT DELETE THIS HEADER ####################
+;################### Leipzig University Library © 2015 ##############
+;
+; This is a ISIL-instance-specific DEV-LANGUAGE-file and inherits
+; all the settings from the LANGUAGE-file defined in @parent_ini which
+; points to the ISIL-instance-specific default LANGUAGE-file located in
+; the folder vufind2/ISIL/languages
+;
+
+@parent_ini = "../../languages/en.ini"
+
+;
+; Add DEV-specific customization after this header.
+;
+;##################### DO NOT DELETE THIS HEADER ####################
+;####################################################################
diff --git a/fid_mewi/languages/en.ini b/fid_mewi/languages/en.ini
new file mode 100644
index 00000000000..df207577041
--- /dev/null
+++ b/fid_mewi/languages/en.ini
@@ -0,0 +1,18 @@
+;####################################################################
+;##################### DO NOT DELETE THIS HEADER ####################
+;################### Leipzig University Library © 2015 ##############
+;
+; This is a ISIL-instance-specific default LANGUAGE-file and inherits
+; all the settings from the LANGUAGE-file defined in @parent_ini which
+; points to the default LANGUAGE-file located in the folder
+; vufind2/local/languages
+;
+
+@parent_ini = "../../../local/languages/en.ini"
+
+;
+; Add instance-specific customization after this header.
+;
+;##################### DO NOT DELETE THIS HEADER ####################
+;####################################################################
+
--
GitLab