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

Ryan Higgins rch at liblime.com
Thu Apr 26 15:49:44 CEST 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Ryan Higgins <rych>	07/04/26 13:49:44

Modified files:
	C4             : Breeding.pm 

Log message:
	wrap utf-8 conversion in syspref so we dont break things for UNIMARC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Breeding.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.6&r2=1.7.2.7

Patches:
Index: Breeding.pm
===================================================================
RCS file: /sources/koha/koha/C4/Breeding.pm,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -b -r1.7.2.6 -r1.7.2.7
--- Breeding.pm	10 Apr 2007 22:37:02 -0000	1.7.2.6
+++ Breeding.pm	26 Apr 2007 13:49:44 -0000	1.7.2.7
@@ -75,6 +75,7 @@
 		my $marcrecord = MARC::File::USMARC::decode($marcarray[$i]."\x1D");
 #		my @warnings = $marcrecord->warnings();
         # run through a roundtrip, check encoding, and convert to UTF-8
+        if (C4::Context->preference("TemplateEncoding") eq 'utf-8') {
         my $xmlrecord = $marcrecord->as_xml;
         my $newmarcrecord;
         eval {  
@@ -91,7 +92,7 @@
             warn "WARN".$warning;
         }
         $marcrecord = $newmarcrecord;
-
+		}
 		if (scalar($marcrecord->fields()) == 0) {
 			$notmarcrecord++;
             print "===================NOT MARCRECORD================";





More information about the Koha-cvs mailing list