diff --git a/composer.local.2.fid-bbi.json b/composer.local.2.fid-bbi.json
index 3c41deab56825348dcbba0ecbe14b16dd06a9a41..2e9774aac3a37917ff9bd16b80683fd77403c0bd 100644
--- a/composer.local.2.fid-bbi.json
+++ b/composer.local.2.fid-bbi.json
@@ -6,12 +6,14 @@
},
"require": {
"finc/boss-module": "^0.0.13",
+ "finc/dbis-module": "^3.0.0",
"finc/worldcat-search-module": "^0.0.5"
},
"extra": {
"vufind": {
"modules": [
"finc\\Boss",
+ "finc\\Dbis",
"finc\\WorldCat",
"fid_bbi"
]
diff --git a/composer.lock b/composer.lock
index 0e41d4691e2ca8ef4370c3cf2be716b866a13ebb..bf43c0dc3d1f7b180ed3fcf906f62a822cc0b713 100644
--- a/composer.lock
+++ b/composer.lock
@@ -551,6 +551,52 @@
"description": "Module for BOSS Webservice",
"time": "2020-01-20T11:27:19+00:00"
},
+ {
+ "name": "finc/dbis-module",
+ "version": "v3.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/dbis-module.git",
+ "reference": "9be8464847b1623a4f3db1520e2495c1a02f1e54"
+ },
+ "require": {
+ "finc/symfony-serializer-zend-bridge": "^0.0.1",
+ "finc/vufindhttp-psrcompat": "^0.0.2",
+ "php": ">=7.1"
+ },
+ "type": "library",
+ "extra": {
+ "vufind": {
+ "themes": {
+ "res/mixin": "finc-dbis"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "finc\\Dbis\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Gregor Gawol",
+ "email": "gawol@ub.uni-leipzig.de"
+ },
+ {
+ "name": "Sebastian Kehr",
+ "email": "kehr@ub.uni-leipzig.de"
+ },
+ {
+ "name": "Robert Lange",
+ "email": "lange@ub.uni-leipzig.de"
+ }
+ ],
+ "time": "2020-08-07T10:09:56+00:00"
+ },
{
"name": "finc/rules-evaluator",
"version": "v0.0.3",
@@ -744,7 +790,7 @@
"version": "dev-master",
"source": {
"type": "git",
- "url": "git@github.com:ghislainf/zf2-whoops.git",
+ "url": "https://github.com/ghislainf/zf2-whoops.git",
"reference": "2649cf7caf400409942ddc3f8fe15b89381fc74e"
},
"dist": {
@@ -6756,6 +6802,7 @@
"rbac",
"zf2"
],
+ "abandoned": true,
"time": "2017-05-07T08:45:27+00:00"
},
{
@@ -7907,6 +7954,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2017-11-27T05:48:46+00:00"
},
{
@@ -8368,6 +8416,7 @@
],
"description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
"homepage": "https://github.com/sebastianbergmann/finder-facade",
+ "abandoned": true,
"time": "2017-11-18T17:31:49+00:00"
},
{
diff --git a/fid_bbi/config/vufind/config.ini b/fid_bbi/config/vufind/config.ini
index 4a719c6b71e04e84d7a1c6ab6261e4de0c776db0..77220ec6b1dcbff5fb51a996b7eecbd3c4775f2e 100644
--- a/fid_bbi/config/vufind/config.ini
+++ b/fid_bbi/config/vufind/config.ini
@@ -185,4 +185,10 @@ alphabet_letters = "AÄBCDEFGHIJKLMNOÖPQRSTUÜVWXYZ"
; Uncomment to sort lists alphabetically (instead of by popularity); note that
; this will not changed the values returned -- you will still get only the
; <result_limit> most popular entries -- it only affects display order.
-alphabetical_order = true
\ No newline at end of file
+alphabetical_order = true
+
+[MediaLicenses]
+BookHistoryOnline = "https://fid-bbi.idm.oclc.org/login?url=https://bibliographies.brillonline.com/browse/book-history-online"
+
+[ExternalDatabases]
+DBIS = true
\ No newline at end of file
diff --git a/fid_bbi/config/vufind/dbis.ini b/fid_bbi/config/vufind/dbis.ini
new file mode 100644
index 0000000000000000000000000000000000000000..f04f3d57c093b3794474519adef7bd7a797d1999
--- /dev/null
+++ b/fid_bbi/config/vufind/dbis.ini
@@ -0,0 +1,4 @@
+; Which subject links do you want to retrieve?
+[Subject]
+; "Fachgebiet: Informations-, Buch- und Bibliothekswesen, Handschriftenkunde"
+value = 54
\ No newline at end of file
diff --git a/module/fid_bbi/config/module.config.php b/module/fid_bbi/config/module.config.php
index a2145954e9d730d10a18c3b1118fe6f8d5b3a580..889ae6fb7be25a2b06848a648658e7504ad05af9 100644
--- a/module/fid_bbi/config/module.config.php
+++ b/module/fid_bbi/config/module.config.php
@@ -26,6 +26,7 @@ use fid_bbi\Db\Table\Tags as BBITagsTable;
use VuFind\Db\Row\Tags as BaseTagsRow;
use VuFind\Db\Table\CaseSensitiveTagsFactory;
use fid_bbi\Controller\RecordController;
+use fid_bbi\Controller\MyResearchController;
use fid\Controller\RecordControllerDelegatorFactory;
$config = [
@@ -38,7 +39,7 @@ $config = [
'factories' => [
'fid_bbi\Controller\FeedbackController' => 'VuFind\Controller\AbstractBaseFactory',
'fid_bbi\Controller\SearchController' => 'VuFind\Controller\AbstractBaseFactory',
- 'fid_bbi\Controller\MyResearchController' => 'VuFind\Controller\AbstractBaseFactory',
+ 'fid_bbi\Controller\MyResearchController' => \fid\Controller\MyResearchControllerFactory::class,
'fid_bbi\Controller\RecordController' => 'VuFind\Controller\AbstractBaseWithConfigFactory',
'fid_bbi\Controller\BrowseController' => 'VuFind\Controller\AbstractBaseWithConfigFactory',
],
@@ -58,6 +59,31 @@ $config = [
],
],
],
+ 'router' => [
+ 'routes' => [
+ 'myresearch' => [
+ 'type' => Regex::class,
+ 'options' => [
+ 'regex' => '/(?i)myresearch',
+ 'spec' => '/myresearch'
+ ],
+ 'may_terminate' => true,
+ 'child_routes' => [
+ 'databases' => [
+ 'type' => Regex::class,
+ 'options' => [
+ 'regex' => '/(?i)(databases|dbis|licenses)',
+ 'defaults' => [
+ 'controller' => MyResearchController::class,
+ 'action' => 'databases',
+ ],
+ 'spec' => '/databases'
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
'vufind' => [
'plugin_managers' => [
'recorddriver' => [
diff --git a/module/fid_bbi/src/fid_bbi/Controller/MyResearchController.php b/module/fid_bbi/src/fid_bbi/Controller/MyResearchController.php
index 6d472a8696107afec3e424fc8ec062d3282765f2..851c3831437168a72df979c17cb86a920a0148d5 100644
--- a/module/fid_bbi/src/fid_bbi/Controller/MyResearchController.php
+++ b/module/fid_bbi/src/fid_bbi/Controller/MyResearchController.php
@@ -27,6 +27,11 @@
*/
namespace fid_bbi\Controller;
+use fid\Service\ClientException;
+use fid\Service\DataTransferObject\Library;
+use VuFind\Exception\Forbidden;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
/**
* Controller for the user account area.
*
@@ -36,7 +41,7 @@ namespace fid_bbi\Controller;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org Main Site
*/
-class MyResearchController extends \finc\Controller\MyResearchController
+class MyResearchController extends \fid\Controller\MyResearchController
{
public function usertagsAction() {
diff --git a/themes/fid_bbi/languages/de.ini b/themes/fid_bbi/languages/de.ini
index 0c9a8c222b28deeaacf9cc97c0486fa280edc174..abe90783a971528c4251cf43a4190984612cd176 100644
--- a/themes/fid_bbi/languages/de.ini
+++ b/themes/fid_bbi/languages/de.ini
@@ -39,3 +39,5 @@ home_step_1 = <p>Suchen Sie in über 3 Millionen Datensätzen.</p>
home_step_2 = <p>Greifen Sie auf SpezialÂliteratur und forschungsÂrelevante Informationen für die Buch-, Bibliotheks- und InformationsÂwissenschaft zu.</p>
home_step_3 = <p>Registrieren Sie sich kostenlos für die Nutzung weiterer Funktionen.</p>
home_tagline = Das Nachweisportal für die <br>Buch-, BiblioÂtheks- und InformaÂtionsÂwissenÂschaft
+
+licenses_BookHistoryOnline = Bibliographie "Book History Online" bei brill.com
diff --git a/themes/fid_bbi/languages/en.ini b/themes/fid_bbi/languages/en.ini
index dbd40b333d7574df0931e789b283890116cbb058..c502ff71856c74fe139842b44e52d817ffdb82c6 100644
--- a/themes/fid_bbi/languages/en.ini
+++ b/themes/fid_bbi/languages/en.ini
@@ -18,3 +18,5 @@ home_step_1 = <p>TODO: Translate. Suchen Sie in über 3 Millionen Datensätzen.<
home_step_2 = <p>TODO: Translate. Greifen Sie auf SpezialÂliteratur und forschungsÂrelevante Informationen für die Buch-, Bibliotheks- und InformationsÂwissenschaft zu.</p>
home_step_3 = <p>TODO: Translate. Registrieren Sie sich kostenlos für die Nutzung weiterer Funktionen.</p>
home_tagline = TODO: Translate. Das Nachweisportal für die <br>Buch-, BiblioÂtheks- und InformaÂtionsÂwissenÂschaft
+
+licenses_BookHistoryOnline = "Book History Online" bibliography hosted at brill.com
\ No newline at end of file
diff --git a/themes/fid_bbi/theme.config.php b/themes/fid_bbi/theme.config.php
index 225f8a9c66408b6a3dc0ba31403b1a60cb6371fe..e1e2e1b8215f6ba95756499802062fc6e0c1c5fe 100644
--- a/themes/fid_bbi/theme.config.php
+++ b/themes/fid_bbi/theme.config.php
@@ -9,6 +9,7 @@ return [
],
'mixins' => [
'worldcat',
+ 'finc-dbis',
'boss'
],
'helpers' => array(