X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FCharset.pm;h=2950a71a8bd4ccd3b9078af061c6b9a34381c8af;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=c294b361331489a29eb771456d415fea95b8f7a0;hpb=7183a241c4f696c0f7cea9868ee82573328fe98a;p=koha_fer

diff --git a/C4/Charset.pm b/C4/Charset.pm
index c294b36133..2950a71a8b 100644
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -22,6 +22,7 @@ use warnings;
 
 use MARC::Charset qw/marc8_to_utf8/;
 use Text::Iconv;
+use C4::Context;
 use C4::Debug;
 use Unicode::Normalize;
 
@@ -43,6 +44,8 @@ BEGIN {
     );
 }
 
+=encoding UTF-8
+
 =head1 NAME
 
 C4::Charset - utilities for handling character set conversions.
@@ -131,23 +134,26 @@ But since it handles charset, and MARC::Record, it finds its way in that package
 =cut
 
 sub SetUTF8Flag{
-	my ($record, $nfd)=@_;
-	return unless ($record && $record->fields());
-	foreach my $field ($record->fields()){
-		if ($field->tag()>=10){
-			my @subfields;
-			foreach my $subfield ($field->subfields()){
-				push @subfields,($$subfield[0],NormalizeString($$subfield[1],$nfd));
-			}
-			my $newfield=MARC::Field->new(
-							$field->tag(),
-							$field->indicator(1),
-							$field->indicator(2),
-							@subfields
-						);
-			$field->replace_with($newfield);
-		}
-	}
+    my ($record, $nfd)=@_;
+    return unless ($record && $record->fields());
+    foreach my $field ($record->fields()){
+        if ($field->tag()>=10){
+            my @subfields;
+            foreach my $subfield ($field->subfields()){
+                push @subfields,($$subfield[0],NormalizeString($$subfield[1],$nfd));
+            }
+            eval {
+                my $newfield=MARC::Field->new(
+                            $field->tag(),
+                            $field->indicator(1),
+                            $field->indicator(2),
+                            @subfields
+                        );
+                $field->replace_with($newfield);
+            };
+            warn "ERROR occurred in SetUTF8Flag $@" if $@;
+        }
+    }
 }
 
 =head2 NormalizeString
@@ -324,8 +330,10 @@ sub SetMarcUnicodeFlag {
         substr($leader, 9, 1) = 'a';
         $marc_record->leader($leader); 
     } elsif ($marc_flavour =~/UNIMARC/) {
+	my $defaultlanguage = C4::Context->preference("UNIMARCField100Language");
+        $defaultlanguage = "fre" if (!$defaultlanguage || length($defaultlanguage) != 3);
         my $string; 
-		my ($subflength,$encodingposition)=($marc_flavour=~/AUTH/?(21,9):(36,22));
+		my ($subflength,$encodingposition)=($marc_flavour=~/AUTH/?(21,12):(36,25));
 		$string=$marc_record->subfield( 100, "a" );
         if (defined $string && length($string)==$subflength) { 
 			$string = substr $string, 0,$subflength if (length($string)>$subflength);
@@ -333,9 +341,10 @@ sub SetMarcUnicodeFlag {
         else { 
             $string = POSIX::strftime( "%Y%m%d", localtime ); 
             $string =~ s/\-//g; 
-            $string = sprintf( "%-*s", $subflength, $string ); 
+            $string = sprintf( "%-*s", $subflength, $string );
+	    substr ( $string, ($encodingposition - 3), 3, $defaultlanguage);
         } 
-        substr( $string, $encodingposition, 8, "frey50  " ); 
+        substr( $string, $encodingposition, 3, "y50" );
         if ( $marc_record->subfield( 100, "a" ) ) { 
 			$marc_record->field('100')->update(a=>$string);
 		}
@@ -343,7 +352,7 @@ sub SetMarcUnicodeFlag {
             $marc_record->insert_grouped_field( 
                 MARC::Field->new( 100, '', '', "a" => $string ) ); 
         }
-		$debug && warn "encodage: ", substr( $marc_record->subfield(100, 'a'), $encodingposition, 8 );
+		$debug && warn "encodage: ", substr( $marc_record->subfield(100, 'a'), $encodingposition, 3 );
     } else {
         warn "Unrecognized marcflavour: $marc_flavour";
     }