From d524acf1c7996df544eed71f643812e9b4565ae7 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Tue, 31 May 2016 09:45:31 -0400 Subject: [PATCH 01/49] Adjusted wording. --- themes/bootstrap3/templates/upgrade/getsourcedir.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml index e0bf64956b2..4ac38abb410 100644 --- a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml +++ b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml @@ -13,7 +13,7 @@
-

Option 2: Upgrade from VuFind 2.x

+

Option 2: Upgrade from VuFind 2.x or newer

Please enter the version number you are upgrading from (e.g. 2.0.1): From a642732888541ebf98322e8d0e55a55af10a1c54 Mon Sep 17 00:00:00 2001 From: Chris Hallberg Date: Wed, 1 Jun 2016 13:47:30 -0400 Subject: [PATCH 02/49] External exports not trapped by the lightbox. VUFIND-1180. --- themes/bootstrap3/templates/cart/export.phtml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/themes/bootstrap3/templates/cart/export.phtml b/themes/bootstrap3/templates/cart/export.phtml index fc66aa6a5c3..bc064adfe8b 100644 --- a/themes/bootstrap3/templates/cart/export.phtml +++ b/themes/bootstrap3/templates/cart/export.phtml @@ -39,15 +39,17 @@

- + export()->needsRedirect($firstOption)): ?> data-lightbox-ignore/>
@@ -56,6 +58,13 @@ $script = << inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET') ?> \ No newline at end of file From e4e81dc680bcc574e94ebe7a9ff04684f1f14bc9 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Thu, 2 Jun 2016 15:00:37 -0400 Subject: [PATCH 03/49] Moved misplaced config options. --- config/vufind/config.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/vufind/config.ini b/config/vufind/config.ini index 7750b443478..66753246395 100644 --- a/config/vufind/config.ini +++ b/config/vufind/config.ini @@ -746,14 +746,6 @@ authors = Wikipedia ;bottomPadding = 3 ;wrapWidth = 110 -; This section is needed for Buchhandel.de cover loading. You need an authentication -; token. It may also be necessary to customize your templates in order to comply with -; terms of service; please look at http://info.buchhandel.de/handbuch_links for -; details before turning this on. -[Buchhandel] -url = "https://api.vlb.de/api/v1/cover/" -; token = "XXXXXX-XXXX-XXXXX-XXXXXXXXXXXX" - ; Possible HathiRights options = pd,ic,op,orph,und,umall,ic-world,nobody,pdus,cc-by,cc-by-nd, ; cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,orphcand,cc-zero,und-world,icus ; Default is "pd,ic-world" if unset here. @@ -783,6 +775,14 @@ url = "https://api.vlb.de/api/v1/cover/" ; "google" ;recordMap = google +; This section is needed for Buchhandel.de cover loading. You need an authentication +; token. It may also be necessary to customize your templates in order to comply with +; terms of service; please look at http://info.buchhandel.de/handbuch_links for +; details before turning this on. +[Buchhandel] +url = "https://api.vlb.de/api/v1/cover/" +; token = "XXXXXX-XXXX-XXXXX-XXXXXXXXXXXX" + [QRCode] ; This setting controls the image to display when no qrcode is available. ; The path is relative to the base of your theme directory. From 360586a470ed0dde1c3fd6ede84d17d811897cdd Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Mon, 6 Jun 2016 16:48:43 -0400 Subject: [PATCH 04/49] Fixed out-of-range error. - Resolves VUFIND-1183. --- import/index_scripts/author.bsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/import/index_scripts/author.bsh b/import/index_scripts/author.bsh index c0cc4f1d1d9..bfe5f7cd12c 100644 --- a/import/index_scripts/author.bsh +++ b/import/index_scripts/author.bsh @@ -375,9 +375,9 @@ public String processInitials(String authorName) { if (name.length() > 0) { String initial = name.substring(0,1); // if there is a hyphenated name, use both initials - if (name.indexOf('-') > 0) { - int pos = name.indexOf('-'); - String extra = name.substring(pos+1,pos+2); + int pos = name.indexOf('-'); + if (pos > 0 && pos < name.length() - 1) { + String extra = name.substring(pos+1, pos+2); initial = initial + " " + extra; } result += " " + initial; From 898cd49856741fcf6fa99ac14e2d7a61f2a0cd6f Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Tue, 21 Jun 2016 14:31:29 +0200 Subject: [PATCH 05/49] =?UTF-8?q?Erg=C3=A4nze=20$p=20bei=20Anzeige=20von?= =?UTF-8?q?=206xx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php index 1e94fc16273..808849d4fd1 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php @@ -1926,6 +1926,7 @@ public function getAllSubjectVocabularies($ignoreControlFields = false) 'f' => 'f', 'g' => 'g', 'h' => 'h', + 'p' => 'p', 't' => 't', '_v' => 'v', '_x' => 'x', From bfd2e7025775c75c91a47be21db3df7992e7e124 Mon Sep 17 00:00:00 2001 From: Ere Maijala Date: Wed, 22 Jun 2016 14:40:25 +0300 Subject: [PATCH 06/49] Made comment field optional in VoyagerRestful's placeStorageRetrievalRequest. --- module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php index f5f50992374..1a89aab9a41 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php +++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php @@ -2449,7 +2449,7 @@ public function placeStorageRetrievalRequest($details) ? $details['level'] : 'copy'; $itemId = isset($details['item_id']) ? $details['item_id'] : false; $mfhdId = isset($details['holdings_id']) ? $details['holdings_id'] : false; - $comment = $details['comment']; + $comment = isset($details['comment']) ? $details['comment'] : ''; $bibId = $details['id']; // Make Sure Pick Up Location is Valid From 68231f4d0a85330036fedb4706a595e2652ffbfd Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 22 Jun 2016 09:05:25 -0400 Subject: [PATCH 07/49] removed obsolete composer repo --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 083b6976e48..9316210c35c 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,6 @@ } ], "license": "GPL-2.0", - "repositories": [ - { - "type": "composer", - "url": "https://packages.zendframework.com/" - } - ], "require": { "aferrandini/phpqrcode": "1.0.1", "jasig/phpcas": "1.3.3", From 61506a8a896d93ab7524aa0d0f77b86f6f395e73 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 22 Jun 2016 09:07:38 -0400 Subject: [PATCH 08/49] updated version number in preparation for next release --- build.xml | 2 +- config/vufind/config.ini | 2 +- packages/DEBIAN/changelog | 6 ++++++ packages/DEBIAN/control | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 16723cbd141..9f01132d279 100644 --- a/build.xml +++ b/build.xml @@ -26,7 +26,7 @@ - + diff --git a/config/vufind/config.ini b/config/vufind/config.ini index 66753246395..dfbcc0f2cbf 100644 --- a/config/vufind/config.ini +++ b/config/vufind/config.ini @@ -103,7 +103,7 @@ showBulkOptions = false ; Should users be allowed to save searches in their accounts? allowSavedSearches = true ; Generator value to display in an HTML header tag: -generator = "VuFind 3.0.1" +generator = "VuFind 3.0.2" ; This section allows you to configure the mechanism used for storing user ; sessions. Available types: File, Memcache, Database. diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog index 8524042a445..8a3e2243556 100644 --- a/packages/DEBIAN/changelog +++ b/packages/DEBIAN/changelog @@ -1,3 +1,9 @@ +vufind 3.0.2 distribution; urgency=low + + * VuFind 3.0.2 release (see http://vufind.org/wiki/changelog for details) + + -- maintainer VuFind Project Administration Team Tu 5 Jul 2016 12:02:33 UTC + vufind 3.0.1 distribution; urgency=low * VuFind 3.0.1 release (see http://vufind.org/wiki/changelog for details) diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control index 9016c826dd1..f7c1364285e 100644 --- a/packages/DEBIAN/control +++ b/packages/DEBIAN/control @@ -1,5 +1,5 @@ Package: vufind -Version: 3.0.1 +Version: 3.0.2 Section: World Wide Web Priority: Optional Architecture: all From d1a4e215a880f429494840e6463365d738debdf4 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Wed, 29 Jun 2016 13:28:18 +0200 Subject: [PATCH 09/49] Neue Tel.nr. UB Bern --- local/languages/de.ini | 2 +- local/languages/en.ini | 2 +- local/languages/fr.ini | 2 +- local/languages/it.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/local/languages/de.ini b/local/languages/de.ini index 3817f34f14e..1dd7e27df76 100644 --- a/local/languages/de.ini +++ b/local/languages/de.ini @@ -693,7 +693,7 @@ feedback.form.success = Vielen Dank für Ihre Nachricht. Wir werden Ihnen mögli feedback.contact = Sie erreichen uns auch: feedback.contact.phone = Telefonisch von Montag bis Freitag 10-17 Uhr, Samstag 10-12 Uhr feedback.contact.phone.bs = Region Basel: +41 (0)61 267 31 00 -feedback.contact.phone.be = Region Bern: +41 (0)31 631 92 11 +feedback.contact.phone.be = Region Bern: +41 (0)31 631 92 19 feedback.contact.email = Per E-Mail: feedback.contact.person = Persönlich in einer Bibliothek: feedback.contact.librariesLinkText = Adressen und Öffnungszeiten aller beteiligten Bibliotheken diff --git a/local/languages/en.ini b/local/languages/en.ini index d87ead669ce..dc44dfe0b25 100644 --- a/local/languages/en.ini +++ b/local/languages/en.ini @@ -693,7 +693,7 @@ feedback.form.success = Thank you very much for your message. We will contact yo feedback.contact = You may also contact us: feedback.contact.phone = By telephone from Monday to Friday 10.00-17.00, Saturday 10.00-12.00 feedback.contact.phone.bs = Region Basel: +41 (0)61 267 31 00 -feedback.contact.phone.be = Region Bern: +41 (0)31 631 92 11 +feedback.contact.phone.be = Region Bern: +41 (0)31 631 92 19 feedback.contact.email = By email: feedback.contact.person = In person at a library: feedback.contact.librariesLinkText = Addresses and opening hours of all libraries diff --git a/local/languages/fr.ini b/local/languages/fr.ini index 5d7bb3668b9..7179e98ec37 100644 --- a/local/languages/fr.ini +++ b/local/languages/fr.ini @@ -693,7 +693,7 @@ feedback.form.success = Merci pour votre message. Nous vous répondrons le plus feedback.contact = Vous pouvez aussi nous contacter: feedback.contact.phone = Par téléphone du lundi au vendredi de 10h00-17h00, le samedi de 10h00-12h00 feedback.contact.phone.bs = Région de Bâle: +41 (0)61 267 31 00 -feedback.contact.phone.be = Région de Berne: +41 (0)31 631 92 11 +feedback.contact.phone.be = Région de Berne: +41 (0)31 631 92 19 feedback.contact.email = Par e-mail: feedback.contact.person = Dans une bibliothèque: feedback.contact.librariesLinkText = Adresses et horaires d'ouvertures des bibliothèques diff --git a/local/languages/it.ini b/local/languages/it.ini index 67b3c66b246..7c9ce949a3b 100644 --- a/local/languages/it.ini +++ b/local/languages/it.ini @@ -693,7 +693,7 @@ feedback.form.success = Grazie per il tuo messaggio. Ti risponderemo al più pre feedback.contact = Puoi anche contattarci: feedback.contact.phone = Via telefono dal lunedì al venerdì 10.00-17.00, sabato 10.00-12.00 feedback.contact.phone.bs = Regione di Basilea: +41 (0)61 267 31 00 -feedback.contact.phone.be = Regione di Berna: +41 (0)31 631 92 11 +feedback.contact.phone.be = Regione di Berna: +41 (0)31 631 92 19 feedback.contact.email = Via e-mail: feedback.contact.person = Di persona in una biblioteca: feedback.contact.librariesLinkText = Indirizzi e orari delle biblioteche From 0dfbc8c4e61ed7670f7b7645ccf27c8808ae4401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= Date: Wed, 29 Jun 2016 17:10:20 +0200 Subject: [PATCH 10/49] * replaced all hard coded links in HelpTranslations with links build by view helper (otherwise links will fail if vufind is not installed in site root) (#749) --- .../templates/HelpTranslations/ar/advsearch.phtml | 2 +- .../templates/HelpTranslations/de/advsearch.phtml | 2 +- .../templates/HelpTranslations/el/advsearch.phtml | 14 +++++++++----- .../templates/HelpTranslations/en/advsearch.phtml | 2 +- .../templates/HelpTranslations/es/advsearch.phtml | 2 +- .../templates/HelpTranslations/fr/advsearch.phtml | 2 +- .../templates/HelpTranslations/ga/advsearch.phtml | 2 +- .../templates/HelpTranslations/it/advsearch.phtml | 2 +- .../templates/HelpTranslations/ja/advsearch.phtml | 2 +- .../HelpTranslations/pt-br/advsearch.phtml | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/themes/root/templates/HelpTranslations/ar/advsearch.phtml b/themes/root/templates/HelpTranslations/ar/advsearch.phtml index be6eef7bab0..d99289abcfe 100644 --- a/themes/root/templates/HelpTranslations/ar/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/ar/advsearch.phtml @@ -8,7 +8,7 @@
حقول البحث
-

حين تقوم بزيارة صفحة البحث المتقدم لأول مرة، سوف تظهر لك العديد من حقول البحث. في كل حقل يمكنك كتابة الكلمات المفتاحية التي ترغب في البحث عنها، مع إمكانية استخدام معاملات البحث +

حين تقوم بزيارة صفحة البحث المتقدم لأول مرة، سوف تظهر لك العديد من حقول البحث. في كل حقل يمكنك كتابة الكلمات المفتاحية التي ترغب في البحث عنها، مع إمكانية استخدام معاملات البحث .

يكون كل حقل مصحوبا بقائمة منسدلة تتيح لك تحديد الحقل (العنوان، المؤلف، إلخ) التي تود البحث عنها. يمكنك مزج ومطابقة أنواع البحث كيفما تشاء.

يتيح لك إعداد "مطابقة" تحديد كيفية التعامل مع الحقول المتعددة للبحث.

diff --git a/themes/root/templates/HelpTranslations/de/advsearch.phtml b/themes/root/templates/HelpTranslations/de/advsearch.phtml index 7315c61993e..eeae7847eb1 100644 --- a/themes/root/templates/HelpTranslations/de/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/de/advsearch.phtml @@ -10,7 +10,7 @@

Wenn Sie das erste Mal die erweiterte Suche aufrufen, erscheinen verschiedene Suchfelder. In jedem Feld können Sie einen Suchbegriff - eingeben. Folgende Suchoperatoren + eingeben. Folgende Suchoperatoren sind erlaubt.

Jedes Eingabefeld ist mit einem Auswahlmenü versehen, mit welchem Sie das Suchfeld auswählen können (z.B. Titel, Autor). Sie können auch diff --git a/themes/root/templates/HelpTranslations/el/advsearch.phtml b/themes/root/templates/HelpTranslations/el/advsearch.phtml index 0e54ad51beb..4e9cab7f7c8 100644 --- a/themes/root/templates/HelpTranslations/el/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/el/advsearch.phtml @@ -1,14 +1,16 @@ -

Συμβουλές Σύνθετης Αναζήτησης

+

Συμβουλές Σύνθετης Αναζήτησης

+ + +
Πεδία Αναζήτησης

Όταν επισκέπτεστε αρχικά τη σελίδα "Σύνθετη αναζήτηση", σας παρουσιάζονται διάφορα πεδία έρευνας. Σε κάθε πεδίο, μπορείτε να πληκτρολογήσετε τις λέξεις-κλειδιά που - θέλετε να αναζητήσετε. Τελεστές Αναζήτησης + θέλετε να αναζητήσετε. Τελεστές Αναζήτησης επιτρέπονται.

Κάθε πεδίο συνοδεύεται από ένα drop-down menu που σας επιτρέπει να προσδιορίζεται το είδος των δεδομένων (τίτλος, συγγραφέας, κλπ.) που αναζητάτε. Μπορείτε να συνδυάσετε και @@ -21,7 +23,8 @@

Η επιλογή "Προσθήκη Search Field" μπορεί να χρησιμοποιηθεί για να προσθέσετε επιπλέον πεδία αναζήτησης στη φόρμα. Μπορείτε να χρησιμοποιήσετε όσα πεδία αναζήτησης όπως εσείς επιθυμείτε.

-
+
+
Ομάδες Αναζήτησης

Για ορισμένες σύνθετες αναζητήσεις, ένα ενιαίο σύνολο πεδίων έρευνας δεν είναι @@ -45,4 +48,5 @@ "Όλες οι ομάδες".

-
+ + diff --git a/themes/root/templates/HelpTranslations/en/advsearch.phtml b/themes/root/templates/HelpTranslations/en/advsearch.phtml index 6982652734e..64d18992d1e 100644 --- a/themes/root/templates/HelpTranslations/en/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/en/advsearch.phtml @@ -10,7 +10,7 @@

When you first visit the Advanced Search page, you are presented with several search fields. In each field, you can type the keywords you - want to search for. Search operators + want to search for. Search operators are allowed.

Each field is accompanied by a drop-down that lets you specify the type of data (title, author, etc.) you are searching for. You can mix and diff --git a/themes/root/templates/HelpTranslations/es/advsearch.phtml b/themes/root/templates/HelpTranslations/es/advsearch.phtml index 691d515ffb0..d90ce8e98ae 100644 --- a/themes/root/templates/HelpTranslations/es/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/es/advsearch.phtml @@ -9,7 +9,7 @@

Campos de Búsqueda

Visitando la Búsqueda Avanzada por primera vez, aparecen varios campos de búsqueda. - En cada campo puede introducir los términos de búsuqueda. Los Operadores de búsqueda están permitidos. + En cada campo puede introducir los términos de búsuqueda. Los Operadores de búsqueda están permitidos.

Cada campo va acompañado de un listado con el cual se puede especificar el tipo de datos (título, autor, etc.) que está buscando. En búsqueda avanzada puede combinar y ajustar los tipos de búsqueda según desea. diff --git a/themes/root/templates/HelpTranslations/fr/advsearch.phtml b/themes/root/templates/HelpTranslations/fr/advsearch.phtml index 9c1fecd8a4a..1aa65e2bca2 100644 --- a/themes/root/templates/HelpTranslations/fr/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/fr/advsearch.phtml @@ -11,7 +11,7 @@

Lorsque vous visitez la première fois la recherche avancée, plusieures champs de saisie vous sont présentés. Vous pouvez taper dans chaque champ de saisie tous les mots que vous désirez rechercher. Certaines - chaînes de caractères, ou « opérateurs » + chaînes de caractères, ou « opérateurs » , modifient le comportement VuFind.

Chaque champ est accomapgner par un menu déroulant, avec lequel vous diff --git a/themes/root/templates/HelpTranslations/ga/advsearch.phtml b/themes/root/templates/HelpTranslations/ga/advsearch.phtml index ec81dfae900..810398dd578 100644 --- a/themes/root/templates/HelpTranslations/ga/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/ga/advsearch.phtml @@ -9,7 +9,7 @@

Cuardaigh Réimsí
-

Cuirtear roinnt réimsí cuardaigh os do chomhair nuair a théann tú go leathanach an Chuardaigh Chasta. Féadfaidh tú na heochairfhocail atá uait a chlóscríobh i ngach réimse. Ceadaítear Oibreoirí cuardaigh a úsáid

+

Cuirtear roinnt réimsí cuardaigh os do chomhair nuair a théann tú go leathanach an Chuardaigh Chasta. Féadfaidh tú na heochairfhocail atá uait a chlóscríobh i ngach réimse. Ceadaítear Oibreoirí cuardaigh a úsáid

Bíonn roghchlár anuas in éineacht le gach réimse, a chuireann ar do chumas an cineál sonra (teideal, údar, srl.) atá uait a shonrú. Féadfaidh tú na cineálacha éagsúla cuardaigh a úsáid in éineacht le chéile cibé bealach is mian leat.

Cuireann an socrú “Meaitseáil” ar do chumas a shonrú conas ilraonta cuardaigh a láimhseáil.

    diff --git a/themes/root/templates/HelpTranslations/it/advsearch.phtml b/themes/root/templates/HelpTranslations/it/advsearch.phtml index b49c0d04218..8949372d67f 100644 --- a/themes/root/templates/HelpTranslations/it/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/it/advsearch.phtml @@ -10,7 +10,7 @@

    La prima volta che vai alla pagina della ricerca avanzata ti si presentano una serie di campi di ricerca. In ciascuno di questi puoi digitare le parole chiave della ricerca che ti interessa fare. - Puoi utilizzare gli operatori + Puoi utilizzare gli operatori di ricerca.

    Ciascun campo è accompagnato da un menu a tendina che ti permette di specificare il tipo di dato (titolo, autore, etc.) che stai cercando. Puoi combinare la ricerca nel modo che preferisci.

    diff --git a/themes/root/templates/HelpTranslations/ja/advsearch.phtml b/themes/root/templates/HelpTranslations/ja/advsearch.phtml index 6d686286c43..d126fd0e008 100644 --- a/themes/root/templates/HelpTranslations/ja/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/ja/advsearch.phtml @@ -9,7 +9,7 @@
    検索フィールド

    最初に詳細検索を選ぶと画面には3つの検索語入力欄があります。 - 各入力欄に検索する語句を入力します。次の検索演算子が + 各入力欄に検索する語句を入力します。次の検索演算子が 使用できます。

    各検索語の検索対象フィールド（タイトル、著者など）はドロップダウンメニューから 選択できます。

    diff --git a/themes/root/templates/HelpTranslations/pt-br/advsearch.phtml b/themes/root/templates/HelpTranslations/pt-br/advsearch.phtml index fa99282ea07..8fab823b349 100644 --- a/themes/root/templates/HelpTranslations/pt-br/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/pt-br/advsearch.phtml @@ -10,7 +10,7 @@

    A página de Busca Avançada apresenta a vários campos de busca. Em cada campo pode-se digitar termos, a qual deseja buscar itens, relacioando-os a determinado metadado, - podendo fazer uso de operadores de busca + podendo fazer uso de url('help-home')?>?topic=search">operadores de busca

    Pode-se selecionar o tipo de metadado (título, autor, etc.) para cada campo de busca, tornando a busca mais precisa. From 32ed597ed20653a126b291e288916c209ddb1c60 Mon Sep 17 00:00:00 2001 From: Chris Hallberg Date: Wed, 29 Jun 2016 11:20:08 -0400 Subject: [PATCH 11/49] Remove return (false) from ga advsearch help. --- themes/root/templates/HelpTranslations/ga/advsearch.phtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/root/templates/HelpTranslations/ga/advsearch.phtml b/themes/root/templates/HelpTranslations/ga/advsearch.phtml index 810398dd578..cdc5bc7160f 100644 --- a/themes/root/templates/HelpTranslations/ga/advsearch.phtml +++ b/themes/root/templates/HelpTranslations/ga/advsearch.phtml @@ -9,7 +9,7 @@

    Cuardaigh Réimsí
    -

    Cuirtear roinnt réimsí cuardaigh os do chomhair nuair a théann tú go leathanach an Chuardaigh Chasta. Féadfaidh tú na heochairfhocail atá uait a chlóscríobh i ngach réimse. Ceadaítear Oibreoirí cuardaigh a úsáid

    +

    Cuirtear roinnt réimsí cuardaigh os do chomhair nuair a théann tú go leathanach an Chuardaigh Chasta. Féadfaidh tú na heochairfhocail atá uait a chlóscríobh i ngach réimse. Ceadaítear Oibreoirí cuardaigh a úsáid

    Bíonn roghchlár anuas in éineacht le gach réimse, a chuireann ar do chumas an cineál sonra (teideal, údar, srl.) atá uait a shonrú. Féadfaidh tú na cineálacha éagsúla cuardaigh a úsáid in éineacht le chéile cibé bealach is mian leat.

    Cuireann an socrú “Meaitseáil” ar do chumas a shonrú conas ilraonta cuardaigh a láimhseáil.

      @@ -19,7 +19,7 @@

    Is féidir an cnaipe “Cuir Réimse Cuardaigh Leis” a úsáid chun réimsí cuardaigh breise a chur leis an bhfoirm. Féadfaidh tú an oiread réimsí cuardaigh a úsáid agus is mian leat.

    - +
    Grúpaí Cuardaigh

    D’fhéadfadh sé tarlú nach leor tacar amháin réimsí cuardaigh i gcomhair cuardach casta áirithe. Cuir is gcás, mar shampla, dá mba mhian leat leabhair a fháil faoi stair na Síne nó na hIndia. Dá ndéanfá cuardach ‘GACH Téarma’ i gcomhair na Síne, na hIndia, agus na Staire ní bhfaighfeá ach leabhair faoin tSín AGUS faoin India. Dá ndéanfá cuardach AON Téarma gheofá leabhair staire nach raibh baint ar bith acu leis an tSín nó leis an India.

    @@ -31,4 +31,4 @@
  • Déan deimhin de go bhfuil “GACH Grúpa” mar shocrú meaitseála agat ag ceanntásc na nGrúpaí Cuardaigh.
-
\ No newline at end of file + \ No newline at end of file From ec6361411544c93d7e733c18b942760003b1daf2 Mon Sep 17 00:00:00 2001 From: Leila Gonzales Date: Tue, 28 Jun 2016 15:47:16 -0700 Subject: [PATCH 12/49] Update for compatibility with MySQL 5.7+ and PostgreSQL getUniqueResources, getUniqueTags, and getUniqueUsers was failing due to mySQL5.7 compatibility issues. The error being thrown by mySQL was: Expression #1 of SELECT list is not in GROUP BY clause and contains nonaggregated column which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by To fix, we have to either turn off the only_full_group_by option or specifically select the columns that are used instead of selecting *. See: https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html for more info. PostgreSQL was failing due to fields being present in ORDER but missing from GROUP BY. This has also been corrected. --- .../src/VuFind/Db/Table/ResourceTags.php | 84 +++++++++++++++++-- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/module/VuFind/src/VuFind/Db/Table/ResourceTags.php b/module/VuFind/src/VuFind/Db/Table/ResourceTags.php index e42704dadc7..c7c2be073c1 100644 --- a/module/VuFind/src/VuFind/Db/Table/ResourceTags.php +++ b/module/VuFind/src/VuFind/Db/Table/ResourceTags.php @@ -299,6 +299,30 @@ public function getUniqueResources( $userId = null, $resourceId = null, $tagId = null ) { $callback = function ($select) use ($userId, $resourceId, $tagId) { + $select->columns( + [ + 'resource_id' => new Expression( + 'MAX(?)', ['resource_tags.resource_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'tag_id' => new Expression( + 'MAX(?)', ['resource_tags.tag_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'list_id' => new Expression( + 'MAX(?)', ['resource_tags.list_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'user_id' => new Expression( + 'MAX(?)', ['resource_tags.user_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'id' => new Expression( + 'MAX(?)', ['resource_tags.id'], + [Expression::TYPE_IDENTIFIER] + ) + ] + ); $select->join( ['r' => 'resource'], 'resource_tags.resource_id = r.id', @@ -313,8 +337,8 @@ public function getUniqueResources( if (!is_null($tagId)) { $select->where->equalTo('resource_tags.tag_id', $tagId); } - $select->group(["resource_id"]); - $select->order(["title"]); + $select->group(['resource_id', 'title']); + $select->order(['title']); }; return $this->select($callback); } @@ -332,6 +356,30 @@ public function getUniqueTags($userId = null, $resourceId = null, $tagId = null) { $callback = function ($select) use ($userId, $resourceId, $tagId) { + $select->columns( + [ + 'resource_id' => new Expression( + 'MAX(?)', ['resource_tags.resource_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'tag_id' => new Expression( + 'MAX(?)', ['resource_tags.tag_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'list_id' => new Expression( + 'MAX(?)', ['resource_tags.list_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'user_id' => new Expression( + 'MAX(?)', ['resource_tags.user_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'id' => new Expression( + 'MAX(?)', ['resource_tags.id'], + [Expression::TYPE_IDENTIFIER] + ) + ] + ); $select->join( ['t' => 'tags'], 'resource_tags.tag_id = t.id', @@ -346,8 +394,8 @@ public function getUniqueTags($userId = null, $resourceId = null, $tagId = null) if (!is_null($tagId)) { $select->where->equalTo('resource_tags.tag_id', $tagId); } - $select->group(["tag_id"]); - $select->order(["tag"]); + $select->group(['tag_id', 'tag']); + $select->order(['tag']); }; return $this->select($callback); } @@ -364,6 +412,30 @@ public function getUniqueTags($userId = null, $resourceId = null, $tagId = null) public function getUniqueUsers($userId = null, $resourceId = null, $tagId = null) { $callback = function ($select) use ($userId, $resourceId, $tagId) { + $select->columns( + [ + 'resource_id' => new Expression( + 'MAX(?)', ['resource_tags.resource_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'tag_id' => new Expression( + 'MAX(?)', ['resource_tags.tag_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'list_id' => new Expression( + 'MAX(?)', ['resource_tags.list_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'user_id' => new Expression( + 'MAX(?)', ['resource_tags.user_id'], + [Expression::TYPE_IDENTIFIER] + ), + 'id' => new Expression( + 'MAX(?)', ['resource_tags.id'], + [Expression::TYPE_IDENTIFIER] + ) + ] + ); $select->join( ['u' => 'user'], 'resource_tags.user_id = u.id', @@ -378,8 +450,8 @@ public function getUniqueUsers($userId = null, $resourceId = null, $tagId = null if (!is_null($tagId)) { $select->where->equalTo('resource_tags.tag_id', $tagId); } - $select->group(["user_id"]); - $select->order(["username"]); + $select->group(['user_id', 'username']); + $select->order(['username']); }; return $this->select($callback); } From 6981ed40d71e4588f6f245e75b55e8ac394cc273 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Tue, 5 Jul 2016 09:59:34 -0400 Subject: [PATCH 13/49] Cosmetic fixes. --- themes/bootstrap3/templates/admin/tags/list.phtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/bootstrap3/templates/admin/tags/list.phtml b/themes/bootstrap3/templates/admin/tags/list.phtml index dac9f69aa2c..b6eb25e2595 100644 --- a/themes/bootstrap3/templates/admin/tags/list.phtml +++ b/themes/bootstrap3/templates/admin/tags/list.phtml @@ -53,7 +53,8 @@
- +
+ params['user_id']) && !is_null($this->params['user_id'])) || (isset($this->params['tag_id']) && !is_null($this->params['tag_id'])) || (isset($this->params['resource_id']) && !is_null($this->params['resource_id']))):?> translate('clear_tag_filter')?> From 1e3d1dee809b9dda63b36c907fd62e55bfed2cb4 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 6 Jul 2016 08:53:51 -0400 Subject: [PATCH 14/49] Do not create tags when searching for them. - Resolves VUFIND-1191. --- module/VuFind/src/VuFind/Search/Tags/Results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/VuFind/src/VuFind/Search/Tags/Results.php b/module/VuFind/src/VuFind/Search/Tags/Results.php index abcd59608fa..fd69d91e2d6 100644 --- a/module/VuFind/src/VuFind/Search/Tags/Results.php +++ b/module/VuFind/src/VuFind/Search/Tags/Results.php @@ -48,7 +48,7 @@ class Results extends BaseResults protected function performSearch() { $table = $this->getTable('Tags'); - $tag = $table->getByText($this->getParams()->getDisplayQuery()); + $tag = $table->getByText($this->getParams()->getDisplayQuery(), false); if (!empty($tag)) { $rawResults = $tag->getResources(null, $this->getParams()->getSort()); } else { From 0669b9b648fd0389d6c9590c5a16306635133ebc Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 6 Jul 2016 12:25:01 -0400 Subject: [PATCH 15/49] Removed inappropriate backticks. - Resolves VUFIND-1192. --- .../pgsql/3.0/003-add-record-table.sql | 4 ++-- module/VuFind/sql/pgsql.sql | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql b/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql index 92cf3273944..8d13fb78107 100644 --- a/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql +++ b/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql @@ -1,8 +1,8 @@ -- --- Table structure for table `record` +-- Table structure for table record -- -CREATE TABLE `record` ( +CREATE TABLE record ( id serial NOT NULL, record_id varchar(255), source varchar(50), diff --git a/module/VuFind/sql/pgsql.sql b/module/VuFind/sql/pgsql.sql index 1b54218b220..36febdd3daa 100644 --- a/module/VuFind/sql/pgsql.sql +++ b/module/VuFind/sql/pgsql.sql @@ -175,7 +175,7 @@ UNIQUE (session_id) CREATE INDEX last_used_idx on session(last_used); -- --- Table structure for table `change_tracker` +-- Table structure for table change_tracker -- DROP TABLE IF EXISTS "change_tracker"; @@ -192,7 +192,7 @@ PRIMARY KEY (core, id) CREATE INDEX change_tracker_deleted_idx on change_tracker(deleted); -- --- Table structure for table `oai_resumption` +-- Table structure for table oai_resumption -- DROP TABLE IF EXISTS "oai_resumption"; @@ -211,7 +211,7 @@ PRIMARY KEY (id) -- -- --- Table structure for table `statistics` +-- Table structure for table statistics -- DROP TABLE IF EXISTS "user_stats_fields"; @@ -226,7 +226,7 @@ PRIMARY KEY (id, field) -- -------------------------------------------------------- -- --- Table structure for table `user_stats` +-- Table structure for table user_stats -- DROP TABLE IF EXISTS "user_stats"; @@ -246,12 +246,12 @@ PRIMARY KEY (id) -- -------------------------------------------------------- -- --- Table structure for table `record` +-- Table structure for table record -- DROP TABLE IF EXISTS "record"; -CREATE TABLE `record` ( +CREATE TABLE record ( id serial NOT NULL, record_id varchar(255), source varchar(50), @@ -265,12 +265,12 @@ CREATE TABLE `record` ( -- -------------------------------------------------------- -- --- Table structure for table `user_card` +-- Table structure for table user_card -- DROP TABLE IF EXISTS "user_card"; -CREATE TABLE `user_card` ( +CREATE TABLE user_card ( id SERIAL, user_id int NOT NULL, card_name varchar(255) NOT NULL DEFAULT '', From dca431d602eca66163dc301fc1af0eb5cefce4f0 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 6 Jul 2016 12:28:38 -0400 Subject: [PATCH 16/49] Added missing table drops for consistency. --- module/VuFind/sql/pgsql.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/module/VuFind/sql/pgsql.sql b/module/VuFind/sql/pgsql.sql index 36febdd3daa..94b949066dd 100644 --- a/module/VuFind/sql/pgsql.sql +++ b/module/VuFind/sql/pgsql.sql @@ -22,6 +22,8 @@ CREATE INDEX comments_resource_id_idx ON comments (resource_id); -- Table structure for table resource -- +DROP TABLE IF EXISTS "resource"; + CREATE TABLE resource ( id SERIAL, record_id varchar(255) NOT NULL DEFAULT '', @@ -40,6 +42,8 @@ CREATE INDEX resource_record_id_idx ON resource (record_id); -- Table structure for table resource_tags -- +DROP TABLE IF EXISTS "resource_tags"; + CREATE TABLE resource_tags ( id SERIAL, resource_id int NOT NULL DEFAULT '0', @@ -61,6 +65,8 @@ CREATE INDEX resource_tags_list_id_idx ON resource_tags (list_id); -- Table structure for table search. Than fixed created column default value. Old value is 0000-00-00. -- +DROP TABLE IF EXISTS "search"; + CREATE TABLE search ( id SERIAL, user_id int NOT NULL DEFAULT '0', @@ -84,6 +90,8 @@ CREATE INDEX session_id_idx ON search (session_id); -- Table structure for table tags -- +DROP TABLE IF EXISTS "tags"; + CREATE TABLE tags ( id SERIAL, tag varchar(64) NOT NULL DEFAULT '', @@ -96,6 +104,8 @@ PRIMARY KEY (id) -- Table structure for table user -- +DROP TABLE IF EXISTS "user"; + CREATE TABLE "user"( id SERIAL, username varchar(255) NOT NULL DEFAULT '', @@ -123,6 +133,8 @@ UNIQUE (username) -- Table structure for table user_list -- +DROP TABLE IF EXISTS "user_list"; + CREATE TABLE user_list ( id SERIAL, user_id int NOT NULL, @@ -141,6 +153,8 @@ CREATE INDEX user_list_user_id_idx ON user_list (user_id); -- Table structure for table user_resource -- +DROP TABLE IF EXISTS "user_resource"; + CREATE TABLE user_resource ( id SERIAL, user_id int NOT NULL, From 94c53cd17eb8aed7aff149ab51e3f90b2b23aa9d Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Thu, 7 Jul 2016 08:36:56 +0200 Subject: [PATCH 17/49] Korrektur Klassifikation jus --- local/languages/drsys/fr.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/languages/drsys/fr.ini b/local/languages/drsys/fr.ini index 2c2f4d740f1..4633adeb465 100644 --- a/local/languages/drsys/fr.ini +++ b/local/languages/drsys/fr.ini @@ -252,7 +252,7 @@ navDrsys_E = "Droits anciens et droits religieux" 91.3 = "Peine de mort" 91.4 = "Grâce. Amnistie. Réhabilitation" 91.5 = "Resocialisation. Traitement post-pénitentiaire" -92 = "Délinquance juvénile" +92 = "Droit pénal des mineurs" 92.1 = "Organisation judiciaire. Procédure" 92.2 = "Peines et mesures" 93 = "Droit pénal administratif " From e44a0fc12d83a6105014456e9cd364f210616414 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Thu, 7 Jul 2016 09:16:22 +0200 Subject: [PATCH 18/49] =?UTF-8?q?Unterdr=C3=BCckung=20Abholorte=20f=C3=BCr?= =?UTF-8?q?=20Sommerschliesszeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/sbvfrdmulti/templates/record/hold.phtml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/themes/sbvfrdmulti/templates/record/hold.phtml b/themes/sbvfrdmulti/templates/record/hold.phtml index 095eb4e1503..8e8f9ceedd1 100644 --- a/themes/sbvfrdmulti/templates/record/hold.phtml +++ b/themes/sbvfrdmulti/templates/record/hold.phtml @@ -21,9 +21,18 @@ $today = strtotime('now'); $unsetPickup[] = 'POPA'; // unterdrückt Pickup locations während Schliesszeiten -if ($today > strtotime('2016-05-23') && $today < strtotime('2016-05-30')): - $unsetPickup[] = 'UBZB'; - $unsetPickup[] = 'UBKRA'; +if ($today > strtotime('2016-08-19') && $today < strtotime('2016-09-17')): + $unsetPickup[] = 'A125'; + $unsetPickup[] = 'UBWWZ'; +endif; +if ($today > strtotime('2016-07-15') && $today < strtotime('2016-07-28')): + $unsetPickup[] = 'A296'; +endif; +if ($today > strtotime('2016-08-12') && $today < strtotime('2016-08-28')): + $unsetPickup[] = 'A300'; +endif; +if ($today > strtotime('2016-07-08') && $today < strtotime('2016-08-08')): + $unsetPickup[] = 'A342'; endif; ?> From 781406366848d37a859422fec5869fdc6b5cdee1 Mon Sep 17 00:00:00 2001 From: edelm Date: Fri, 8 Jul 2016 17:48:07 +0200 Subject: [PATCH 19/49] fixes #439 --- .../templates/RecordDriver/AbstractBase/export-bibtex.phtml | 6 +++--- .../RecordDriver/AbstractBase/export-endnote.phtml | 6 +++--- .../RecordDriver/AbstractBase/export-endnoteweb.phtml | 6 +++--- .../RecordDriver/AbstractBase/export-refworks.phtml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-bibtex.phtml b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-bibtex.phtml index 69bd54c844f..b5c9dcfef7e 100644 --- a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-bibtex.phtml +++ b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-bibtex.phtml @@ -77,11 +77,11 @@ if (is_array($series)) { $authors = $this->driver->tryMethod('getDeduplicatedAuthors'); if (is_array($authors)) { if (!empty($authors['main'])) - echo "author = {{$authors['main']}},\n"; + echo "author = {" . key($authors['main']) . "},\n"; if (!empty($authors['corporate'])) - echo "author = {{$authors['corporate']}},\n"; + echo "author = {" . key($authors['corporate']) . "},\n"; if (is_array($authors['secondary']) && !empty($authors['secondary'])) { - foreach ($authors['secondary'] as $current) { + foreach ($authors['secondary'] as $current => $currentVal) { echo "editor = {{$current}},\n"; } } diff --git a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnote.phtml b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnote.phtml index 5c798fe86fe..aa64a4c1ece 100644 --- a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnote.phtml +++ b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnote.phtml @@ -13,11 +13,11 @@ if (is_array($formats) && !empty($formats)) { $authors = $this->driver->tryMethod('getDeduplicatedAuthors'); if (is_array($authors)) { if (!empty($authors['main'])) - echo "%A {$authors['main']}\n"; + echo "%A " . key($authors['main']) . "\n"; if (!empty($authors['corporate'])) - echo "%A {$authors['corporate']}\n"; + echo "%A " . key($authors['corporate']) . "\n"; if (is_array($authors['secondary']) && !empty($authors['secondary'])) { - foreach ($authors['secondary'] as $current) { + foreach ($authors['secondary'] as $current => $currentVal) { echo "%E $current\n"; } } diff --git a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml index f8fd71e7448..bf0527c1d79 100644 --- a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml +++ b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml @@ -70,11 +70,11 @@ if (!empty($journalTitle)) { $authors = $this->driver->tryMethod('getDeduplicatedAuthors'); if (is_array($authors)) { if (!empty($authors['main'])) - echo "A1 - {$authors['main']}\n"; + echo "A1 - " . key($authors['main']) . "\n"; if (!empty($authors['corporate'])) - echo "A1 - {$authors['corporate']}\n"; + echo "A1 - " . key($authors['corporate']) . "\n"; if (is_array($authors['secondary']) && !empty($authors['secondary'])) { - foreach ($authors['secondary'] as $current) { + foreach ($authors['secondary'] as $current => $currentVal) { echo "A2 - $current\n"; } } diff --git a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-refworks.phtml b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-refworks.phtml index 5543d057b40..a49f3ef6140 100644 --- a/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-refworks.phtml +++ b/themes/sbvfrd/templates/RecordDriver/AbstractBase/export-refworks.phtml @@ -54,11 +54,11 @@ if (!empty($journalTitle)) { $authors = $this->driver->tryMethod('getDeduplicatedAuthors'); if (is_array($authors)) { if (!empty($authors['main'])) - echo "A1 {$authors['main']}\n"; + echo "A1 " . key($authors['main']) . "\n"; if (!empty($authors['corporate'])) - echo "A1 {$authors['corporate']}\n"; + echo "A1 " . key($authors['corporate']) . "\n"; if (is_array($authors['secondary']) && !empty($authors['secondary'])) { - foreach ($authors['secondary'] as $current) { + foreach ($authors['secondary'] as $current => $currentVal) { echo "A2 $current\n"; } } From cbabf4975237e282646640ceb737412018fc900e Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 11 Jul 2016 10:03:24 +0200 Subject: [PATCH 20/49] fixes #245 --- themes/sbvfrd/less/sbvfrd_xs.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/themes/sbvfrd/less/sbvfrd_xs.less b/themes/sbvfrd/less/sbvfrd_xs.less index be097de8726..94769f58771 100644 --- a/themes/sbvfrd/less/sbvfrd_xs.less +++ b/themes/sbvfrd/less/sbvfrd_xs.less @@ -163,6 +163,8 @@ ul.dropdown-menu { width: 200%; + right: 0; + left: auto; & > li { & > a { overflow-x: hidden; From 1688819e539d97b317f3f8491665c006093ccab6 Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 11 Jul 2016 18:14:11 +0200 Subject: [PATCH 21/49] #432, use sbvfrd-theme sidebar in advancedsearch --- .../templates/search/advanced/layout.phtml | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/themes/sbvfrdjus/templates/search/advanced/layout.phtml b/themes/sbvfrdjus/templates/search/advanced/layout.phtml index 8d3c3ae5910..544cb840ed9 100644 --- a/themes/sbvfrdjus/templates/search/advanced/layout.phtml +++ b/themes/sbvfrdjus/templates/search/advanced/layout.phtml @@ -65,29 +65,4 @@ render('search/advanced/' . lcfirst($activeTab)) ?>
-
- - - - -

transEsc("adv_search_filters")?>

-
    - -
- $data): ?> -
    -
  • transEsc($field)?>
    • - - - -
- - -
-

transEsc("Search Tips")?>

- -
-
\ No newline at end of file +render('search/advanced/sidebar') ?> From 2fb44c75f676cb51fd4cb7a094383d48272dac05 Mon Sep 17 00:00:00 2001 From: edelm Date: Tue, 12 Jul 2016 17:53:34 +0200 Subject: [PATCH 22/49] =?UTF-8?q?httpd-conf=20f=C3=BCr=20c2sb=5Fci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- local/httpd-vufind-c2sb_ci.conf | 64 +++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 local/httpd-vufind-c2sb_ci.conf diff --git a/local/httpd-vufind-c2sb_ci.conf b/local/httpd-vufind-c2sb_ci.conf new file mode 100644 index 00000000000..04183a988ff --- /dev/null +++ b/local/httpd-vufind-c2sb_ci.conf @@ -0,0 +1,64 @@ +# Configuration for theme-specific resources: +AliasMatch ^/c2sb_ci/themes/([0-9a-zA-Z-_]*)/css/(.*)$ /usr/local/vufind/httpd/themes/$1/css/$2 +AliasMatch ^/c2sb_ci/themes/([0-9a-zA-Z-_]*)/images/(.*)$ /usr/local/vufind/httpd/themes/$1/images/$2 +AliasMatch ^/c2sb_ci/themes/([0-9a-zA-Z-_]*)/js/(.*)$ /usr/local/vufind/httpd/themes/$1/js/$2 + + + Order allow,deny + Allow from all + + + Require all granted + + AllowOverride All + + +# Configuration for general VuFind base: +Alias /c2sb_ci /usr/local/vufind/c2sb_ci/public + + + Order allow,deny + Allow from all + + + Require all granted + + AllowOverride All + + # Uncomment the following lines, if you wish to use the Shibboleth authentication + #AuthType shibboleth + #require shibboleth + + RewriteEngine On + RewriteBase /c2sb_ci + + # If using VuDL, uncomment the following line, fill in your appropriate Fedora + # server and port, and make sure that Apache mod_proxy and mod_proxy_http are + # enabled. + #RewriteRule ^files/(.*)/(.*) http://your-fedora-server/fedora/objects/$1/datastreams/$2/content [P] + + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] + + php_value short_open_tag On + + # Uncomment this line to put VuFind into development mode in order to see more detailed messages: + SetEnv VUFIND_ENV development + + # Uncomment this line if you want to use the XHProf profiler; this is a developer-oriented option + # that most users will not need. Make sure the XHProf PHP libraries are available on your include + # path. See http://vufind.org/jira/browse/VUFIND-419 for more details. + #SetEnv VUFIND_PROFILER_XHPROF http://url/to/your/xhprof/web/interface + + # This line points to the local override directory where you should place your customized files + # to override VuFind core features/settings. Set to blank string ("") to disable. + SetEnv VUFIND_LOCAL_DIR /usr/local/vufind/httpd/local + + # This line specifies additional Zend Framework 2 modules to load after the standard VuFind module. + # Multiple modules may be specified separated by commas. This mechanism can be used to override + # core VuFind functionality without modifying core code. + SetEnv VUFIND_LOCAL_MODULES Swissbib,Jusbib,QRCode,Libadmin + From a11d4f876566f331e1210c39ce31e3fff9e4a6f5 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 13 Jul 2016 09:37:14 -0400 Subject: [PATCH 23/49] Fixed configuration file -- wrongly inserted section --- config/vufind/config.ini | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/config/vufind/config.ini b/config/vufind/config.ini index dfbcc0f2cbf..232707e7b35 100644 --- a/config/vufind/config.ini +++ b/config/vufind/config.ini @@ -674,7 +674,36 @@ authors = Wikipedia ; You can select from Google, OpenLibrary, HathiTrust. You should consult ; http://code.google.com/apis/books/branding.html before using Google Book Search. -; previews = Google,OpenLibrary,HathiTrust +;previews = Google,OpenLibrary,HathiTrust + +; Possible HathiRights options = pd,ic,op,orph,und,umall,ic-world,nobody,pdus,cc-by,cc-by-nd, +; cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,orphcand,cc-zero,und-world,icus +; Default is "pd,ic-world" if unset here. +; See www.hathitrust.org/rights_database#Attributes for full details +;HathiRights = pd,ic-world,cc-by,cc-by-nd,cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,cc-zero,und-world + +; Possible GoogleBooks options full,partial,noview +; options can be set for each / either of link or tab +; Link makes a button appear in search results / record view +; Tab makes a tab with an embedded preview appear on record view +; Default is "GoogleOptions['link'] = full,partial" if nothing +; is set here. +; see https://developers.google.com/books/docs/dynamic-links#json-results-format +;GoogleOptions['link'] = full,partial +;GoogleOptions['tab'] = partial + +; OpenLibrary currently offers the same options/default as GoogleBooks (above): +;OpenLibraryOptions = full,partial + +; An API key is needed to interact with the Europeana API (see the EuropeanaResults +; recommendation module in searches.ini for more information) +;europeanaAPI = INSERTKEY + +; If this is set, a new map tab will show on the record page for records which +; have long_lat data (see import/marc_local.properties for more information). +; The setting specifies the type of map; currently, the only supported value is +; "google" +;recordMap = google ; This section controls the behavior of the cover generator when makeDynamicCovers ; above is non-false. @@ -746,35 +775,6 @@ authors = Wikipedia ;bottomPadding = 3 ;wrapWidth = 110 -; Possible HathiRights options = pd,ic,op,orph,und,umall,ic-world,nobody,pdus,cc-by,cc-by-nd, -; cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,orphcand,cc-zero,und-world,icus -; Default is "pd,ic-world" if unset here. -; See www.hathitrust.org/rights_database#Attributes for full details -;HathiRights = pd,ic-world,cc-by,cc-by-nd,cc-by-nc-nd,cc-by-nc,cc-by-nc-sa,cc-by-sa,cc-zero,und-world - -; Possible GoogleBooks options full,partial,noview -; options can be set for each / either of link or tab -; Link makes a button appear in search results / record view -; Tab makes a tab with an embedded preview appear on record view -; Default is "GoogleOptions['link'] = full,partial" if nothing -; is set here. -; see https://developers.google.com/books/docs/dynamic-links#json-results-format -;GoogleOptions['link'] = full,partial -;GoogleOptions['tab'] = partial - -; OpenLibrary currently offers the same options/default as GoogleBooks (above): -;OpenLibraryOptions = full,partial - -; An API key is needed to interact with the Europeana API (see the EuropeanaResults -; recommendation module in searches.ini for more information) -;europeanaAPI = INSERTKEY - -; If this is set, a new map tab will show on the record page for records which -; have long_lat data (see import/marc_local.properties for more information). -; The setting specifies the type of map; currently, the only supported value is -; "google" -;recordMap = google - ; This section is needed for Buchhandel.de cover loading. You need an authentication ; token. It may also be necessary to customize your templates in order to comply with ; terms of service; please look at http://info.buchhandel.de/handbuch_links for From c51b780566d004d802dc8855d2eb21b1fafa8ce3 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 13 Jul 2016 10:06:54 -0400 Subject: [PATCH 24/49] php-cs-fixer --- module/VuFind/src/VuFind/ILS/Driver/DAIA.php | 2 +- .../VuFind/src/VuFind/ILS/Driver/Unicorn.php | 2 +- .../VuFind/src/VuFind/ILS/Driver/Virtua.php | 28 +++++++++---------- module/VuFind/src/VuFind/Service/Factory.php | 2 +- .../Controller/DevtoolsController.php | 2 +- .../src/VuFindDevTools/LanguageHelper.php | 2 +- .../src/VuFindTheme/LessCompiler.php | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php index 6dbdd76f062..f76e8347192 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php +++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php @@ -362,7 +362,7 @@ protected function doHTTPRequest($id) { $http_headers = [ 'Content-type: ' . $this->contentTypesRequest[$this->daiaResponseFormat], - 'Accept: ' . $this->contentTypesRequest[$this->daiaResponseFormat], + 'Accept: ' . $this->contentTypesRequest[$this->daiaResponseFormat], ]; $params = [ diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php index 139f90a4878..429f40e4f35 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php @@ -322,7 +322,7 @@ public function getStatus($id) $cmp = create_function( '$a,$b', 'if ($a["shelving_key"] == $b["shelving_key"]) ' - . 'return $a["number"] - $b["number"];' + . 'return $a["number"] - $b["number"];' . 'return $a["shelving_key"] < $b["shelving_key"] ? 1 : -1;' ); usort($items, $cmp); diff --git a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php index 2b957a8c4a8..ec816b65964 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php @@ -1764,24 +1764,24 @@ public function renewMyItems($renewDetails) // Have to use raw post data because of the way // virtua expects the barcodes to come across. - $post_data = "function=" . "RENEWAL"; - $post_data .= "&search=" . "PATRON"; - $post_data .= "&sessionid=" . "$session_id"; - $post_data .= "&skin=" . "homepage"; - $post_data .= "&lng=" . $this->getConfiguredLanguage(); - $post_data .= "&inst=" . "consortium"; - $post_data .= "&conf=" . urlencode("./chameleon.conf"); - $post_data .= "&u1=" . "12"; + $post_data = "function=" . "RENEWAL"; + $post_data .= "&search=" . "PATRON"; + $post_data .= "&sessionid=" . "$session_id"; + $post_data .= "&skin=" . "homepage"; + $post_data .= "&lng=" . $this->getConfiguredLanguage(); + $post_data .= "&inst=" . "consortium"; + $post_data .= "&conf=" . urlencode("./chameleon.conf"); + $post_data .= "&u1=" . "12"; $post_data .= "&SourceScreen=" . "PATRONACTIVITY"; - $post_data .= "&pos=" . "1"; - $post_data .= "&patronid=" . $patron['cat_username']; + $post_data .= "&pos=" . "1"; + $post_data .= "&patronid=" . $patron['cat_username']; $post_data .= "&patronhost=" . urlencode($this->config['Catalog']['patron_host']); $post_data .= "&host=" . urlencode($this->config['Catalog']['host_string']); - $post_data .= "&itembarcode=" . implode("&itembarcode=", $item_list); - $post_data .= "&submit=" . "Renew"; - $post_data .= "&reset=" . "Clear"; + $post_data .= "&itembarcode=" . implode("&itembarcode=", $item_list); + $post_data .= "&submit=" . "Renew"; + $post_data .= "&reset=" . "Clear"; $result = $this->httpRequest($virtua_url, null, $post_data); @@ -1832,7 +1832,7 @@ public function getSuppressedAuthorityRecords() } foreach ($result as $row) { - $list[] = 'vtls' . str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT); + $list[] = 'vtls' . str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT); } return $list; } diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php index dd7ca59983f..13ad96c8f66 100644 --- a/module/VuFind/src/VuFind/Service/Factory.php +++ b/module/VuFind/src/VuFind/Service/Factory.php @@ -859,7 +859,7 @@ public static function getTranslator(ServiceManager $sm) // Set up the ExtendedIni plugin: $config = $sm->get('VuFind\Config')->get('config'); $pathStack = [ - APPLICATION_PATH . '/languages', + APPLICATION_PATH . '/languages', LOCAL_OVERRIDE_DIR . '/languages' ]; $fallbackLocales = $config->Site->language == 'en' diff --git a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php index 3003ae5c32c..752bb3eb3a1 100644 --- a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php +++ b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php @@ -89,7 +89,7 @@ public function deminifyAction() public function languageAction() { // Test languages with no local overrides and no fallback: - $loader = new ExtendedIni([APPLICATION_PATH . '/languages']); + $loader = new ExtendedIni([APPLICATION_PATH . '/languages']); $helper = new LanguageHelper($loader, $this->getConfig()); return $helper->getAllDetails($this->params()->fromQuery('main', 'en')); } diff --git a/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php b/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php index 222b746d9c5..6628e741680 100644 --- a/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php +++ b/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php @@ -178,7 +178,7 @@ protected function getTextDomains() { static $domains = false; if (!$domains) { - $base = APPLICATION_PATH . '/languages'; + $base = APPLICATION_PATH . '/languages'; $dir = opendir($base); $domains = []; while ($current = readdir($dir)) { diff --git a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php index cdcd2ba2b99..17c4b3830cd 100644 --- a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php +++ b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php @@ -181,7 +181,7 @@ protected function compileFile($theme, $less) list($fileName, ) = explode('.', $less); $finalFile = $finalOutDir . $fileName . '.css'; - $this->logMessage("\tcompiling '" . $less . "' into '" . $finalFile . "'"); + $this->logMessage("\tcompiling '" . $less . "' into '" . $finalFile . "'"); $start = microtime(true); $directories = []; From e778d0a9303d4679958b7500da79d80d3eeed748 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Thu, 14 Jul 2016 08:39:21 +0200 Subject: [PATCH 25/49] =?UTF-8?q?Behalte=20Filtereinstellungen=20als=20def?= =?UTF-8?q?ault=20*Absprache=20mit=20AG=20sbBB,=2013.7.16=20*erm=C3=B6glic?= =?UTF-8?q?ht=20Einstieg=20=C3=BCber=20externe=20Suchboxen=20und=20weitere?= =?UTF-8?q?=20Suche=20mit=20den=20dort=20vordefinierten=20Filtern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- local/config/vufind/Summon.ini | 2 +- local/config/vufind/searches.ini | 2 +- local/config/vufind/searches_jusbib.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/local/config/vufind/Summon.ini b/local/config/vufind/Summon.ini index c4c967dee29..c589a2ddaa9 100644 --- a/local/config/vufind/Summon.ini +++ b/local/config/vufind/Summon.ini @@ -40,7 +40,7 @@ snippets = true ; When you filter a search using facets, VuFind will present a checkbox that can ; be used to apply those filters to the next search you perform. This setting ; controls its default state: on (true) or off (false). -retain_filters_by_default = false +retain_filters_by_default = true ; Summon has a fixed cap on how many results you can page through. Even though ; it may report more results than this number, you can't actually access results diff --git a/local/config/vufind/searches.ini b/local/config/vufind/searches.ini index 6f2c952cdd1..71c1e83a82d 100644 --- a/local/config/vufind/searches.ini +++ b/local/config/vufind/searches.ini @@ -6,7 +6,7 @@ override_full_sections = Sorting,RSS,Basic_Searches,Advanced_Searches,Autocomple limit_options = 5,10,20,40,60,80,100 default_limit = 20 multiValuedFRBRField = false -retain_filters_by_default = false +retain_filters_by_default = true result_limit = 20000 [Sorting] diff --git a/local/config/vufind/searches_jusbib.ini b/local/config/vufind/searches_jusbib.ini index 4ca4fef59de..c5c397cda24 100644 --- a/local/config/vufind/searches_jusbib.ini +++ b/local/config/vufind/searches_jusbib.ini @@ -7,7 +7,7 @@ default_sort = publishDateSort desc limit_options = 5,10,20,40,60,80,100 default_limit = 20 multiValuedFRBRField = false -retain_filters_by_default = false +retain_filters_by_default = true [Sorting] relevance = sort.relevance From cb41b19bcb7f8baa5788e617db341cdf8eb66e16 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Thu, 14 Jul 2016 09:04:13 +0200 Subject: [PATCH 26/49] Textfeld im Kontaktformular als Pflichtfeld definiert *Absprache mit AG sbBB, 13.7.2016 --- module/Swissbib/src/Swissbib/Feedback/Form/FeedbackForm.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/Swissbib/src/Swissbib/Feedback/Form/FeedbackForm.php b/module/Swissbib/src/Swissbib/Feedback/Form/FeedbackForm.php index f88795c3292..9121439fb9c 100644 --- a/module/Swissbib/src/Swissbib/Feedback/Form/FeedbackForm.php +++ b/module/Swissbib/src/Swissbib/Feedback/Form/FeedbackForm.php @@ -71,6 +71,7 @@ class FeedbackForm * * @Annotation\Name("question") * @Annotation\Options({"label":"feedback.form.question"}) + * @Annotation\Required(true) * @Annotation\Attributes({"type":"textarea"}) */ public $question; From c70846e65210c033d615b251a111c51f825f4b03 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Thu, 14 Jul 2016 15:18:11 +0200 Subject: [PATCH 27/49] Korrektur Sommerschliesszeiten --- themes/sbvfrdmulti/templates/record/hold.phtml | 3 --- 1 file changed, 3 deletions(-) diff --git a/themes/sbvfrdmulti/templates/record/hold.phtml b/themes/sbvfrdmulti/templates/record/hold.phtml index 8e8f9ceedd1..c1aca6dd980 100644 --- a/themes/sbvfrdmulti/templates/record/hold.phtml +++ b/themes/sbvfrdmulti/templates/record/hold.phtml @@ -31,9 +31,6 @@ endif; if ($today > strtotime('2016-08-12') && $today < strtotime('2016-08-28')): $unsetPickup[] = 'A300'; endif; -if ($today > strtotime('2016-07-08') && $today < strtotime('2016-08-08')): - $unsetPickup[] = 'A342'; -endif; ?>

transEsc('request_place_text')?>

From ce009c97614d4f3f137753c9a294ce5f48b05fda Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 18 Jul 2016 15:25:25 +0200 Subject: [PATCH 28/49] #432 show usedfilters in side bar in all themes and adjust checkbox-positioning. --- themes/sbvfrd/less/sbvfrd.less | 2 +- .../templates/search/advanced/layout.phtml | 27 ++++++++++++++++++- .../templates/search/advanced/sidebar.phtml | 26 ------------------ .../templates/search/advanced/layout.phtml | 27 ++++++++++++++++++- 4 files changed, 53 insertions(+), 29 deletions(-) delete mode 100644 themes/sbvfrd/templates/search/advanced/sidebar.phtml diff --git a/themes/sbvfrd/less/sbvfrd.less b/themes/sbvfrd/less/sbvfrd.less index 4e7b4738acf..5cfde7b1544 100644 --- a/themes/sbvfrd/less/sbvfrd.less +++ b/themes/sbvfrd/less/sbvfrd.less @@ -676,7 +676,7 @@ ul[aria-labelledby=dropdownLibraries] { text-overflow: ellipsis; overflow: hidden; border: 1px solid #CCC; - padding-left: 8px; + //padding-left: 8px; padding-right: 8px; } .list-group-item.title { diff --git a/themes/sbvfrd/templates/search/advanced/layout.phtml b/themes/sbvfrd/templates/search/advanced/layout.phtml index 1b3d5a604e6..db915677f1c 100644 --- a/themes/sbvfrd/templates/search/advanced/layout.phtml +++ b/themes/sbvfrd/templates/search/advanced/layout.phtml @@ -103,4 +103,29 @@ -render('search/advanced/sidebar') ?> +
+ + + + +

transEsc("adv_search_filters")?>

+
+ +
+ $data): ?> +
+
transEsc($field)?>
+ + + +
+ + +
+

transEsc('Search Tips')?>

+
+ transEsc("Help with Advanced Search")?> + transEsc("Help with Search Operators")?> +
+
+
\ No newline at end of file diff --git a/themes/sbvfrd/templates/search/advanced/sidebar.phtml b/themes/sbvfrd/templates/search/advanced/sidebar.phtml deleted file mode 100644 index 72c4dc2e46f..00000000000 --- a/themes/sbvfrd/templates/search/advanced/sidebar.phtml +++ /dev/null @@ -1,26 +0,0 @@ -
- - - - -

transEsc("adv_search_filters")?>

-
    - -
- $data): ?> -
    -
  • transEsc($field)?>
    • - - - -
- - -
-

transEsc('Search Tips')?>

- -
-
\ No newline at end of file diff --git a/themes/sbvfrdjus/templates/search/advanced/layout.phtml b/themes/sbvfrdjus/templates/search/advanced/layout.phtml index 544cb840ed9..193df34d6d6 100644 --- a/themes/sbvfrdjus/templates/search/advanced/layout.phtml +++ b/themes/sbvfrdjus/templates/search/advanced/layout.phtml @@ -65,4 +65,29 @@ render('search/advanced/' . lcfirst($activeTab)) ?> -render('search/advanced/sidebar') ?> +
+ + + + +

transEsc("adv_search_filters")?>

+
+ +
+ $data): ?> +
+
transEsc($field)?>
+ + + +
+ + +
+

transEsc("Search Tips")?>

+
+ transEsc("Help with Advanced Search")?> + transEsc("Help with Search Operators")?> +
+
+
\ No newline at end of file From 2f5cfbfce2cd0338e5dd7842089a6235e188571c Mon Sep 17 00:00:00 2001 From: edelm Date: Tue, 19 Jul 2016 16:38:09 +0200 Subject: [PATCH 29/49] Amazon composer version adjustment due to packagist error (analog vufind core). --- composer.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 083b6976e48..b42a251fc66 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ "license": "GPL-2.0", "repositories": [ { - "type": "composer", - "url": "https://packages.zendframework.com/" + "type": "vcs", + "url": "https://github.com/zendframework/zendservice_amazon" } ], "require": { @@ -26,8 +26,9 @@ "pear/validate_ispn": "dev-master", "serialssolutions/summon": "1.0.0", "symfony/yaml": "2.7.6", - "vufind-org/vufindcode": "1.0.2", - "vufind-org/vufindhttp": "2.0.0", + "vufind-org/vufindcode": "1.0.3", + "vufind-org/vufindharvest": "2.1.0", + "vufind-org/vufindhttp": "2.1.0", "zendframework/zendframework": "2.4.6", "zendframework/zendrest": "2.0.2", "zendframework/zendservice-amazon": "2.0.4", @@ -36,6 +37,11 @@ "require-dev": { "behat/mink": "1.7.0", "behat/mink-selenium2-driver": "1.3.0", - "behat/mink-zombie-driver": "1.3.0" + "friendsofphp/php-cs-fixer": "1.11.5", + "phploc/phploc": "2.0.6", + "phpmd/phpmd": "1.5.0", + "phpunit/phpunit": "4.8.4", + "sebastian/phpcpd": "2.0.0", + "squizlabs/php_codesniffer": "2.6.0" } } From cbe7b7537e386f20634b6f7b341b2130bb00cae4 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Tue, 19 Jul 2016 15:11:15 -0400 Subject: [PATCH 30/49] Avoid encoding problems in stripArticles(). --- module/VuFind/src/VuFind/XSLT/Import/VuFind.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/VuFind/src/VuFind/XSLT/Import/VuFind.php b/module/VuFind/src/VuFind/XSLT/Import/VuFind.php index 2a507eaed2c..4862649f466 100644 --- a/module/VuFind/src/VuFind/XSLT/Import/VuFind.php +++ b/module/VuFind/src/VuFind/XSLT/Import/VuFind.php @@ -366,7 +366,9 @@ public static function stripArticles($in) { static $articles = ['a', 'an', 'the']; - $text = strtolower(trim($in)); + $text = is_callable('mb_strtolower') + ? mb_strtolower(trim($in), 'UTF-8') + : strtolower(trim($in)); foreach ($articles as $a) { if (substr($text, 0, strlen($a) + 1) == ($a . ' ')) { From e75d724f7400021d2722951ea86b31d38ff34b07 Mon Sep 17 00:00:00 2001 From: Chris Hallberg Date: Mon, 18 Jul 2016 13:23:59 -0400 Subject: [PATCH 31/49] Amazon composer version adjustment due to packagist error. Conflicts: composer.json --- composer.json | 76 +++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 9316210c35c..10946e1864f 100644 --- a/composer.json +++ b/composer.json @@ -1,35 +1,41 @@ -{ - "name": "vufind/vufind", - "description": "A flexible discovery layer.", - "authors": [ - { - "name": "Demian Katz", - "email": "demian.katz@villanova.edu" - } - ], - "license": "GPL-2.0", - "require": { - "aferrandini/phpqrcode": "1.0.1", - "jasig/phpcas": "1.3.3", - "cap60552/php-sip2": "1.0.0", - "los/losrecaptcha": "1.0.0", - "ahand/mobileesp": "dev-master", - "ocramius/proxy-manager": "1.0.2", - "oyejorge/less.php": "1.7.0.9", - "pear/file_marc": "1.1.2", - "pear/validate_ispn": "dev-master", - "serialssolutions/summon": "1.0.0", - "symfony/yaml": "2.7.6", - "vufind-org/vufindcode": "1.0.2", - "vufind-org/vufindhttp": "2.0.0", - "zendframework/zendframework": "2.4.6", - "zendframework/zendrest": "2.0.2", - "zendframework/zendservice-amazon": "2.0.4", - "zf-commons/zfc-rbac": "2.5.2" - }, - "require-dev": { - "behat/mink": "1.7.0", - "behat/mink-selenium2-driver": "1.3.0", - "behat/mink-zombie-driver": "1.3.0" - } -} +{ + "name": "vufind/vufind", + "description": "A flexible discovery layer.", + "authors": [ + { + "name": "Demian Katz", + "email": "demian.katz@villanova.edu" + } + ], + "license": "GPL-2.0", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/zendframework/zendservice_amazon" + } + ], + "require": { + "aferrandini/phpqrcode": "1.0.1", + "jasig/phpcas": "1.3.3", + "cap60552/php-sip2": "1.0.0", + "los/losrecaptcha": "1.0.0", + "ahand/mobileesp": "dev-master", + "ocramius/proxy-manager": "1.0.2", + "oyejorge/less.php": "1.7.0.9", + "pear/file_marc": "1.1.2", + "pear/validate_ispn": "dev-master", + "serialssolutions/summon": "1.0.0", + "symfony/yaml": "2.7.6", + "vufind-org/vufindcode": "1.0.2", + "vufind-org/vufindhttp": "2.0.0", + "zendframework/zendframework": "2.4.6", + "zendframework/zendrest": "2.0.2", + "zendframework/zendservice-amazon": "2.0.4", + "zf-commons/zfc-rbac": "2.5.2" + }, + "require-dev": { + "behat/mink": "1.7.0", + "behat/mink-selenium2-driver": "1.3.0", + "behat/mink-zombie-driver": "1.3.0" + } +} From 114c2331d6a06e81299299701146f26299b3217d Mon Sep 17 00:00:00 2001 From: edelm Date: Thu, 21 Jul 2016 10:03:32 +0200 Subject: [PATCH 32/49] codestyle fixes --- module/Swissbib/src/Swissbib/View/Helper/Record.php | 2 +- module/Swissbib/src/Swissbib/View/Helper/TranslateFacets.php | 2 +- module/VuFind/src/VuFind/ILS/Driver/DAIA.php | 2 +- module/VuFind/src/VuFind/ILS/Driver/Unicorn.php | 2 +- module/VuFind/src/VuFind/Service/Factory.php | 2 +- .../src/VuFindDevTools/Controller/DevtoolsController.php | 2 +- module/VuFindTheme/src/VuFindTheme/LessCompiler.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/Swissbib/src/Swissbib/View/Helper/Record.php b/module/Swissbib/src/Swissbib/View/Helper/Record.php index 94425d21a1c..68c0328dd42 100644 --- a/module/Swissbib/src/Swissbib/View/Helper/Record.php +++ b/module/Swissbib/src/Swissbib/View/Helper/Record.php @@ -511,7 +511,7 @@ public function getThumbnail($size = 'small') $position = strpos($urlSrc, '/Cover'); return $this->config->Content->externalResourcesServer . - substr($urlSrc, $position) . '?' . http_build_query($thumb); + substr($urlSrc, $position) . '?' . http_build_query($thumb); } else { $urlHelper = $this->getView()->plugin('url'); diff --git a/module/Swissbib/src/Swissbib/View/Helper/TranslateFacets.php b/module/Swissbib/src/Swissbib/View/Helper/TranslateFacets.php index 072d4ced29f..c60b55442a6 100644 --- a/module/Swissbib/src/Swissbib/View/Helper/TranslateFacets.php +++ b/module/Swissbib/src/Swissbib/View/Helper/TranslateFacets.php @@ -97,7 +97,7 @@ public function __invoke($str, $tokens = [], $default = null) substr( $fieldToEvaluate, strpos($fieldToEvaluate, ':') + 1 - ) . '::' . $facetValue + ) . '::' . $facetValue ) : $facetValue; } } diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php index 6dbdd76f062..f76e8347192 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php +++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php @@ -362,7 +362,7 @@ protected function doHTTPRequest($id) { $http_headers = [ 'Content-type: ' . $this->contentTypesRequest[$this->daiaResponseFormat], - 'Accept: ' . $this->contentTypesRequest[$this->daiaResponseFormat], + 'Accept: ' . $this->contentTypesRequest[$this->daiaResponseFormat], ]; $params = [ diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php index 139f90a4878..429f40e4f35 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php @@ -322,7 +322,7 @@ public function getStatus($id) $cmp = create_function( '$a,$b', 'if ($a["shelving_key"] == $b["shelving_key"]) ' - . 'return $a["number"] - $b["number"];' + . 'return $a["number"] - $b["number"];' . 'return $a["shelving_key"] < $b["shelving_key"] ? 1 : -1;' ); usort($items, $cmp); diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php index dd7ca59983f..13ad96c8f66 100644 --- a/module/VuFind/src/VuFind/Service/Factory.php +++ b/module/VuFind/src/VuFind/Service/Factory.php @@ -859,7 +859,7 @@ public static function getTranslator(ServiceManager $sm) // Set up the ExtendedIni plugin: $config = $sm->get('VuFind\Config')->get('config'); $pathStack = [ - APPLICATION_PATH . '/languages', + APPLICATION_PATH . '/languages', LOCAL_OVERRIDE_DIR . '/languages' ]; $fallbackLocales = $config->Site->language == 'en' diff --git a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php index 3003ae5c32c..752bb3eb3a1 100644 --- a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php +++ b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php @@ -89,7 +89,7 @@ public function deminifyAction() public function languageAction() { // Test languages with no local overrides and no fallback: - $loader = new ExtendedIni([APPLICATION_PATH . '/languages']); + $loader = new ExtendedIni([APPLICATION_PATH . '/languages']); $helper = new LanguageHelper($loader, $this->getConfig()); return $helper->getAllDetails($this->params()->fromQuery('main', 'en')); } diff --git a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php index cdcd2ba2b99..17c4b3830cd 100644 --- a/module/VuFindTheme/src/VuFindTheme/LessCompiler.php +++ b/module/VuFindTheme/src/VuFindTheme/LessCompiler.php @@ -181,7 +181,7 @@ protected function compileFile($theme, $less) list($fileName, ) = explode('.', $less); $finalFile = $finalOutDir . $fileName . '.css'; - $this->logMessage("\tcompiling '" . $less . "' into '" . $finalFile . "'"); + $this->logMessage("\tcompiling '" . $less . "' into '" . $finalFile . "'"); $start = microtime(true); $directories = []; From 1bb5037bcb58d9de3027361cedf6769c8d4b73e4 Mon Sep 17 00:00:00 2001 From: edelm Date: Thu, 21 Jul 2016 18:29:19 +0200 Subject: [PATCH 33/49] refactors #418 and improves #253 --- .../Controller/FavoritesController.php | 2 +- .../js/swissbib/FavoriteInstitutions.js | 251 ------------------ .../templates/myresearch/favorites.phtml | 13 +- themes/sbvfrd/theme.config.php | 1 - 4 files changed, 9 insertions(+), 258 deletions(-) delete mode 100644 themes/sbvfrd/js/swissbib/FavoriteInstitutions.js diff --git a/module/Swissbib/src/Swissbib/Controller/FavoritesController.php b/module/Swissbib/src/Swissbib/Controller/FavoritesController.php index e8122bd8600..19013df1498 100644 --- a/module/Swissbib/src/Swissbib/Controller/FavoritesController.php +++ b/module/Swissbib/src/Swissbib/Controller/FavoritesController.php @@ -60,7 +60,7 @@ public function displayAction() } else { $autocompleterData = $this->getAutocompleterData(); - // mark as downloaded + // mark as downloaded $favoriteManager->setInstitutionsDownloaded(); } diff --git a/themes/sbvfrd/js/swissbib/FavoriteInstitutions.js b/themes/sbvfrd/js/swissbib/FavoriteInstitutions.js deleted file mode 100644 index 6547c21a50d..00000000000 --- a/themes/sbvfrd/js/swissbib/FavoriteInstitutions.js +++ /dev/null @@ -1,251 +0,0 @@ -'use strict'; - -swissbib.FavoriteInstitutions = { - - baseUrl: '/MyResearch/Favorites', - - /** - * Values for autocomplete list (cached) - */ - autocompleteValues: [], - - - /** - * Initialize favorite management - * - * @param {Object|Boolean} availableInstitutions List of institutions of false of already cached - */ - init: function (availableInstitutions) { - this.baseUrl = window.path + this.baseUrl; - - // The institutions should already be cached - if (availableInstitutions === false) { - availableInstitutions = this.getInstitutionsFromStorage(); - } else { - // New institutions downloaded, save them - this.saveInstitutionsToStorage(availableInstitutions); - } - - this.installAutocomplete(availableInstitutions); - this.installHandlers(); - }, - - - /** - * Install click handlers - * - */ - installHandlers: function () { - var that = this; - - $('#favorites-table').find('.deleteFavoriteInstitution').click(function (event) { - var institutionCode = $(this).data('institution'); - - that.deleteInstitution(institutionCode); - }); - }, - - - /** - * Install autocompleter - * - * @param {Object} availableInstitutions - */ - installAutocomplete: function (availableInstitutions) { - $('#query').bind('typeahead:selected', $.proxy(this.onInstitutionSelect, this)); - $('#query').typeahead({ - hint: true, - highlight: true, - minLength: 1, - }, { - displayKey: 'label', - source: swissbib.FavoriteInstitutions.substringMatcher(availableInstitutions), - }); - }, - - - /** - * - * @param {Object} - * @returns {Function} findMatches - */ - substringMatcher: function (strs) { - return function findMatches(q, cb) { - var matches, substrRegex; - - // an array that will be populated with substring matches - matches = []; - - // regex used to determine if a string contains the substring `q` - substrRegex = new RegExp(q, 'i'); - - // iterate through the pool of strings and for any string that - // contains the substring `q`, add it to the `matches` array - $.each(strs, function (i, str) { - if (substrRegex.test(str)) { - // the typeahead jQuery plugin expects suggestions to a - // JavaScript object, refer to typeahead docs for more info - matches.push({ label: str, value: i }); - } - }); - - cb(matches); - }; - }, - - - /** - * Find data for autocomplete - * Call custom matcher - * - * @param {Object} request - * @param {Function} response - */ - autocompleteMatcher: function (request, response) { - response(this.getMatchingItems(request.term)); - }, - - - /** - * Customized matcher - * Test label and value for match - * - * @param {String} term - * @returns {Object[]} - */ - getMatchingItems: function (term) { - - //remove the trailing blank - if (term.charAt(term.length - 1) == " ") { - term = term.substr(0, term.length - 1); - } - - var splittedTerms = term.split(" "); - var aRegexes = new Array(); - for (var x = 0; x < splittedTerms.length; x++) { - var splittedTerm = splittedTerms[x]; - aRegexes.push(new RegExp(splittedTerm, "gi")); - } - - - var responseItems = new Array(); - - for (var iItems = 0; iItems < this.autocompleteValues.length; iItems++) { - - var allTermsInLine = true; - var tName = this.autocompleteValues[iItems].label; - - - for (var xx = 0; xx < aRegexes.length; xx++) { - if (!aRegexes[xx].test(tName)) { - allTermsInLine = false; - - break; - } - } - - //return $.grep(this.autocompleteValues, function(value) { - // return matcher.test(value.label) || matcher.test(value.value); - //}); - - - if (allTermsInLine) { - for (var x = 0; x < splittedTerms.length; x++) { - var splittedTerm = splittedTerms[x]; - tName = tName.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + splittedTerm.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); - } - responseItems.push({label: tName, value: this.autocompleteValues[iItems].value}); - } - } - - return responseItems; - }, - - - /** - * Handle institution selection - * - * @param {Object} event - * @param {Object} ui - */ - onInstitutionSelect: function (obj, datum, name) { - this.clearSearchField(); - this.addInstitution(datum.value); - - return false; - }, - - - /** - * Delete an institution and update list - * - * @param {String} institutionCode - */ - deleteInstitution: function (institutionCode) { - this.sendRequestOnUpdateList('delete', institutionCode); - }, - - - /** - * Add institution and update list - * - * @param {String} institutionCode - */ - addInstitution: function (institutionCode) { - this.sendRequestOnUpdateList('add', institutionCode); - }, - - - /** - * Send a request to the given action with the institution as parameter - * Update list with response - * - * @param {String} action - * @param {String} institutionCode - */ - sendRequestOnUpdateList: function (action, institutionCode) { - var that = this, - url = this.baseUrl + '/' + action, - data = { - institution: institutionCode, - list: true - }; - - $('#user-favorites').mask('Update...'); - - $('#user-favorites').load(url, data, function () { - that.installHandlers(); - $('#user-favorites').unmask(); - }); - }, - - - /** - * Clear search field value - * - */ - clearSearchField: function () { - $('#query').val(''); - }, - - - /** - * Get institution list from local storage - * - * @returns {Object} - */ - getInstitutionsFromStorage: function () { - return $.jStorage.get('favorite-institutions'); - }, - - - /** - * Add institution list to local storage - * - * @param {Object} institutions - */ - saveInstitutionsToStorage: function (institutions) { - $.jStorage.set('favorite-institutions', institutions); - } - -}; \ No newline at end of file diff --git a/themes/sbvfrd/templates/myresearch/favorites.phtml b/themes/sbvfrd/templates/myresearch/favorites.phtml index 3fbbbe8ccba..f0ee1578568 100644 --- a/themes/sbvfrd/templates/myresearch/favorites.phtml +++ b/themes/sbvfrd/templates/myresearch/favorites.phtml @@ -21,7 +21,7 @@ $isLoggedIn = !!$this->auth()->isLoggedIn();
- +
@@ -50,7 +50,10 @@ $isLoggedIn = !!$this->auth()->isLoggedIn(); \ No newline at end of file + $('input#query').autocomplete({ + maxResults: 10, + handler: function(query, cb) { + cb(); + } + }); + \ No newline at end of file diff --git a/themes/sbvfrd/theme.config.php b/themes/sbvfrd/theme.config.php index 57bcfb6c173..0ea4a2c15ba 100644 --- a/themes/sbvfrd/theme.config.php +++ b/themes/sbvfrd/theme.config.php @@ -29,7 +29,6 @@ 'swissbib/AdvancedSearch.js', 'swissbib/Holdings.js', 'swissbib/HoldingFavorites.js', - 'swissbib/FavoriteInstitutions.js', 'swissbib/Accordion.js', 'swissbib/Settings.js', 'swissbib/OffCanvas.js', From 7b11955b8487ef6e920c74607895c780438b9fd5 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 13 Jul 2016 10:06:54 -0400 Subject: [PATCH 34/49] php-cs-fixer --- .../VuFind/src/VuFind/ILS/Driver/Virtua.php | 28 +++++++++---------- .../src/VuFindDevTools/LanguageHelper.php | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php index 2b957a8c4a8..ec816b65964 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Virtua.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Virtua.php @@ -1764,24 +1764,24 @@ public function renewMyItems($renewDetails) // Have to use raw post data because of the way // virtua expects the barcodes to come across. - $post_data = "function=" . "RENEWAL"; - $post_data .= "&search=" . "PATRON"; - $post_data .= "&sessionid=" . "$session_id"; - $post_data .= "&skin=" . "homepage"; - $post_data .= "&lng=" . $this->getConfiguredLanguage(); - $post_data .= "&inst=" . "consortium"; - $post_data .= "&conf=" . urlencode("./chameleon.conf"); - $post_data .= "&u1=" . "12"; + $post_data = "function=" . "RENEWAL"; + $post_data .= "&search=" . "PATRON"; + $post_data .= "&sessionid=" . "$session_id"; + $post_data .= "&skin=" . "homepage"; + $post_data .= "&lng=" . $this->getConfiguredLanguage(); + $post_data .= "&inst=" . "consortium"; + $post_data .= "&conf=" . urlencode("./chameleon.conf"); + $post_data .= "&u1=" . "12"; $post_data .= "&SourceScreen=" . "PATRONACTIVITY"; - $post_data .= "&pos=" . "1"; - $post_data .= "&patronid=" . $patron['cat_username']; + $post_data .= "&pos=" . "1"; + $post_data .= "&patronid=" . $patron['cat_username']; $post_data .= "&patronhost=" . urlencode($this->config['Catalog']['patron_host']); $post_data .= "&host=" . urlencode($this->config['Catalog']['host_string']); - $post_data .= "&itembarcode=" . implode("&itembarcode=", $item_list); - $post_data .= "&submit=" . "Renew"; - $post_data .= "&reset=" . "Clear"; + $post_data .= "&itembarcode=" . implode("&itembarcode=", $item_list); + $post_data .= "&submit=" . "Renew"; + $post_data .= "&reset=" . "Clear"; $result = $this->httpRequest($virtua_url, null, $post_data); @@ -1832,7 +1832,7 @@ public function getSuppressedAuthorityRecords() } foreach ($result as $row) { - $list[] = 'vtls' . str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT); + $list[] = 'vtls' . str_pad($row['AUTH_ID'], 9, "0", STR_PAD_LEFT); } return $list; } diff --git a/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php b/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php index 222b746d9c5..6628e741680 100644 --- a/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php +++ b/module/VuFindDevTools/src/VuFindDevTools/LanguageHelper.php @@ -178,7 +178,7 @@ protected function getTextDomains() { static $domains = false; if (!$domains) { - $base = APPLICATION_PATH . '/languages'; + $base = APPLICATION_PATH . '/languages'; $dir = opendir($base); $domains = []; while ($current = readdir($dir)) { From e4196a31fc9c92dadacb6eb90f88b66ffd624c0c Mon Sep 17 00:00:00 2001 From: edelm Date: Fri, 22 Jul 2016 10:57:46 +0200 Subject: [PATCH 35/49] codestyle fixes --- module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php | 2 +- module/Swissbib/src/Swissbib/TargetsProxy/TargetsProxy.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php index 808849d4fd1..ee80b5b627d 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php @@ -2181,7 +2181,7 @@ public function getOnlineStatus() { $filter = array_key_exists('filter_str_mv', $this->fields) ? $this->fields['filter_str_mv'] : []; - return in_array('ONL', $filter) ? true : false; + return in_array('ONL', $filter) ? true : false; } /** diff --git a/module/Swissbib/src/Swissbib/TargetsProxy/TargetsProxy.php b/module/Swissbib/src/Swissbib/TargetsProxy/TargetsProxy.php index 7df71c766cc..67f4084f95f 100644 --- a/module/Swissbib/src/Swissbib/TargetsProxy/TargetsProxy.php +++ b/module/Swissbib/src/Swissbib/TargetsProxy/TargetsProxy.php @@ -294,7 +294,7 @@ public function detectTarget($overrideIP = '', $overrideHost = '') } } - return ($this->targetKey != "" ? true : false); + return ($this->targetKey != "" ? true : false); } /** From 7bf2233b78c245bf058012bd6174ff0be06fc91e Mon Sep 17 00:00:00 2001 From: Tom Misilo Date: Tue, 26 Jul 2016 16:18:01 -0400 Subject: [PATCH 36/49] Convert null values to blank strings to avoid DB errors. - Resolves VUFIND-1124. --- module/VuFind/src/VuFind/Auth/CAS.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/VuFind/src/VuFind/Auth/CAS.php b/module/VuFind/src/VuFind/Auth/CAS.php index 4fd2a760327..a6c76571738 100644 --- a/module/VuFind/src/VuFind/Auth/CAS.php +++ b/module/VuFind/src/VuFind/Auth/CAS.php @@ -142,7 +142,7 @@ public function authenticate($request) if (isset($cas->$attribute)) { $value = $casauth->getAttribute($cas->$attribute); if ($attribute != 'cat_password') { - $user->$attribute = $value; + $user->$attribute = ($value === null) ? '' : $value; } else { $catPassword = $value; } From a85dcce9d9c70c85031f42dd61e70b37bec11015 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 27 Jul 2016 08:43:55 -0400 Subject: [PATCH 37/49] php-cs-fixer --- module/VuFind/src/VuFind/Content/Covers/Factory.php | 2 +- module/VuFind/src/VuFind/Content/Reviews/Factory.php | 2 +- module/VuFind/src/VuFind/Cover/Generator.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/VuFind/src/VuFind/Content/Covers/Factory.php b/module/VuFind/src/VuFind/Content/Covers/Factory.php index 51bfa872808..d6834ba6b08 100644 --- a/module/VuFind/src/VuFind/Content/Covers/Factory.php +++ b/module/VuFind/src/VuFind/Content/Covers/Factory.php @@ -69,7 +69,7 @@ public static function getBooksite(ServiceManager $sm) { $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config'); $url = isset($config->Booksite->url) - ? $config->Booksite->url : 'https://api.booksite.com'; + ? $config->Booksite->url : 'https://api.booksite.com'; if (!isset($config->Booksite->key)) { throw new \Exception("Booksite 'key' not set in VuFind config"); } diff --git a/module/VuFind/src/VuFind/Content/Reviews/Factory.php b/module/VuFind/src/VuFind/Content/Reviews/Factory.php index 67f8591e003..e791a326ffd 100644 --- a/module/VuFind/src/VuFind/Content/Reviews/Factory.php +++ b/module/VuFind/src/VuFind/Content/Reviews/Factory.php @@ -110,7 +110,7 @@ public static function getBooksite(ServiceManager $sm) { $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config'); $url = isset($config->Booksite->url) - ? $config->Booksite->url : 'https://api.booksite.com'; + ? $config->Booksite->url : 'https://api.booksite.com'; if (!isset($config->Booksite->key)) { throw new \Exception("Booksite 'key' not set in VuFind config"); } diff --git a/module/VuFind/src/VuFind/Cover/Generator.php b/module/VuFind/src/VuFind/Cover/Generator.php index 9cf248bcc39..aa859f70473 100644 --- a/module/VuFind/src/VuFind/Cover/Generator.php +++ b/module/VuFind/src/VuFind/Cover/Generator.php @@ -712,9 +712,9 @@ protected function renderGrid($bc, $color) $bc = str_split($bc); for ($k = 0;$k < 4;$k++) { - $x = $k % 2 ? $halfWidth : $halfWidth - $boxWidth; + $x = $k % 2 ? $halfWidth : $halfWidth - $boxWidth; $y = $k / 2 < 1 ? $halfHeight : $halfHeight - $boxHeight; - $u = $k % 2 ? $boxWidth : -$boxWidth; + $u = $k % 2 ? $boxWidth : -$boxWidth; $v = $k / 2 < 1 ? $boxHeight : -$boxHeight; for ($i = 0;$i < 16;$i++) { if ($bc[$i] == "1") { From 7fa8337bbbf19df37fefa93d568953809d74f049 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 27 Jul 2016 08:44:38 -0400 Subject: [PATCH 38/49] Avoid null attribute values (in case of strict DB settings). --- module/VuFind/src/VuFind/Auth/LDAP.php | 2 +- module/VuFind/src/VuFind/Auth/Shibboleth.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php index 6b24fcb654b..e006e17f154 100644 --- a/module/VuFind/src/VuFind/Auth/LDAP.php +++ b/module/VuFind/src/VuFind/Auth/LDAP.php @@ -280,7 +280,7 @@ protected function processLDAPUser($username, $data) $value = $data[$i][$configValue][0]; $this->debug("found $field = $value"); if ($field != "cat_password") { - $user->$field = $value; + $user->$field = ($value === null) ? '' : $value; } else { $catPassword = $value; } diff --git a/module/VuFind/src/VuFind/Auth/Shibboleth.php b/module/VuFind/src/VuFind/Auth/Shibboleth.php index e837f5089c9..9a948e56a88 100644 --- a/module/VuFind/src/VuFind/Auth/Shibboleth.php +++ b/module/VuFind/src/VuFind/Auth/Shibboleth.php @@ -114,7 +114,7 @@ public function authenticate($request) if (isset($shib->$attribute)) { $value = $request->getServer()->get($shib->$attribute); if ($attribute != 'cat_password') { - $user->$attribute = $value; + $user->$attribute = ($value === null) ? '' : $value; } else { $catPassword = $value; } From 5da80e285a7ab5d12c132eeb1aa6d652ad2f00ba Mon Sep 17 00:00:00 2001 From: edelm Date: Thu, 28 Jul 2016 10:50:32 +0200 Subject: [PATCH 39/49] codestyle fixes --- module/VuFind/src/VuFind/Content/Covers/Factory.php | 2 +- module/VuFind/src/VuFind/Content/Reviews/Factory.php | 2 +- module/VuFind/src/VuFind/Cover/Generator.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/VuFind/src/VuFind/Content/Covers/Factory.php b/module/VuFind/src/VuFind/Content/Covers/Factory.php index 51bfa872808..d6834ba6b08 100644 --- a/module/VuFind/src/VuFind/Content/Covers/Factory.php +++ b/module/VuFind/src/VuFind/Content/Covers/Factory.php @@ -69,7 +69,7 @@ public static function getBooksite(ServiceManager $sm) { $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config'); $url = isset($config->Booksite->url) - ? $config->Booksite->url : 'https://api.booksite.com'; + ? $config->Booksite->url : 'https://api.booksite.com'; if (!isset($config->Booksite->key)) { throw new \Exception("Booksite 'key' not set in VuFind config"); } diff --git a/module/VuFind/src/VuFind/Content/Reviews/Factory.php b/module/VuFind/src/VuFind/Content/Reviews/Factory.php index 67f8591e003..e791a326ffd 100644 --- a/module/VuFind/src/VuFind/Content/Reviews/Factory.php +++ b/module/VuFind/src/VuFind/Content/Reviews/Factory.php @@ -110,7 +110,7 @@ public static function getBooksite(ServiceManager $sm) { $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config'); $url = isset($config->Booksite->url) - ? $config->Booksite->url : 'https://api.booksite.com'; + ? $config->Booksite->url : 'https://api.booksite.com'; if (!isset($config->Booksite->key)) { throw new \Exception("Booksite 'key' not set in VuFind config"); } diff --git a/module/VuFind/src/VuFind/Cover/Generator.php b/module/VuFind/src/VuFind/Cover/Generator.php index 9cf248bcc39..aa859f70473 100644 --- a/module/VuFind/src/VuFind/Cover/Generator.php +++ b/module/VuFind/src/VuFind/Cover/Generator.php @@ -712,9 +712,9 @@ protected function renderGrid($bc, $color) $bc = str_split($bc); for ($k = 0;$k < 4;$k++) { - $x = $k % 2 ? $halfWidth : $halfWidth - $boxWidth; + $x = $k % 2 ? $halfWidth : $halfWidth - $boxWidth; $y = $k / 2 < 1 ? $halfHeight : $halfHeight - $boxHeight; - $u = $k % 2 ? $boxWidth : -$boxWidth; + $u = $k % 2 ? $boxWidth : -$boxWidth; $v = $k / 2 < 1 ? $boxHeight : -$boxHeight; for ($i = 0;$i < 16;$i++) { if ($bc[$i] == "1") { From 7daa9424268f64188c1fe9fe7596d5a1e136ed64 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Thu, 28 Jul 2016 15:06:57 -0400 Subject: [PATCH 40/49] Bumped version number. --- build.xml | 2 +- config/vufind/config.ini | 2 +- packages/DEBIAN/changelog | 6 ++++++ packages/DEBIAN/control | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 9f01132d279..b85aba585e6 100644 --- a/build.xml +++ b/build.xml @@ -26,7 +26,7 @@ - + diff --git a/config/vufind/config.ini b/config/vufind/config.ini index 232707e7b35..79a0604b2fe 100644 --- a/config/vufind/config.ini +++ b/config/vufind/config.ini @@ -103,7 +103,7 @@ showBulkOptions = false ; Should users be allowed to save searches in their accounts? allowSavedSearches = true ; Generator value to display in an HTML header tag: -generator = "VuFind 3.0.2" +generator = "VuFind 3.0.3" ; This section allows you to configure the mechanism used for storing user ; sessions. Available types: File, Memcache, Database. diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog index 8a3e2243556..06dce5e387a 100644 --- a/packages/DEBIAN/changelog +++ b/packages/DEBIAN/changelog @@ -1,3 +1,9 @@ +vufind 3.0.3 distribution; urgency=low + + * VuFind 3.0.3 release (see http://vufind.org/wiki/changelog for details) + + -- maintainer VuFind Project Administration Team Mo 1 Aug 2016 09:01:21 UTC + vufind 3.0.2 distribution; urgency=low * VuFind 3.0.2 release (see http://vufind.org/wiki/changelog for details) diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control index f7c1364285e..059764350cc 100644 --- a/packages/DEBIAN/control +++ b/packages/DEBIAN/control @@ -1,5 +1,5 @@ Package: vufind -Version: 3.0.2 +Version: 3.0.3 Section: World Wide Web Priority: Optional Architecture: all From d9ab07f95396531f04863f0cad8aa36df72179c1 Mon Sep 17 00:00:00 2001 From: edelm Date: Thu, 4 Aug 2016 18:42:59 +0200 Subject: [PATCH 41/49] Anpassung analog f6362db6d628ee205e2255559b34f7485889754a vom core --- .../templates/RecordDriver/SolrDefault/toolbar.phtml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/themes/sbvfrd/templates/RecordDriver/SolrDefault/toolbar.phtml b/themes/sbvfrd/templates/RecordDriver/SolrDefault/toolbar.phtml index 2ecb518baeb..022a9b9d62d 100644 --- a/themes/sbvfrd/templates/RecordDriver/SolrDefault/toolbar.phtml +++ b/themes/sbvfrd/templates/RecordDriver/SolrDefault/toolbar.phtml @@ -6,17 +6,16 @@ // Set up some variables for convenience: $id = $this->driver->getUniqueId(); - $controllerClass = 'controller:' . $this->record($this->driver)->getController(); $cart = $this->cart(); $cartId = $this->driver->getResourceSource() . '|' . $id; ?>
    driver->getCitationFormats()) > 0): ?> -
    • +
    • auth()->isAjaxLoginAllowed() ? 'id="mail-record"' : '' ?> -
  • class="s " href="recordLink()->getActionUrl($this->driver, 'Email')?>" title="transEsc('Email this')?>">
    • +
  • class="s cite-record" href="recordLink()->getActionUrl($this->driver, 'Email')?>" title="transEsc('Email this')?>">
    • export()->getFormatsForRecord($this->driver); ?> 0): ?> @@ -33,7 +32,7 @@ userlist()->getMode() !== 'disabled'): ?> auth()->isAjaxLoginAllowed() ? 'id="save-record"' : '' ?> -
  • class="modal-link " href="recordLink()->getActionUrl($this->driver, 'Save')?>" title="transEsc('Add to favorites')?>">
    • +
  • class="modal-link cite-record" href="recordLink()->getActionUrl($this->driver, 'Save')?>" title="transEsc('Add to favorites')?>">
    • From e3aad229e66baf4c2288214114d998f2bb5984c3 Mon Sep 17 00:00:00 2001 From: edelm Date: Fri, 5 Aug 2016 16:00:11 +0200 Subject: [PATCH 42/49] #445 put search help pages in lightboxes --- themes/sbvfrd/templates/search/advanced/layout.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/sbvfrd/templates/search/advanced/layout.phtml b/themes/sbvfrd/templates/search/advanced/layout.phtml index db915677f1c..34d7a9f3b4b 100644 --- a/themes/sbvfrd/templates/search/advanced/layout.phtml +++ b/themes/sbvfrd/templates/search/advanced/layout.phtml @@ -124,8 +124,8 @@

    transEsc('Search Tips')?>

    - transEsc("Help with Advanced Search")?> - transEsc("Help with Search Operators")?> + transEsc("Help with Advanced Search")?> + transEsc("Help with Search Operators")?>
    \ No newline at end of file From f6ff0d781e1d7f065ce16f25e1f6685cdbd6bccf Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Wed, 25 May 2016 09:24:39 -0400 Subject: [PATCH 43/49] Use Composer to load utilities; use Phing for more Travis tasks. (#704) # Conflicts: # .travis.yml # composer.json --- .travis.yml | 12 +++---- build.xml | 28 +++++++++------- composer.json | 88 +++++++++++++++++++++++++++------------------------ 3 files changed, 68 insertions(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e880fe262d..5d8289ce74a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,23 +2,19 @@ sudo: false language: php php: - 5.4 + - 5.5 + - 5.6 + - 7.0 env: - VUFIND_HOME=$PWD VUFIND_LOCAL_DIR=$PWD/local before_script: - # Note: locked phpcs to 2.3.4 due to a bug in 2.4.0; can relax restriction after next release. - - pear install pear/PHP_CodeSniffer-2.3.4 - pear install pear/Http_Request2 - pear channel-discover pear.phing.info - pear install phing/phing - - composer global require fabpot/php-cs-fixer - - export PATH="$HOME/.composer/vendor/bin:$PATH" - phpenv config-rm xdebug.ini - phpenv rehash script: - - phing composer - - phpunit --stderr --configuration module/VuFind/tests/phpunit.xml - - phpcs --standard=PEAR --ignore=*/config/*,*/tests/* --extensions=php $PWD/module - - phing php-cs-fixer-dryrun + - phing composer phpunitfast phpcs-console php-cs-fixer-dryrun diff --git a/build.xml b/build.xml index f2d376a9a10..f4dba655154 100644 --- a/build.xml +++ b/build.xml @@ -21,6 +21,7 @@ + @@ -68,35 +69,38 @@ - + - + - + - + - + + + + - + - + @@ -112,18 +116,18 @@ - + - + - + @@ -278,7 +282,9 @@ - + + + diff --git a/composer.json b/composer.json index 8743f10989d..24187076880 100644 --- a/composer.json +++ b/composer.json @@ -1,41 +1,47 @@ -{ - "name": "vufind/vufind", - "description": "A flexible discovery layer.", - "authors": [ - { - "name": "Demian Katz", - "email": "demian.katz@villanova.edu" - } - ], - "license": "GPL-2.0", - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/zendframework/zendservice_amazon" - } - ], - "require": { - "aferrandini/phpqrcode": "1.0.1", - "jasig/phpcas": "1.3.3", - "cap60552/php-sip2": "1.0.0", - "los/losrecaptcha": "1.0.0", - "ahand/mobileesp": "dev-master", - "ocramius/proxy-manager": "1.0.2", - "oyejorge/less.php": "1.7.0.9", - "pear/file_marc": "1.1.2", - "pear/validate_ispn": "dev-master", - "serialssolutions/summon": "1.0.0", - "symfony/yaml": "2.7.6", - "vufind-org/vufindcode": "1.0.2", - "vufind-org/vufindhttp": "2.0.0", - "zendframework/zendframework": "2.4.6", - "zendframework/zendrest": "2.0.2", - "zendframework/zendservice-amazon": "2.0.4", - "zf-commons/zfc-rbac": "2.5.2" - }, - "require-dev": { - "behat/mink": "1.7.0", - "behat/mink-selenium2-driver": "1.3.0", - "behat/mink-zombie-driver": "1.3.0" - } -} +{ + "name": "vufind/vufind", + "description": "A flexible discovery layer.", + "authors": [ + { + "name": "Demian Katz", + "email": "demian.katz@villanova.edu" + } + ], + "license": "GPL-2.0", + "repositories": [ + { + "type": "composer", + "url": "https://packages.zendframework.com/" + } + ], + "require": { + "aferrandini/phpqrcode": "1.0.1", + "jasig/phpcas": "1.3.3", + "cap60552/php-sip2": "1.0.0", + "los/losrecaptcha": "1.0.0", + "ahand/mobileesp": "dev-master", + "ocramius/proxy-manager": "1.0.2", + "oyejorge/less.php": "1.7.0.9", + "pear/file_marc": "1.1.2", + "pear/validate_ispn": "dev-master", + "serialssolutions/summon": "1.0.0", + "symfony/yaml": "2.7.6", + "vufind-org/vufindcode": "1.0.2", + "vufind-org/vufindhttp": "2.0.0", + "zendframework/zendframework": "2.4.6", + "zendframework/zendrest": "2.0.2", + "zendframework/zendservice-amazon": "2.0.4", + "zf-commons/zfc-rbac": "2.5.2" + }, + "require-dev": { + "behat/mink": "1.7.0", + "behat/mink-selenium2-driver": "1.3.0", + "behat/mink-zombie-driver": "1.3.0", + "fabpot/php-cs-fixer": "1.11.2", + "phploc/phploc": "2.0.6", + "phpmd/phpmd": "1.5.0", + "phpunit/phpunit": "4.8.4", + "sebastian/phpcpd": "1.4.3", + "squizlabs/php_codesniffer": "2.6.0" + } +} From 58201fc60b6edd539b64f3c0e668cef09958dc3c Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 8 Aug 2016 12:24:02 +0200 Subject: [PATCH 44/49] code style fixes --- .../src/Swissbib/Controller/MyResearchController.php | 1 + .../Swissbib/src/Swissbib/RecordDriver/Helper/Holdings.php | 2 ++ module/Swissbib/src/Swissbib/RecordDriver/Missing.php | 1 + module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php | 6 ++++++ module/Swissbib/src/Swissbib/RecordDriver/Summon.php | 1 + .../src/Swissbib/RecordDriver/SwissbibRecordDriver.php | 1 + module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php | 1 + module/VuFind/src/VuFind/Search/EDS/Options.php | 6 ++++++ module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php | 1 + .../src/VuFindTheme/View/Helper/InlineScript.php | 1 + 10 files changed, 21 insertions(+) diff --git a/module/Swissbib/src/Swissbib/Controller/MyResearchController.php b/module/Swissbib/src/Swissbib/Controller/MyResearchController.php index 0d2af43ddf6..454374553ea 100644 --- a/module/Swissbib/src/Swissbib/Controller/MyResearchController.php +++ b/module/Swissbib/src/Swissbib/Controller/MyResearchController.php @@ -522,6 +522,7 @@ public function changeAddressAction() /** * Check if we are in lightbox mode such a method was removed by the core * we want to exclude Lightbox with Shibboleth authentication + * * @return boolean */ protected function checkInLightbox() diff --git a/module/Swissbib/src/Swissbib/RecordDriver/Helper/Holdings.php b/module/Swissbib/src/Swissbib/RecordDriver/Helper/Holdings.php index d8455b7100b..3b53c357817 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/Helper/Holdings.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/Helper/Holdings.php @@ -63,12 +63,14 @@ class Holdings /** * Check login status and info + * * @var AuthManager */ protected $authManager; /** * IlsAuth + * * @var IlsAuth */ protected $ilsAuth; diff --git a/module/Swissbib/src/Swissbib/RecordDriver/Missing.php b/module/Swissbib/src/Swissbib/RecordDriver/Missing.php index 6267e1a9e05..ceb516b9732 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/Missing.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/Missing.php @@ -271,6 +271,7 @@ public function getUniqueID() /** * Get Hierarchical level of record + * * @return String */ public function getHierachicalLevel() diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php index ee80b5b627d..d4844945546 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php @@ -1017,6 +1017,7 @@ public function getFormatsRaw() /** * Returns as array to use same template with foreach as normally + * * @return array */ public function getMostSpecificFormat() @@ -1326,6 +1327,7 @@ public function getArchivalVolumeTitle() /** * Get Hierarchical level of record + * * @return String */ public function getHierachicalLevel() @@ -1387,6 +1389,7 @@ public function getAcquisitionNote($asStrings = true) /** * Get biographical information or administrative history + * * @return array */ public function getHistData() @@ -1396,6 +1399,7 @@ public function getHistData() /** * Get added entry geographic name + * * @return array */ public function getPlaceNames() @@ -1650,6 +1654,7 @@ public function getWorkTitle($asStrings = true) /** * Get Physical Medium (MARC21: field 340) + * * @return array */ public function getPhysicalMedium() @@ -1722,6 +1727,7 @@ public function getOriginalVersionNotes() /** * Get language information + * * @return array */ public function getLangData() diff --git a/module/Swissbib/src/Swissbib/RecordDriver/Summon.php b/module/Swissbib/src/Swissbib/RecordDriver/Summon.php index 2a696a81db3..75bc57fc493 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/Summon.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/Summon.php @@ -355,6 +355,7 @@ public function supportsOpenUrl() /** * Get Hierarchical level of record + * * @return String */ public function getHierachicalLevel() diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SwissbibRecordDriver.php b/module/Swissbib/src/Swissbib/RecordDriver/SwissbibRecordDriver.php index 83fc434c787..681e42706f5 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/SwissbibRecordDriver.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/SwissbibRecordDriver.php @@ -144,6 +144,7 @@ public function displayHoldings(); /** * Get Hierarchical level of record + * * @return String */ public function getHierachicalLevel(); diff --git a/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php b/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php index 815952fc3b2..2f41c5c2d9f 100644 --- a/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php +++ b/module/Swissbib/src/Swissbib/VuFind/Search/Solr/Params.php @@ -202,6 +202,7 @@ protected function addUserInstitutions(ParamBag $backendParams) /** * FavoriteInstitutions array + * * @var String[] $favoriteInstitutions */ $favoriteInstitutions = $favoritesManger->getUserInstitutions(); diff --git a/module/VuFind/src/VuFind/Search/EDS/Options.php b/module/VuFind/src/VuFind/Search/EDS/Options.php index 2a28e84b206..7dddaa6e715 100644 --- a/module/VuFind/src/VuFind/Search/EDS/Options.php +++ b/module/VuFind/src/VuFind/Search/EDS/Options.php @@ -47,36 +47,42 @@ class Options extends \VuFind\Search\Base\Options /** * Default search mode options + * * @var string */ protected $defaultMode = 'all'; /** * The set search mode + * * @var string */ protected $searchMode; /** * Default expanders to apply + * * @var array */ protected $defaultExpanders = []; /** * Available expander options + * * @var unknown */ protected $expanderOptions = []; /** * Available limiter options + * * @var unknown */ protected $limiterOptions = []; /** * Wheither or not to return available facets with the search response + * * @var unknown */ protected $includeFacets = 'y'; diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php index c047b1d24c9..0b77135eb8b 100644 --- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php +++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Zend2.php @@ -47,6 +47,7 @@ class Zend2 extends EdsApi_REST_Base implements LoggerAwareInterface /** * The HTTP Request object to execute EDS API transactions + * * @var Zend2HttpClient */ protected $client; diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/InlineScript.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/InlineScript.php index c0497a4d721..54a52e1a3bc 100644 --- a/module/VuFindTheme/src/VuFindTheme/View/Helper/InlineScript.php +++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/InlineScript.php @@ -40,6 +40,7 @@ class InlineScript extends HeadScript { /** * Registry key for placeholder + * * @var string */ protected $regKey = 'Zend_View_Helper_InlineScript'; From ef7a71b52046162c12fb96924313a41374155e7f Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 8 Aug 2016 12:27:54 +0200 Subject: [PATCH 45/49] code style fixes --- module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php | 1 + module/VuFind/src/VuFind/Search/EDS/Options.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php index d4844945546..fb4d623e9a6 100644 --- a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php +++ b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php @@ -1737,6 +1737,7 @@ public function getLangData() /** * Get Ownership and Custodial History Note (MARC21: field 561) + * * @return array */ public function getOwnerNote() diff --git a/module/VuFind/src/VuFind/Search/EDS/Options.php b/module/VuFind/src/VuFind/Search/EDS/Options.php index 7dddaa6e715..f5bf939ed4a 100644 --- a/module/VuFind/src/VuFind/Search/EDS/Options.php +++ b/module/VuFind/src/VuFind/Search/EDS/Options.php @@ -47,7 +47,7 @@ class Options extends \VuFind\Search\Base\Options /** * Default search mode options - * + * * @var string */ protected $defaultMode = 'all'; @@ -89,6 +89,7 @@ class Options extends \VuFind\Search\Base\Options /** * Available Search Options from the API + * * @var array */ protected $apiInfo; From ed8a32aa26d69c3981bd888ae83c784f0f9c38f5 Mon Sep 17 00:00:00 2001 From: edelm Date: Mon, 8 Aug 2016 16:15:34 +0200 Subject: [PATCH 46/49] =?UTF-8?q?fixes=20#443=20(suche=20in=20reihen/b?= =?UTF-8?q?=C3=A4nden)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/sbvfrd/js/hierarchyTree.js | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/sbvfrd/js/hierarchyTree.js b/themes/sbvfrd/js/hierarchyTree.js index 44eebe246f5..6e5de96138a 100644 --- a/themes/sbvfrd/js/hierarchyTree.js +++ b/themes/sbvfrd/js/hierarchyTree.js @@ -93,6 +93,7 @@ function doTreeSearch() { } for(i=data.results.length;i--;) { var tid = htmlEncodeId(data.results[i]); + tid = getNodeIdFromRecordId(treeModel,tid); $('#hierarchyTree').find('#'+tid).addClass('jstree-search'); } changeNoResultLabel(false); From 851ebed81d8b1984aad18c85a897081d99773a31 Mon Sep 17 00:00:00 2001 From: Silvia Witzig Date: Wed, 24 Aug 2016 15:48:26 +0200 Subject: [PATCH 47/49] Hilfeseiten als FAQ --- themes/sbvfrd/less/accordion.less | 41 +- .../templates/Auth/MultiILS/loginfields.phtml | 2 +- .../templates/HelpPage/de/delivery.phtml | 18 +- .../templates/HelpPage/de/faq.phtml | 549 +++++++++- .../templates/HelpPage/de/search.phtml | 27 +- .../templates/HelpPage/en/delivery.phtml | 16 +- .../templates/HelpPage/en/faq.phtml | 943 ++++++++++++++++- .../templates/HelpPage/en/search.phtml | 20 +- .../templates/HelpPage/fr/delivery.phtml | 16 +- .../templates/HelpPage/fr/faq.phtml | 945 +++++++++++++++++- .../templates/HelpPage/fr/search.phtml | 21 +- .../templates/HelpPage/it/delivery.phtml | 17 +- .../templates/HelpPage/it/faq.phtml | 945 +++++++++++++++++- .../templates/HelpPage/it/search.phtml | 20 +- .../templates/HelpPage/menulinks.phtml | 2 +- 15 files changed, 3260 insertions(+), 322 deletions(-) diff --git a/themes/sbvfrd/less/accordion.less b/themes/sbvfrd/less/accordion.less index c277ca83784..2f719c364ae 100644 --- a/themes/sbvfrd/less/accordion.less +++ b/themes/sbvfrd/less/accordion.less @@ -12,7 +12,7 @@ margin-top: 20px; i { - color: @favorite_dark; + //color: @favorite_dark; } .holdingsAjaxSpinner { @@ -48,27 +48,27 @@ &[aria-expanded=false] { - &:hover:before { - color: @theme-color; - } + &:hover:before { + color: @theme-color; + } - &:before { - .icon(); - content: '\f0da'; - } + &:before { + .icon(); + content: '\f0da'; + } } &[aria-expanded=true] { - &:hover:before { - color: @theme-color; - } + &:hover:before { + color: @theme-color; + } - &:before { - .icon(); - content: '\f0d7'; - } + &:before { + .icon(); + content: '\f0d7'; + } } } @@ -77,6 +77,17 @@ .panel-body { padding: 0; + + p:first-child { + padding: 10px 0 0 0; + } + + ul a { + text-decoration: underline; + } + ol a { + text-decoration: underline; + } } /** 2nd level specific/overwrites **/ diff --git a/themes/sbvfrdmulti/templates/Auth/MultiILS/loginfields.phtml b/themes/sbvfrdmulti/templates/Auth/MultiILS/loginfields.phtml index 065dbd95f8b..5883575e852 100644 --- a/themes/sbvfrdmulti/templates/Auth/MultiILS/loginfields.phtml +++ b/themes/sbvfrdmulti/templates/Auth/MultiILS/loginfields.phtml @@ -1,4 +1,4 @@ -

    transEsc('logininfo.multi.text.1') ?>

    +

    transEsc('logininfo.multi.text.1') ?>

    transEsc('logininfo.multi.text.2') ?> transEsc('contact_form') ?>

    transEsc('logininfo.multi.text.3') ?> transEsc('Create New Account') ?>

    @@ -779,9 +774,7 @@ ) ?>" target="_blank">Bern is free, and delivery takes one working day. -
  • The IDS delivery service runs between Basel, +
  • The IDS delivery service runs between Basel, Bern, Luzern, St.Gallen and Zurich. One delivery costs 5 CHF, which you will need to pay in cash when you come to pick up your order. Delivery takes two diff --git a/themes/sbvfrdmulti/templates/HelpPage/fr/faq.phtml b/themes/sbvfrdmulti/templates/HelpPage/fr/faq.phtml index 27ba56c8004..a1c0ddeeeb2 100644 --- a/themes/sbvfrdmulti/templates/HelpPage/fr/faq.phtml +++ b/themes/sbvfrdmulti/templates/HelpPage/fr/faq.phtml @@ -3,7 +3,7 @@
    • -
  • The IDS delivery service IDS delivery service operates between +
  • IDS delivery service operates between Basel, Bern, Luzern, St.Gallen and Zurich. The dispatch costs 5 CHF, which you will need to pay in cash when you pick up the item. The item will arrive after two working days. If you want to order items from Luzern, St.Gallen or Zurich, you can order them - through this

    - +

    @@ -708,9 +703,7 @@ href="redirectProtocolWrapper() ->getWrappedURL( 'http://www.unibe.ch/universitaet/dienstleistungen/universitaetsbibliothek/service/ausleihe/kurier/index_ger.html' - ) ?>" target="_blank">Bern or the IDS - delivery service.

    + ) ?>" target="_blank">Bern, IDS delivery service.

    The return of items is free.

    @@ -781,9 +774,7 @@ ) ?>" target="_blank">Bern is free, and delivery takes one working day.
    • -
  • The IDS delivery service runs between Basel, +
  • The IDS delivery service runs between Basel, Bern, Luzern, St.Gallen and Zurich. One delivery costs 5 CHF, which you will need to pay in cash when you come to pick up your order. Delivery takes two @@ -800,7 +791,7 @@

The costs noted above only apply to the libraries of the - University of Basel and Bern. You can find costs for + University of Basel and Bern. You can find costs of other libraries on their respective websites.

diff --git a/themes/sbvfrdmulti/templates/HelpPage/it/faq.phtml b/themes/sbvfrdmulti/templates/HelpPage/it/faq.phtml index 27ba56c8004..a1c0ddeeeb2 100644 --- a/themes/sbvfrdmulti/templates/HelpPage/it/faq.phtml +++ b/themes/sbvfrdmulti/templates/HelpPage/it/faq.phtml @@ -3,7 +3,7 @@