Merge branch 'develop'

languages/cs.ini

@@ -1021,6 +1021,7 @@ KNAV = "Knihovna Akademie věd ČR"
 KNKR = "Knihovna Kroměřížska"
 KTN = "Knihovna a tiskárna pro nevidomé K.E. Macana"
 KVKL = "Krajská vědecká knihovna v Liberci"
+KKKV = "Krajská knihovna Karlovy Vary"
 MAS = "Masarykův ústav a Archiv Akademie věd ČR"
 MEND = "Mendelova univerzita v Brně"
 MKHK = "Knihovna města Hradce Králové"
@@ -1935,6 +1936,7 @@ source_kkkv = Krajská knihovna Karlovy Vary
 source_kkl = Databáze knihovnické literatury
 source_kkpc = Krajská knihovna v Pardubicích
 source_kkvy = Krajská knihovna Vysočiny
+source_kmol = Knihovna města Olomouce
 source_knav = Knihovna Akademie věd ČR
 source_knep = "Knihovna Eduarda Petišky"
 source_knihbib = Knihovědná bibliografie
@@ -2003,7 +2005,9 @@ source_mkmt = Městská knihovna Ladislava z Boskovic v Moravské Třebové
 source_mkp = Městská knihovna v Praze
 source_mkpe = Městská knihovna v Praze - E-knihovna
 source_mkplzen = Knihovna města Plzně
+source_mkricany = Husova knihovna Říčany
 source_mksvit = Městská knihovna ve Svitavách
+source_mktrebic = Městská knihovna v Třebíči
 source_mktri = Knihovna Třinec
 source_mktrut = Městská knihovna Trutnov
 source_mkuo = Městská knihovna Ústí nad Orlicí
@@ -2249,13 +2253,13 @@ Institution = Instituce
 2/Library/MS/MKOR/ = Městská knihovna Orlová
 2/Library/MS/SVKOS/ = Moravskoslezská vědecká knihovna v Ostravě
 2/Library/MS/MKTRI/ = Knihovna Třinec
-2/Library/MS/MKFM/ = Městská knihovna Frýdek-Místek
 
 1/Library/OL/ = Olomoucký kraj
 2/Library/OL/MKSTER/ = Městská knihovna Šternberk
 2/Library/OL/UPOL/ = Univerzita Palackého v Olomouci
 2/Library/OL/MKPR/ = Městská knihovna v Přerově
 2/Library/OL/VKOL/ = Vědecká knihovna Olomouc
+2/Library/OL/KMOL/ = Knihovna města Olomouce
 
 1/Library/PA/ = Pardubický kraj
 2/Library/PA/KKPC/ = Krajská knihovna v Pardubicích
@@ -2277,6 +2281,7 @@ Institution = Instituce
 2/Library/SC/MKKH/ = Městská Knihovna Kutná Hora
 2/Library/SC/KJDPB/ = Knihovna Jana Drdy Příbram
 2/Library/SC/MKKOLIN/ = Městská knihovna Kolín
+2/Library/SC/MKRICANY/ = Husova knihovna Říčany
 
 1/Library/US/ = Ústecký kraj
 2/Library/US/SVKUL/ = Severočeská vědecká knihovna v Ústí nad Labem
@@ -2286,6 +2291,7 @@ Institution = Instituce
 1/Library/VY/ = kraj Vysočina
 2/Library/VY/MKPEL/ = Městská knihovna Pelhřimov
 2/Library/VY/KKVY/ = Krajská knihovna Vysočiny Havlíčkův Brod
+2/Library/VY/MKTREBIC/ = Městská knihovna v Třebíči
 
 1/Library/ZL/ = Zlínský kraj
 2/Library/ZL/KNIR/ = Městská knihovna v Rožnově pod Radhoštěm

languages/en.ini

@@ -1035,6 +1035,7 @@ KNAV = "Academy of Sciences Library"
 KTN = "Library and Printing House for the Blind"
 KVKL = "Regional Research Library in Liberec"
 KNKR = "Kromeriz Public Library"
+KKKV = "Regional Library of Karlovy Vary"
 MAS = "Masaryk Institute and Archive of the ASCR"
 MEND = "Mendel University in Brno"
 MKHK = "Municipal Library of Hradec Kralove"
@@ -1920,6 +1921,7 @@ source_kjm = Jiří Mahen Library in Brno
 source_kfbz = František Bartoš Regional Library in Zlin
 source_kkkv = Regional Library of Karlovy Vary
 source_kkl = Database of the Library Literature
+source_kmol = The Library of the City Olomouc
 source_kkpc = Regional Library of Pardubice
 source_kkdvy = Karel Dvoracek Library in Vyskov
 source_kkvy = Regional Library of Vysočina
@@ -1983,6 +1985,7 @@ source_mkmil = Municipal Library in Milevsko
 source_mkmt = Municipal Library in Moravska Trebova
 source_mkp = Municipal Library of Prague
 source_mkpe = Municipal Library of Prague - E-library
+source_mktrebic = Municipal Library in Třebíč
 source_mktrut = Municipal Library in Trutnov
 source_mkuo = Municipal Library Ústí nad Orlicí
 source_muzibib = Musicological bibliographical database
@@ -2025,6 +2028,7 @@ source_mkpisek = Municipal Library Pisek
 source_mkck = Municipal Library in Cesky Krumlov
 source_mkpel = Municipal Library Pelhrimov
 source_mkplzen = Pilsen City Library
+source_mkricany = "Huss' Library Ricany"
 source_mkhnm = Municipal Library of Hradec nad Moravicí
 source_mkostrov = Municipal Library Ostrov
 source_mkmost = Municipal Library in Most
@@ -2383,13 +2387,13 @@ Institution = Institution
 2/Library/MS/MKOR/ = Municipal Library in Orlova
 2/Library/MS/SVKOS/ = Moravian-Silesian Research Library in Ostrava
 2/Library/MS/MKTRI/	= Library in Trinec
-2/Library/MS/MKFM/ = Municipal Library in Frydek-Mistek
 
 1/Library/OL/ = Olomouc Region
 2/Library/OL/MKSTER/ = Municipal Library Šternberk
 2/Library/OL/UPOL/ = Palacky University in Olomouc
 2/Library/OL/MKPR/ = Municipal Library in Prerov
 2/Library/OL/VKOL/ = Research Library in Olomouc
+2/Library/OL/KMOL/ = The Library of the City Olomouc
 
 1/Library/PA/ = Pardubice Region
 2/Library/PA/KKPC/ = Regional Library of Pardubice
@@ -2412,6 +2416,7 @@ Institution = Institution
 2/Library/SC/MKKH/ = Municipal Library of Kutná Hora
 2/Library/SC/KJDPB/ = Jan Drda´s Library Příbram
 2/Library/SC/MKKOLIN/ = Municipal Library Kolín
+2/Library/SC/MKRICANY/ = "Huss' Library Ricany"
 
 1/Library/US/ = Ústí Region
 2/Library/US/SVKUL/ = North Bohemian Research Library
@@ -2421,6 +2426,7 @@ Institution = Institution
 1/Library/VY/ = Vysočina Region
 2/Library/VY/MKPEL/	= Municipal Library Pelhrimov
 2/Library/VY/KKVY/ = Regional Library of Vysočina
+2/Library/VY/MKTREBIC/ = Municipal Library in Třebíč
 
 1/Library/ZL/ = Zlín Region
 2/Library/ZL/KNIR/ = Municipal Library in Roznov pod Radhostem

local/knihovny/config/vufind/MultiBackend.ini

@@ -43,6 +43,7 @@ kjm     = XCNCIP2V2
 kkdvy   = XCNCIP2V2
 kkkv    = XCNCIP2V2
 kkvy	= XCNCIP2V2
+kmol    = XCNCIP2V2
 knep    = XCNCIP2V2
 knihkm  = XCNCIP2V2
 kpsys	= XCNCIP2V2
@@ -72,7 +73,9 @@ mkpisek = XCNCIP2V2
 mkplzen  = XCNCIP2V2
 mkpr    = XCNCIP2V2
 mkp	= XCNCIP2V2
+mkricany   = XCNCIP2V2
 mksvit  = XCNCIP2V2
+mktrebic = XCNCIP2V2
 mktri   = XCNCIP2V2
 mktrut  = XCNCIP2V2
 mkzn    = XCNCIP2V2
@@ -246,6 +249,7 @@ kkkv	= KVG001
 kkl	= ABA003
 kkpc	= PAG001
 kkvy	= HBG001
+kmol    = OLG001
 knav	= ABA007
 knep    = ABG503
 knihkm  = KMG001
@@ -276,7 +280,9 @@ mkp	= ABG001
 mkpisek = PIG001
 mkplzen = PNG001
 mkpr    = PRG001
+mkricany = ABG502
 mksvit  = SVG001
+mktrebic = TRG001
 mktri   = FMG502
 mktrut  = TUG001
 mkzn    = ZNG001
@@ -308,6 +314,7 @@ kkkv     = 000001311
 kkl      = 000000003
 kkpc     = 000001619
 kkvy     = 000001105
+kmol     = 000001514
 knav     = 000000007
 knep     = 000000696
 knihkm   = 000001274
@@ -338,7 +345,9 @@ mkpisek  = 000001657
 mkplzen  = 000001707
 mkpr     = 000001716
 mkp      = 000000687
+mkricany = 000000695
 mksvit   = 000001854
+mktrebic = 000001903
 mktri    = 000001092
 mktrut   = 000001925
 mkuo     = 000001986

local/knihovny/config/vufind/config.local.ini.example

@@ -145,7 +145,7 @@ list_sorting = random
 techlib_url = "https://ziskej.techlib.cz"
 default_mode = "prod"
 default_mode_mvs = "disabled"
-default_mode_edd = "disabled"
+default_mode_edd = "test"
 modes["prod"] = "https://ziskej.techlib.cz:9080/api/v1"
 modes["test"] = "https://ziskej-test.techlib.cz:9080/api/v1"
 modes["demo"] = "https://ziskej-demo.techlib.cz:9080/api/v1"

local/knihovny/config/vufind/facets.ini

@@ -252,6 +252,9 @@ kjm    = "2/Library/JM/KJM/"
 mkchom = "2/Library/US/MKCHOM/"
 mkfm = "2/Library/MS/MKFM/"
 mkboskovice = "2/Library/JM/MKBOSKOVICE/"
+mkricany  = "2/Library/SC/MKRICANY/"
+kmol   = "2/Library/OL/KMOL"
+mktrebic = "2/Library/VY/MKTREBIC/"
 
 [SFXesForLibraries]
 ;Example mzk = "sfxjibmzk"
@@ -314,6 +317,9 @@ mkkolin = "null"
 mkmt    = "null"
 mkfm    = "null"
 mkboskovice = "null"
+mkricany   = "null"
+kmol    = "null"
+mktrebic = "null"
 
 [DigitalLibrarieForLibraries]
 ;Example mzk = "mzk-kram,mzk-kram2"
@@ -375,6 +381,9 @@ mkkolin = "null"
 mkmt    = "null"
 mkfm    = "null"
 mkboskovice = "null"
+mkricany = "null"
+kmol    = "null"
+mktrebic = "null"
 
 [PreferredFacets]
 language[] = Czech

local/knihovny/config/vufind/searchspecs.yaml

@@ -340,6 +340,8 @@ AllFields:
     - fulltext_analyser_txt_mv^5
     - semantic_enrichment_txt_mv^5
     - auto_conspectus_txt_mv^5
+    - author_search_txt_mv
+    - title_search_txt_mv
   DismaxParams:
     - [bq, "inspiration:top_results^1"]
     - [bf, "if(exists(merged_records_boolean),10000,0)" ]
@@ -446,6 +448,7 @@ adv_search_title_series:
     - titleSeries_search_txt_mv
     - uniftitle_viz
     - title_old_spelling_txt_mv
+    - title_search_txt_mv
   DismaxParams:
     - [bq, "inspiration:top_results^1"]
     - [bf, "if(exists(merged_records_boolean),10000,0)" ]
@@ -471,6 +474,7 @@ adv_search_author_corporation:
     - author_additional
     - author_find
     - authorCorporation_search_txt_mv
+    - author_search_txt_mv
   DismaxParams:
     - [bq, "inspiration:top_results^1"]
     - [bf, "if(exists(merged_records_boolean),10000,0)" ]

local/knihovny/config/vufind/shibboleth.ini

@@ -549,6 +549,33 @@ email           = mail
 logout          = global
 warn_msg        = false
 
+[mkricany]
+name_cs         = Husova knihovna Říčany
+name_en         = "Huss' Library Ricany"
+entityId        = https://knihovna.ricany.cz/idp/shibboleth
+cat_username    = userLibraryId
+email           = mail
+logout          = global
+warn_msg        = false
+
+[kmol]
+name_cs         = Knihovna města Olomouc
+name_en         = The Library of the City Olomouc
+entityId        = https://kmol.cz/idp/shibboleth
+cat_username    = userLibraryId
+email           = mail
+logout          = global
+warn_msg        = false
+
+[mktrebic]
+name_cs         = Městská knihovna v Třebíči
+name_en         = Municipal Library in Třebíč
+entityId        = https://knihovnatr.cz/idp/shibboleth
+cat_username    = userLibraryId
+email           = mail
+logout          = global
+warn_msg        = false
+
 ; Other IdPs - notice they're not libraries because they do not provide any cat_username
 ;
 ; ADD LIBRARIES ABOVE

themes/bootstrap3/templates/ziskej/home.phtml

@@ -25,7 +25,6 @@ $this->layout()->searchbox = false;
           <?php endforeach; ?>
         </select>
       </div>
-      <?php if(false): ?>
       <div class="form-group">
         <label for="selectZiskejEdd"><?=$this->translate('label_ziskej_edd_mode') ?>: </label>
         <select name="ziskejEddMode" class="form-control" id="selectZiskejEdd">
@@ -36,7 +35,6 @@ $this->layout()->searchbox = false;
           <?php endforeach; ?>
         </select>
       </div>
-      <?php endif; ?>
       <div class="form-group">
         <input class="btn btn-primary" type="submit" name="submitZiskej" title="<?=$this->translate('Set') ?>" value="<?=$this->translate('Set') ?>">
       </div>