Bug 19821: Install sample data, ES mappings and Version syspref
authorJulian Maurice <julian.maurice@biblibre.com>
Fri, 16 Feb 2018 15:00:34 +0000 (16:00 +0100)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 25 Oct 2021 09:27:40 +0000 (11:27 +0200)
Also move .proverc to .proverc.dist, so it cannot be used by accident.

Different ways to use it:

1/ prove --rc .proverc.dist
   Use defaults

2/ cp .proverc.dist .proverc && prove
   Allows to configure db name, marcflavour, and prove options

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Bouzid Fergani <bouzid.fergani@inlibro.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
.proverc [deleted file]
.proverc.dist [new file with mode: 0644]
t/lib/Bootstrap.pm

diff --git a/.proverc b/.proverc
deleted file mode 100644 (file)
index c5b8cf5..0000000
--- a/.proverc
+++ /dev/null
@@ -1 +0,0 @@
--Mt::lib::Bootstrap=database,koha_test
diff --git a/.proverc.dist b/.proverc.dist
new file mode 100644 (file)
index 0000000..d73f363
--- /dev/null
@@ -0,0 +1 @@
+-Mt::lib::Bootstrap=database,koha_test,marcflavour,MARC21
index 7fac260..1b70030 100644 (file)
@@ -60,14 +60,18 @@ sub import {
     $installer->load_db_schema();
     $installer->set_marcflavour_syspref($args{marcflavour});
     my (undef, $fwklist) = $installer->marc_framework_sql_list('en', $args{marcflavour});
+    my (undef, $list) = $installer->sample_data_sql_list('en');
     my @frameworks;
-    foreach my $fwk (@$fwklist) {
+    foreach my $fwk (@$fwklist, @$list) {
         foreach my $framework (@{ $fwk->{frameworks} }) {
             push @frameworks, $framework->{fwkfile};
         }
     }
     my $all_languages = C4::Languages::getAllLanguages();
     $installer->load_sql_in_order($all_languages, @frameworks);
+    require Koha::SearchEngine::Elasticsearch;
+    Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings;
+    $installer->set_version_syspref();
 }
 
 1;