Attachment 67580 Details for Bug 19368 – Bug 19368 - Ignore words when sorting serial search

[patch] Bug 19368 - Ignore words when sorting serial search

Bug-19368---Ignore-words-when-sorting-serial-searc.patch (text/plain), 7.58 KB, created by Alex Buckley on 2017-10-04 00:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-10-04 00:25:33 UTC

Size: 7.58 KB

patch

obsolete

>From 3edb33fbb40bcc7c991caa0b01ffb6339f3276cd Mon Sep 17 00:00:00 2001
>From: David Bourgault <david.bourgault@inlibro.com>
>Date: Tue, 26 Sep 2017 13:43:05 -0400
>Subject: [PATCH] Bug 19368 - Ignore words when sorting serial search
>
>This adds the 'SerialSortIgnoreWords' system preference.
>It is empty by default, since words to ignore are very much language-specific.
>
>The functionality is achieved by adding a hidden column to the table, and sorting by this column by default. The downfall of this solution is that if the user sorts by another column, they cannot go back to this sorting without refreshing the page.
>
>To test:
>0) Apply patch
>1) Run updatedatabase.pl
>2) Add test subscriptions if you have none.
>    Make sure to have subscriptions starting with "The An A" or similar
>3) Go to system preferences and edit the SerialSortIgnoreWords pref
>    Add the words "The An A" or the ones you used in your subscriptions
>4) Go to Serials
>5) Search serials (empty field will return all serials)
>6) Result table should be sorted ignoring leading "The An A..."
>
>Followed test plan, patch works as described
>Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
>---
> .../BugUndef-SerialSortIgnoreWords.sql             |  1 +
> installer/data/mysql/sysprefs.sql                  |  1 +
> .../prog/en/modules/admin/preferences/serials.pref |  5 ++++
> .../prog/en/modules/serials/serials-search.tt      |  7 +++++-
> serials/serials-search.pl                          | 27 +++++++++++++++++++---
> 5 files changed, 37 insertions(+), 4 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>
>diff --git a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql b/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>new file mode 100644
>index 0000000..5bcdfda
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql
>@@ -0,0 +1 @@
>+INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free');
>\ No newline at end of file
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index bc08b5a..4e11b26 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -476,6 +476,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),
> ('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
> ('SeparateHoldingsBranch','homebranch','homebranch|holdingbranch','Branch used to separate holdings','Choice'),
>+('SerialSortIgnoreWords','des du de la le les leur d l an a the',NULL,'Words to ignore in serial search','Free'),
> ('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),
> ('SessionStorage','mysql','mysql|Pg|tmp','Use database or a temporary file for storing session data','Choice'),
> ('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
>index 76c89a8..ca8df98 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
>@@ -56,3 +56,8 @@ Serials:
>             yes: Make
>             no: Do not make
>         - previous serial automatically available when receiving a new serial issue. The previous issue can also be set to another item type when receiving a new one. Please note that the item-level_itypes syspref must be set to specific item.
>+    -
>+        - 'Ignore the following words when sorting the serial search result table (separate words with spaces) :'
>+        - pref: SerialSortIgnoreWords
>+          class: free
>+    -
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 1728fb0..f072cb1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -13,6 +13,8 @@
>     var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
>         "sPaginationType": "four_button",
>         "aoColumnDefs": [
>+            { 'visible' : false, "targets" : 0},
>+            { "iDataSort" : 0, 'aTargets' : [ 2 ] },
>             { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
>             { "sType": "title-string", "aTargets" : [ "title-string" ] },
>             { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
>@@ -36,6 +38,7 @@
>       return confirm(_("Are you sure you want to reopen this subscription?"));
>     });
>  });
>+  $
>  //]]>
> </script>
> <style type="text/css">input.dt-filter { width : 100%; font-size : 85%; }</style>
>@@ -142,6 +145,7 @@
>                 <table id="osrlt">
>                   <thead>
>                     <tr>
>+                        <th>Sort</th>
>                         <th>ISSN</th>
>                         <th class="anti-the">Title</th>
>                         <th>Notes</th>
>@@ -167,13 +171,14 @@
>                       [% FOR field IN additional_fields_for_subscription %]
>                         <td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name %]" /></td>
>                       [% END %]
>-                      <td></td>
>+                      <td colspan="2"></td>
>                     </tr>
>                   </tfoot>
>                   <tbody>
>                     [% FOREACH subscription IN openedsubscriptions %]
>                     [% UNLESS subscription.cannotdisplay %]
>                       <tr>
>+                        <td>[% IF ( subscription.titlesort ) %][% subscription.titlesort %][% END %]</td>
>                         <td>
>                         [% IF ( subscription.issn ) %][% subscription.issn %]
>                         [% END %]
>diff --git a/serials/serials-search.pl b/serials/serials-search.pl
>index 30bf7db..3904e70 100755
>--- a/serials/serials-search.pl
>+++ b/serials/serials-search.pl
>@@ -37,6 +37,9 @@ use C4::Output;
> use C4::Serials;
> use Koha::AdditionalField;
> 
>+use Encode;
>+use Unicode::Normalize;
>+
> use Koha::DateUtils;
> 
> my $query         = new CGI;
>@@ -119,11 +122,29 @@ if ($routing) {
>     }
> }
> 
>+#sort stopword by  string length
>+my @sortedstopword = sort{ length $b <=> length $a } split ( / / ,C4::Context->preference("SerialSortIgnoreWords"));
>+my $subsctitle;
> my (@openedsubscriptions, @closedsubscriptions);
> for my $sub ( @subscriptions ) {
>-    unless ( $sub->{closed} ) {
>-        push @openedsubscriptions, $sub
>-            unless $sub->{cannotdisplay};
>+    $subsctitle = $sub->{title} ? ucfirst($sub->{title}): '' ;
>+    if ($subsctitle){
>+        $subsctitle = NFKD($subsctitle);
>+        $subsctitle =~ s/\p{NonspacingMark}//g;
>+        foreach my $stop (@sortedstopword){
>+            my $ucfirststop = ucfirst($stop);
>+            $subsctitle =~ s/$ucfirststop'//;
>+            $subsctitle =~ s/$ucfirststop //;
>+        }
>+    }
>+    $subsctitle =~ s/^\s+//;
>+    $sub->{titlesort} = ucfirst($subsctitle);
>+
>+    warn $subsctitle;
>+
>+     unless ( $sub->{closed} ) {
>+         push @openedsubscriptions, $sub
>+             unless $sub->{cannotdisplay};
>     } else {
>         push @closedsubscriptions, $sub
>             unless $sub->{cannotdisplay};
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19368: 67373 | 67447 | 67580 | 67581 | 67612 | 69005 | 70051 | 70052 | 70053 | 70125 | 71962 | 71963 | 71964 | 71965 | 72043 | 72044 | 72045 | 72046 | 72047 | 72655 | 72656 | 72657 | 72658 | 72659 | 74262 | 74263 | 74264 | 74265 | 74266 | 90915 | 90916 | 90918 | 90919 | 90920 | 90921 | 113018 | 113019 | 113020 | 113021 | 113022 | 113023 | 113344 | 113345 | 113346 | 113347 | 113348 | 113349 | 118963 | 118964 | 118965 | 118966 | 118967 | 118968 | 124090 | 124091 | 124092 | 124093 | 124094 | 124095 | 124096 | 124097 | 124104 | 124105 | 124106 | 124107 | 124108 | 124109 | 124110 | 124111