Bug 10572: Add phone to message_transport_types table for new installs

[koha.git] / C4 / ClassSortRoutine / Dewey.pm

diff --git a/C4/ClassSortRoutine/Dewey.pm b/C4/ClassSortRoutine/Dewey.pm
index a105d65..25480ec 100644 (file)
--- a/C4/ClassSortRoutine/Dewey.pm
+++ b/C4/ClassSortRoutine/Dewey.pm
@@ -13,17 +13,17 @@ package C4::ClassSortRoutine::Dewey;
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-require Exporter;
+use warnings;
 
 use vars qw($VERSION);
 
 # set the version for version checking
-$VERSION = 3.00;
+$VERSION = 3.07.00.049;
 
 =head1 NAME 
 
@@ -45,7 +45,7 @@ Generates sorting key using the following rules:
 
 * Concatenates class and item part.
 * Converts to uppercase.
-* Removes leading and trailing whitespace
+* Removes leading and trailing whitespace and '/'
 * Separates alphabetic prefix from the rest of the call number
 * Splits into tokens on whitespaces and periods.
 * Leaves first digit group as is.
@@ -58,21 +58,32 @@ Generates sorting key using the following rules:
 sub get_class_sort_key {
     my ($cn_class, $cn_item) = @_;
 
+    $cn_class = '' unless defined $cn_class;
+    $cn_item  = '' unless defined $cn_item;
     my $init = uc "$cn_class $cn_item";
     $init =~ s/^\s+//;
     $init =~ s/\s+$//;
+    $init =~ s!/!!g;
     $init =~ s/^([\p{IsAlpha}]+)/$1 /;
     my @tokens = split /\.|\s+/, $init;
     my $digit_group_count = 0;
+    my $first_digit_group_idx;
     for (my $i = 0; $i <= $#tokens; $i++) {
         if ($tokens[$i] =~ /^\d+$/) {
             $digit_group_count++;
+            if (1 == $digit_group_count) {
+                $first_digit_group_idx = $i;
+            }
             if (2 == $digit_group_count) {
                 $tokens[$i] = sprintf("%-15.15s", $tokens[$i]);
                 $tokens[$i] =~ tr/ /0/;
             }
         }
     }
+    # Pad the first digit_group if there was only one
+    if (1 == $digit_group_count) {
+        $tokens[$first_digit_group_idx] .= '_000000000000000'
+    }
     my $key = join("_", @tokens);
     $key =~ s/[^\p{IsAlnum}_]//g;
 
@@ -84,7 +95,7 @@ sub get_class_sort_key {
 
 =head1 AUTHOR
 
-Koha Developement team <info@koha.org>
+Koha Development Team <http://koha-community.org/>
 
 =cut