[Koha-cvs] koha/C4 SearchMarc.pm Search.pm

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	
Changes by:	Joshua Ferraro <kados at savannah.gnu.org>	06/03/08 18:12:42

Modified files:
	C4             : SearchMarc.pm Search.pm 

Log message:
	Hopefully a fix for hdl's accented characters not working. NOTE: BY
	DEFAULT, MARC::File::XML will turn UTF-8 into MARC-8 in the new_as_xml
	method ... to keep it as UTF-8 you must specify a second parameter 'UTF-8'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/SearchMarc.pm.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Search.pm.diff?tr1=1.117&tr2=1.118&r1=text&r2=text

Patches:
Index: koha/C4/Search.pm
diff -u koha/C4/Search.pm:1.117 koha/C4/Search.pm:1.118
--- koha/C4/Search.pm:1.117	Mon Mar  6 15:39:02 2006
+++ koha/C4/Search.pm	Wed Mar  8 18:12:42 2006
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.117 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.118 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -90,7 +90,7 @@
     my @results;
     while ( $i < $n && $i < $number ) {
         $raw = $rs->record($i)->raw();
-        my $record = MARC::Record->new_from_xml($raw);
+        my $record = MARC::Record->new_from_xml($raw, 'UTF-8');
         my $line = MARCmarc2koha( $dbh, $record );
         push @results, $line;
 #	 push @results,$raw;
@@ -124,7 +124,7 @@
         print "Error ", $@->code(), ": ", $@->message(), "\n";
     }
     ###$raw
-    my $record = MARC::Record->new_from_xml($raw);
+    my $record = MARC::Record->new_from_xml($raw, 'UTF-8');
     ###$record
     return ($record);
 }
Index: koha/C4/SearchMarc.pm
diff -u koha/C4/SearchMarc.pm:1.60 koha/C4/SearchMarc.pm:1.61
--- koha/C4/SearchMarc.pm:1.60	Tue Mar  7 20:32:52 2006
+++ koha/C4/SearchMarc.pm	Wed Mar  8 18:12:42 2006
@@ -267,7 +267,7 @@
 		# get the MARC record (in XML)...
 		# warn "REC $i = ".$rs->record($i)->raw();
 # FIXME : it's a silly way to do things : XML => MARC::Record => hash. We had better developping a XML=> hash (in biblio.pm)
-		my $record = MARC::Record->new_from_xml($rs->record($i)->raw());
+		my $record = MARC::Record->new_from_xml($rs->record($i)->raw(), 'UTF-8');
 		# transform it into a meaningul hash
 		my $line = MARCmarc2koha($dbh,$record);
 		my $biblionumber=$line->{biblionumber};