Attachment #31129 for bug #12478

View | Details | Raw Unified | Return to bug 12478
Collapse All | Expand All

Lines 345-351 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
345	('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),	345	('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
346	('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),	346	('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
347	('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),	347	('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),
348	('SearchEngine','Zebra','Solr\|Zebra','Search Engine','Choice'),	348	('SearchEngine','Zebra','Elasticsearch\|Solr\|Zebra','Search Engine','Choice'),
349	('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),	349	('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
350	('SelfCheckHelpMessage','','70\|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),	350	('SelfCheckHelpMessage','','70\|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
351	('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),	351	('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),




    SetVersion($DBversion);
}

$DBversion = "3.17.00.015";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
    my $installer = C4::Installer->new();
    my $full_path = C4::Context->config('intranetdir') . "/installer/data/$installer->{dbms}/elasticsearch_mapping.sql";
    my $error     = $installer->load_sql($full_path);
    warn $error if $error;
    print "Upgrade to $DBversion done (Bug 12478 - set up elasticsearch tables)\n";
    SetVersion($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 16-22 the kohaversion is divided in 4 parts : Link Here

(-)a/kohaversion.pl (-2 / +1 lines)
16	use strict;	16	use strict;
17		17
18	sub kohaversion {	18	sub kohaversion {
19	our $VERSION = '3.17.00.014';	19	our $VERSION = '3.17.00.015';
20	# version needs to be set this way	20	# version needs to be set this way
21	# so that it can be picked up by Makefile.PL	21	# so that it can be picked up by Makefile.PL
22	# during install	22	# during install
23	-

Return to bug 12478

Lines 8613-8618 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
8613	SetVersion($DBversion);	8613	SetVersion($DBversion);
8614	}	8614	}
8615		8615
		8616	$DBversion = "3.17.00.015";
		8617	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
		8618	my $installer = C4::Installer->new();
		8619	my $full_path = C4::Context->config('intranetdir') . "/installer/data/$installer->{dbms}/elasticsearch_mapping.sql";
		8620	my $error = $installer->load_sql($full_path);
		8621	warn $error if $error;
		8622	print "Upgrade to $DBversion done (Bug 12478 - set up elasticsearch tables)\n";
		8623	SetVersion($DBversion);
		8624	}
		8625
8616	=head1 FUNCTIONS	8626	=head1 FUNCTIONS
8617		8627
8618	=head2 TableExists($table)	8628	=head2 TableExists($table)