[Koha-cvs] koha/C4 Biblio.pm [rel_2_2]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Joshua Ferraro <kados>	06/08/04 15:00:50

Modified files:
	C4             : Biblio.pm 

Log message:
	fix for bug 1139: ISBN search fails with double dashes
	
	In fact, ISBNs shouldn't have dashes inserted if they already exist
	in the ISBN field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.115.2.59&r2=1.115.2.60

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.59
retrieving revision 1.115.2.60
diff -u -b -r1.115.2.59 -r1.115.2.60
--- Biblio.pm	3 Aug 2006 16:10:53 -0000	1.115.2.59
+++ Biblio.pm	4 Aug 2006 15:00:50 -0000	1.115.2.60
@@ -26,7 +26,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.115.2.59 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.115.2.60 $' =~ /\d+/g;
                     shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 @ISA = qw(Exporter);
@@ -2840,6 +2840,10 @@
 
 sub DisplayISBN {
 	my ($isbn)=@_;
+	if ($isbn =~ /-/) {
+		return $isbn;
+	}
+	else {
 	my $seg1;
 	if(substr($isbn, 0, 1) <=7) {
 		$seg1 = substr($isbn, 0, 1);
@@ -2872,6 +2876,7 @@
 	$seg3=substr($seg3,0,length($seg3)-1) ;
 	my $seg4 = substr($x, -1, 1);
 	return "$seg1-$seg2-$seg3-$seg4";
+	}
 }
 
 =head2 getitemstatus
@@ -3010,8 +3015,14 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.115.2.59 2006/08/03 16:10:53 tipaul Exp $
+# $Id: Biblio.pm,v 1.115.2.60 2006/08/04 15:00:50 kados Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.115.2.60  2006/08/04 15:00:50  kados
+# fix for bug 1139: ISBN search fails with double dashes
+#
+# In fact, ISBNs shouldn't have dashes inserted if they already exist
+# in the ISBN field.
+#
 # Revision 1.115.2.59  2006/08/03 16:10:53  tipaul
 # fix for 1052 : Major Bug in MARC tables Sync
 #