Merge branch 'development'

swissbib · Oct 14, 2016 · e76421b · e76421b
2 parents 7888211 + 46aad69
commit e76421b
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 59 deletions.
diff --git a/cli/sync.sh b/cli/sync.sh
@@ -27,4 +27,4 @@ rm -rf $VUFIND_CACHE/searchspecs/*
 rm -rf $VUFIND_CACHE/objects/*
 rm -rf $VUFIND_CACHE/languages/*
 
-service httpd restart
+service apache2 restart
diff --git a/local/config/vufind/searchspecs.yaml b/local/config/vufind/searchspecs.yaml
@@ -517,6 +517,20 @@ OWC:
     classif_ocm:
          - [onephrase, ~]
 
+RVK:
+  DismaxFields:
+    - classif_rvk
+  QueryFields:
+    classif_rvk:
+         - [onephrase, ~]
+
+DDC:
+  DismaxFields:
+    - classif_ddc
+  QueryFields:
+    classif_ddc:
+         - [onephrase, ~]
+
 Autosuggest:
   DismaxHandler: dismax
   DismaxFields:

diff --git a/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php b/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php
@@ -226,10 +226,11 @@ protected function addUserInstitutions(ParamBag $backendParams)
      * GetFacetLabel
      *
      * @param string $field Facet field name.
+     * @param string $value Facet value.
      *
      * @return string Human-readable description of field.
      */
-    public function getFacetLabel($field)
+    public function getFacetLabel($field, $value = null)
     {
         switch($field) {
         case 'publishDate':

diff --git a/sbDocumentation/boxes_links/simple_searchbox.html b/sbDocumentation/boxes_links/simple_searchbox.html
@@ -34,6 +34,8 @@
         <option value="FormerOwner">Vorbesitzer</option>
         <option value="Annotator">Annotator</option>
         <option value="RaraPerson">Vorbesitzer/Annotator</option>
+        <option value="DDC">Dewey-Dezimalklassifikation (DDC)</option>
+        <option value="RVK">Regensburger Verbundklassifikation (RVK)</option>
         <option value="music">Sacherschliessung Musik</option>
         <option value="OCM">Outline of cultural materials</option>
         <option value="OWC">Outline of World Cultures</option>

diff --git a/sbDocumentation/vf2sb_fullschema.db.sql → sbDocumentation/vf3sb_fullschema.db.sql b/sbDocumentation/vf2sb_fullschema.db.sql → sbDocumentation/vf3sb_fullschema.db.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.1.73, for redhat-linux-gnu (x86_64)
+-- MySQL dump 10.15  Distrib 10.0.25-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dbvfgreenRDprod
+-- Host: localhost    Database: v3greentest
 -- ------------------------------------------------------
--- Server version	5.1.73
+-- Server version	10.0.25-MariaDB-0ubuntu0.16.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -46,7 +46,7 @@ CREATE TABLE `comments` (
   `user_id` int(11) NOT NULL DEFAULT '0',
   `resource_id` int(11) NOT NULL DEFAULT '0',
   `comment` text NOT NULL,
-  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   PRIMARY KEY (`id`),
   KEY `user_id` (`user_id`),
   KEY `resource_id` (`resource_id`),
@@ -65,11 +65,30 @@ DROP TABLE IF EXISTS `oai_resumption`;
 CREATE TABLE `oai_resumption` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `params` text,
-  `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `expires` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `record`
+--
+
+DROP TABLE IF EXISTS `record`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `record` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `record_id` varchar(255) DEFAULT NULL,
+  `source` varchar(50) DEFAULT NULL,
+  `version` varchar(20) NOT NULL,
+  `data` longtext,
+  `updated` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `record_id_source` (`record_id`,`source`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `resource`
 --
@@ -79,14 +98,14 @@ DROP TABLE IF EXISTS `resource`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `resource` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `record_id` varchar(120) NOT NULL DEFAULT '',
+  `record_id` varchar(255) NOT NULL DEFAULT '',
   `title` varchar(200) NOT NULL DEFAULT '',
   `author` varchar(200) DEFAULT NULL,
   `year` mediumint(6) DEFAULT NULL,
-  `source` varchar(50) NOT NULL DEFAULT 'VuFind',
+  `source` varchar(50) NOT NULL DEFAULT 'Solr',
   PRIMARY KEY (`id`),
   KEY `record_id` (`record_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=32132 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -112,7 +131,7 @@ CREATE TABLE `resource_tags` (
   CONSTRAINT `resource_tags_ibfk_15` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`) ON DELETE CASCADE,
   CONSTRAINT `resource_tags_ibfk_16` FOREIGN KEY (`list_id`) REFERENCES `user_list` (`id`) ON DELETE SET NULL,
   CONSTRAINT `resource_tags_ibfk_17` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE SET NULL
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11444 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -127,15 +146,16 @@ CREATE TABLE `search` (
   `user_id` int(11) NOT NULL DEFAULT '0',
   `session_id` varchar(128) DEFAULT NULL,
   `folder_id` int(11) DEFAULT NULL,
-  `created` date NOT NULL DEFAULT '0000-00-00',
+  `created` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   `title` varchar(20) DEFAULT NULL,
   `saved` int(1) NOT NULL DEFAULT '0',
   `search_object` blob,
+  `checksum` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `user_id` (`user_id`),
   KEY `folder_id` (`folder_id`),
   KEY `session_id` (`session_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=41358482 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -150,11 +170,11 @@ CREATE TABLE `session` (
   `session_id` varchar(128) DEFAULT NULL,
   `data` text,
   `last_used` int(12) NOT NULL DEFAULT '0',
-  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   PRIMARY KEY (`id`),
   UNIQUE KEY `session_id` (`session_id`),
   KEY `last_used` (`last_used`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=189993030 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -168,7 +188,7 @@ CREATE TABLE `tags` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `tag` varchar(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5434 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -180,65 +200,72 @@ DROP TABLE IF EXISTS `user`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `username` varchar(200) DEFAULT NULL,
+  `username` varchar(255) NOT NULL DEFAULT '',
   `password` varchar(32) NOT NULL DEFAULT '',
   `pass_hash` varchar(60) DEFAULT NULL,
   `firstname` varchar(50) NOT NULL DEFAULT '',
   `lastname` varchar(50) NOT NULL DEFAULT '',
-  `email` varchar(250) NOT NULL DEFAULT '',
+  `email` varchar(255) NOT NULL DEFAULT '',
   `cat_username` varchar(50) DEFAULT NULL,
-  `cat_password` varchar(50) DEFAULT NULL,
-  `cat_pass_enc` varchar(110) DEFAULT NULL,
+  `cat_password` varchar(70) DEFAULT NULL,
+  `cat_pass_enc` varchar(170) DEFAULT NULL,
   `college` varchar(100) NOT NULL DEFAULT '',
   `major` varchar(100) NOT NULL DEFAULT '',
   `home_library` varchar(100) NOT NULL DEFAULT '',
-  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `sb_nickname` text NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   `favorite_institutions` text NOT NULL,
   `language` varchar(2) NOT NULL DEFAULT '',
   `max_hits` smallint(6) NOT NULL DEFAULT '0',
   `default_sort` varchar(255) NOT NULL DEFAULT '',
   `verify_hash` varchar(42) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE KEY `username` (`username`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=27822 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `user_list`
+-- Table structure for table `user_card`
 --
 
-DROP TABLE IF EXISTS `user_list`;
+DROP TABLE IF EXISTS `user_card`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `user_list` (
+CREATE TABLE `user_card` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL,
-  `title` varchar(200) NOT NULL,
-  `description` text,
-  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `public` int(11) NOT NULL DEFAULT '0',
+  `card_name` varchar(255) NOT NULL DEFAULT '',
+  `cat_username` varchar(50) NOT NULL DEFAULT '',
+  `cat_password` varchar(50) DEFAULT NULL,
+  `cat_pass_enc` varchar(110) DEFAULT NULL,
+  `home_library` varchar(100) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `saved` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `user_id` (`user_id`),
-  CONSTRAINT `user_list_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+  KEY `user_card_cat_username` (`cat_username`),
+  CONSTRAINT `user_card_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `user_localdata`
+-- Table structure for table `user_list`
 --
 
-DROP TABLE IF EXISTS `user_localdata`;
+DROP TABLE IF EXISTS `user_list`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `user_localdata` (
+CREATE TABLE `user_list` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL,
-  `language` text,
-  `max_hits` int(11) NOT NULL,
+  `title` varchar(200) NOT NULL,
+  `description` text,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `public` int(11) NOT NULL DEFAULT '0',
+  `expires` datetime NOT NULL DEFAULT '2000-00-00 00:00:00',
   PRIMARY KEY (`id`),
-  KEY `user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  KEY `user_id` (`user_id`),
+  CONSTRAINT `user_list_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=8709 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -262,7 +289,7 @@ CREATE TABLE `user_resource` (
   CONSTRAINT `user_resource_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE,
   CONSTRAINT `user_resource_ibfk_2` FOREIGN KEY (`resource_id`) REFERENCES `resource` (`id`) ON DELETE CASCADE,
   CONSTRAINT `user_resource_ibfk_5` FOREIGN KEY (`list_id`) REFERENCES `user_list` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=34033 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -309,4 +336,4 @@ CREATE TABLE `user_stats_fields` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-05-08 16:08:44
+-- Dump completed on 2016-08-31 15:24:56
diff --git a/themes/sbvfrd/templates/Holdings/holding-item-flipped.phtml b/themes/sbvfrd/templates/Holdings/holding-item-flipped.phtml
@@ -36,7 +36,7 @@ if (preg_match('/[\s\S]*<ul[\s\S]*<\/ul>[\s\S]*/', $holdingActionsContent)): ?>
 <tr>
   <th><?= $headers['availability'] ?></th>
   <td><?= $this->availabilityInfo($item['availability']) ?>
-    <? if (($item['network'] === 'IDSBB') && (isset($item['holding_status'])) && ($item['holding_status'] === '55')): ?>
+    <? if (($item['network'] === 'IDSBB') && (isset($item['holding_status']) | isset($item['process_status'])) && (($item['holding_status'] === '55') | ($item['process_status'] === 'ES'))): ?>
       <? $addressURL = $this->redirectProtocolWrapper()->getWrappedURL('http://aleph.unibas.ch/F/?func=item-loan&adm_library=DSV51&doc_number='. $item['localid'] . '&item_sequence='. $item['sequencenumber']); ?>
       <a href="<?= $this->escapeHtml($addressURL)?>" target="_blank" title="<?= $this->transEsc('Address') ?>"><?= $this->transEsc('Address') ?></a>
     <? endif; ?>
@@ -49,7 +49,7 @@ if (preg_match('/[\s\S]*<ul[\s\S]*<\/ul>[\s\S]*/', $holdingActionsContent)): ?>
     <?= $mapLink ?>
     <?php if (isset($item['institutionUrl'])): ?>
       <?php $wrappedURL = $this->redirectProtocolWrapper()->getWrappedURL($item['institutionUrl']) ?>
-      <a href="<?= $this->escapeHtml($wrappedURL) ?>" target="_blank" title="<?=$this->transEsc('Library_Information')?>"> <i class="fa fa-info-circle"></i></a>
+      <a href="<?= $this->escapeHtml($wrappedURL) ?>" target="_blank" title="<?=$this->transEsc('Library_Information')?>" data-lightbox-ignore> <i class="fa fa-info-circle"></i></a>
     <?php endif; ?>
   </td>
 </tr>

diff --git a/themes/sbvfrd/templates/Holdings/holding-item.phtml b/themes/sbvfrd/templates/Holdings/holding-item.phtml
@@ -25,7 +25,7 @@ if (isset($item['locationMap']) && $item['locationMap']) {
       <div class='availability fa-check'><div> <?= $this->transEsc('use-on-site'); ?> </div></div>
     <? else: ?>
     <?= $this->availabilityInfo($item['availability']) ?>
-      <? if (($item['network'] === 'IDSBB') && (isset($item['holding_status'])) && ($item['holding_status'] === '55')): ?>
+      <? if (($item['network'] === 'IDSBB') && (isset($item['holding_status']) | isset($item['process_status'])) && (($item['holding_status'] === '55') | ($item['process_status'] === 'ES'))): ?>
         <? $addressURL = $this->redirectProtocolWrapper()->getWrappedURL('http://aleph.unibas.ch/F/?func=item-loan&adm_library=DSV51&doc_number='. $item['localid'] . '&item_sequence='. $item['sequencenumber']); ?>
         <a href="<?= $this->escapeHtml($addressURL)?>" target="_blank" title="<?= $this->transEsc('Address') ?>"><?= $this->transEsc('Address') ?></a>
       <? endif; ?>
@@ -36,7 +36,7 @@ if (isset($item['locationMap']) && $item['locationMap']) {
     <?= $mapLink ?>
     <?php if (isset($item['institutionUrl'])): ?>
       <?php $wrappedURL = $this->redirectProtocolWrapper()->getWrappedURL($item['institutionUrl']) ?>
-      <a href="<?= $this->escapeHtml($wrappedURL) ?>" target="_blank" title="<?=$this->transEsc('Library_Information')?>"> <i class="fa fa-info-circle"></i></a>
+      <a href="<?= $this->escapeHtml($wrappedURL) ?>" target="_blank" title="<?=$this->transEsc('Library_Information')?>" data-lightbox-ignore> <i class="fa fa-info-circle"></i></a>
     <?php endif; ?>
   </td>
   <td><?= $this->escapeHtml($item['signature']) ?></td>

diff --git a/themes/sbvfrd/templates/myresearch/favorites.phtml b/themes/sbvfrd/templates/myresearch/favorites.phtml
@@ -21,7 +21,7 @@ $isLoggedIn = !!$this->auth()->isLoggedIn();
       <fieldset class="form-group">
         <label for="query" class="col-sm-2 control-label"><?= $this->transEsc('Library') ?></label>
         <div class="col-sm-10">
-          <input type="text" id="query" class="form-control" autocomplete="off" autofocus/>
+          <input type="text" id="query" class="form-control autocomplete" autocomplete="off" autofocus/>
         </div>
       </fieldset>
 
@@ -48,12 +48,3 @@ $isLoggedIn = !!$this->auth()->isLoggedIn();
 <div class="<?= $this->layoutClass('sidebar') ?>">
   <?= $this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'favorite-institutions')) ?>
 </div>
-
-<script type="text/javascript">
-  $('input#query').autocomplete({
-    maxResults: 10,
-    handler: function(query, cb) {
-      cb(<?=json_encode(array_values($autocompleterData))?>);
-    }
-  });
-</script>
diff --git a/themes/sbvfrd/templates/record/copy.phtml b/themes/sbvfrd/templates/record/copy.phtml
@@ -29,9 +29,9 @@ if (isset($form)) {
 
 ?>
 <p class="lead"><?=$this->transEsc('request_copy_text')?></p>
-<p><?=$this->transEsc('copy_of') ?>: <a href="<?=$this->recordLink()->getUrl($this->driver) ?>" target="_blank"> <?= $this->escapeHtml($shortTitle) ?> <? if (!empty($responsible)): ?> <?=' / ' . $this->escapeHtml($responsible)?><? endif; ?></a><p>
+<p><?=$this->transEsc('copy_of') ?>: <a href="<?=$this->recordLink()->getUrl($this->driver) ?>" target="_blank" data-lightbox-ignore> <?= $this->escapeHtml($shortTitle) ?> <? if (!empty($responsible)): ?> <?=' / ' . $this->escapeHtml($responsible)?><? endif; ?></a><p>
 <p><?=$this->transEsc('copy_info') ?></p>
-<p><?=$this->transEsc('hold_text4') ?> <a href="<?= $this->url('help-page', array('topic' => 'delivery')); ?>" target="_blank"><?=$this->transEsc('hold_text5')?></a>.</p><br/>
+<p><?=$this->transEsc('hold_text4') ?> <a href="<?= $this->url('help-page', array('topic' => 'delivery')); ?>" target="_blank" data-lightbox-ignore><?=$this->transEsc('hold_text5')?></a>.</p><br/>
 
 <?=$this->flashmessages()?>
 <div class="copy-form">

diff --git a/themes/sbvfrdjus/templates/Auth/Shibboleth/login.phtml b/themes/sbvfrdjus/templates/Auth/Shibboleth/login.phtml
@@ -2,7 +2,7 @@
 
 $encodedProviderID = urlencode($this->serverUrl() . "/" . "shibboleth");
 $encodedTarget = urlencode($this->serverUrl() . "/MyResearch/Home");
-$encodedprivateUserURL ="https://edu-id.ch/idp/profile/SAML2/Unsolicited/SSO?providerId=" . $encodedProviderID . "&target=" . $encodedTarget;
+$encodedprivateUserURL ="https://login.eduid.ch/idp/profile/SAML2/Unsolicited/SSO?providerId=" . $encodedProviderID . "&target=" . $encodedTarget;
 ?>
 
 

diff --git a/themes/sbvfrdsingle/templates/Auth/Shibboleth/login.phtml b/themes/sbvfrdsingle/templates/Auth/Shibboleth/login.phtml
@@ -2,7 +2,7 @@
 
 $encodedProviderID = urlencode($this->serverUrl() . "/" . "shibboleth");
 $encodedTarget = urlencode($this->serverUrl() . "/MyResearch/Home");
-$encodedprivateUserURL ="https://edu-id.ch/idp/profile/SAML2/Unsolicited/SSO?providerId=" . $encodedProviderID . "&target=" . $encodedTarget;
+$encodedprivateUserURL ="https://login.eduid.ch/idp/profile/SAML2/Unsolicited/SSO?providerId=" . $encodedProviderID . "&target=" . $encodedTarget;
 ?>