[Koha-patches] [PATCH] Search Results ordering by 'publication' date and popularity fixes. Sort drop-down has 'Publication/' removed and value copydate_asc|dsc copydate => copydate 30 [260c] popularity => issues 8019 [952l] Note: copydate cannot at this stage be set as default (but pubdate still can be)

[Chris Cormack]

From: Will Stokes <will at catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 C4/Search.pm                                       |   10 ++++++++--
 .../intranet-tmpl/prog/en/includes/resort_form.inc |   14 +++++++-------
 .../opac-tmpl/prog/en/includes/resort_form.inc     |   10 +++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 554174c..a548ec1 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -358,10 +358,10 @@ sub getRecords {
                 $sort_by .= "1=1003 >i ";
             }
             elsif ( $sort eq "popularity_asc" ) {
-                $sort_by .= "1=9003 <i ";
+                $sort_by .= "1=8019 <i ";
             }
             elsif ( $sort eq "popularity_dsc" ) {
-                $sort_by .= "1=9003 >i ";
+                $sort_by .= "1=8019 >i ";
             }
             elsif ( $sort eq "call_number_asc" ) {
                 $sort_by .= "1=20  <i ";
@@ -369,6 +369,12 @@ sub getRecords {
             elsif ( $sort eq "call_number_dsc" ) {
                 $sort_by .= "1=20 >i ";
             }
+            elsif ( $sort eq "copydate_asc" ) {
+                $sort_by .= "1=30 <i ";
+            }
+            elsif ( $sort eq "copydate_dsc" ) {
+                $sort_by .= "1=30 >i ";
+            }
             elsif ( $sort eq "pubdate_asc" ) {
                 $sort_by .= "1=31 <i ";
             }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 22c9d0e..251021a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -47,16 +47,16 @@
 </optgroup>
 
 <optgroup label="Dates">
-	<!-- TMPL_IF NAME="pubdate_dsc" -->
-<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
-	<!-- TMPL_ELSE -->
-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
+<!-- TMPL_IF NAME="copydate_dsc" -->
+<option value="copydate_dsc" selected="selected" >Copyright Date: Newest to Oldest</option>
+<!-- TMPL_ELSE -->
+<option value="copydate_dsc">Copyright Date: Newest to Oldest</option>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="pubdate_asc" -->
-<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
+<!-- TMPL_IF NAME="copydate_asc" -->
+<option value="copydate_asc" selected="selected" >Copyright Date: Oldest to Newest</option>
 <!-- TMPL_ELSE -->
-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
+<option value="copydate_asc">Copyright Date: Oldest to Newest</option>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="acqdate_dsc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
index 1ea5941..c877da1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
@@ -17,11 +17,11 @@
 <option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option><!-- TMPL_ELSE -->
 <option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option><!-- /TMPL_IF -->
 </optgroup>
-<optgroup label="Dates"><!-- TMPL_IF NAME="pubdate_dsc" -->
-<option value="pubdate_dsc" selected="selected">Publication/Copyright Date: Newest to Oldest</option><!-- TMPL_ELSE -->
-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option><!-- /TMPL_IF --><!-- TMPL_IF NAME="pubdate_asc" -->
-<option value="pubdate_asc" selected="selected">Publication/Copyright Date: Oldest to Newest</option><!-- TMPL_ELSE -->
-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option><!-- /TMPL_IF --><!-- TMPL_IF NAME="acqdate_dsc" -->
+<optgroup label="Dates"><!-- TMPL_IF NAME="copydate_dsc" -->
+<option value="copydate_dsc" selected="selected">Copyright Date: Newest to Oldest</option><!-- TMPL_ELSE -->
+<option value="copydate_dsc">Copyright Date: Newest to Oldest</option><!-- /TMPL_IF --><!-- TMPL_IF NAME="copydate_asc" -->
+<option value="copydate_asc" selected="selected">Copyright Date: Oldest to Newest</option><!-- TMPL_ELSE -->
+<option value="copydate_asc">Copyright Date: Oldest to Newest</option><!-- /TMPL_IF --><!-- TMPL_IF NAME="acqdate_dsc" -->
 <option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option><!-- TMPL_ELSE -->
 <option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option><!-- /TMPL_IF --><!-- TMPL_IF NAME="acqdate_asc" -->
 <option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option><!-- TMPL_ELSE -->
-- 
1.6.3.3