From 5f92f900807b91563c4904fe7072b8de939237c2 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 17 Apr 2019 01:48:52 +0000 Subject: [PATCH] Bug 14715: (follow-up) Fixing database updates This patch removes the atomic update that adds the 'perPage' system preferences and keeps the 'dropdown' system preferences. Also sql file is moved into perl file. --- .../mysql/atomicupdate/bug_14715-searchresults_syspref.sql | 3 --- .../bug_14715_-_results_per_page_dropdown_sysprefs.perl | 11 +++++++++++ .../bug_14715_-_results_per_page_dropdown_sysprefs.sql | 3 --- installer/data/mysql/sysprefs.sql | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql create mode 100644 installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.perl delete mode 100644 installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql diff --git a/installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql b/installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql deleted file mode 100644 index c0f3545..0000000 --- a/installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES - ('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), - ('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo'); diff --git a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.perl b/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.perl new file mode 100644 index 0000000..298c672 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.perl @@ -0,0 +1,11 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES + ('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), + ('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo') + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 14715 - Add sysprefs numSearchResultsDropdown and OPACnumSearchResultsDropdown)\n"; +} diff --git a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql b/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql deleted file mode 100644 index 5b98e89..0000000 --- a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES -('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), -('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo') diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 19953f7..f078449 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -327,7 +327,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'), ('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'), ('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'), -('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo'), +('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo'), ('numSearchRSSResults','50',NULL,'Specify the maximum number of results to display on a RSS page of results','Integer'), ('OAI-PMH','0',NULL,'if ON, OAI-PMH server is enabled','YesNo'), ('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'), @@ -396,7 +396,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACNoResultsFound','','70|10','Display this HTML when no results are found for a search in the OPAC','Textarea'), ('OPACNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number OPAC searches','YesNo'), ('OPACnumSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'), -('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), +('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), ('OpacPasswordChange','1',NULL,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)','YesNo'), ('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'), ('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'), -- 2.1.4