X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FCharset.pm;h=f8ddd63627fb3fb817deec662d73df8e2dab0157;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=8b69848d5dd5f8bdd6f25aad5c7b969821ac9ad0;hpb=c9d0c168679d6b225e305b45331e1e86ee4939d1;p=koha.git

diff --git a/C4/Charset.pm b/C4/Charset.pm
index 8b69848d5d..f8ddd63627 100644
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -29,7 +29,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 BEGIN {
     # set the version for version checking
-    $VERSION = 3.01;
+    $VERSION = 3.07.00.049;
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
@@ -324,8 +324,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 +335,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 +346,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";
     }