Bug 9214 - Show damaged status in the OPAC for items which are not for loan

[koha.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 277742a..d7399e8 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -186,7 +186,9 @@ Directory for Zebra configuration files.
 
 =item ZEBRA_LOCK_DIR
 
-Directory for Zebra's lock files.
+Directory for Zebra's lock files.  This includes subdirs for authorities,
+biblios, and the zebra rebuild function.  Any activity to reindex
+zebra from koha should interlock here with rebuild_zebra.pl.
 
 =item ZEBRA_DATA_DIR
 
@@ -318,6 +320,7 @@ my $target_map = {
   './skel/var/lib/koha/zebradb/biblios/register'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
   './skel/var/lib/koha/zebradb/biblios/shadow'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
   './skel/var/lib/koha/zebradb/biblios/tmp'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
+  './skel/var/lock/koha/zebradb/rebuild' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
   './skel/var/lib/koha/plugins' => { target => 'PLUGINS_DIR', trimdir => 6 },
   './sms'                       => 'INTRANET_CGI_DIR',
   './suggestion'                => 'INTRANET_CGI_DIR',
@@ -557,6 +560,10 @@ $config{ZEBRA_TOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
     ? 'icuchain words-icu.xml'
     : 'charmap word-phrase-utf.chr';
 
+$config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+    ? 'icuchain phrases-icu.xml'
+    : 'charmap word-phrase-utf.chr';
+
 my %test_suite_override_dirs = (
     KOHA_CONF_DIR  => ['etc'],
     ZEBRA_CONF_DIR => ['etc', 'zebradb'],
@@ -953,10 +960,10 @@ Primary language for Zebra indexing);
 Koha can use one of  two different indexing modes
 for the MARC bibliographic records:
 
-grs1 - uses the Zebra GRS-1 filter, available
-       for legacy support
 dom  - uses the DOM XML filter; offers improved
        functionality.
+grs1 - [DEPRECATED] uses the Zebra GRS-1 filter,
+       available for legacy support
 
 Bibliographic indexing mode);
     $msg .= _add_valid_values_disp('BIB_INDEX_MODE', $valid_values);
@@ -967,10 +974,10 @@ Bibliographic indexing mode);
 Koha can use one of  two different indexing modes
 for the MARC authorities records:
 
-grs1 - uses the Zebra GRS-1 filter, available
-       for legacy support
 dom  - uses the DOM XML filter; offers improved
        functionality.
+grs1 - [DEPRECATED] uses the Zebra GRS-1 filter,
+       available for legacy support
 
 Authorities indexing mode);
     $msg .= _add_valid_values_disp('AUTH_INDEX_MODE', $valid_values);
@@ -1252,7 +1259,9 @@ sub get_target_directories {
         $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');
         $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
         $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
-        $dirmap{'SCRIPT_NONDEV_DIR'} = $dirmap{'SCRIPT_DIR'};
+        #For dev install, point NONDEV_DIR to misc in current dir (not base)
+        #Used by supportdir in koha-conf.xml (BZ 12031)
+        $dirmap{'SCRIPT_NONDEV_DIR'} = File::Spec->catdir($curdir, 'misc');
         $skipdirs{'SCRIPT_NONDEV_DIR'} = 1;
         $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
         $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');