View | Details | Raw Unified | Return to bug 8610
Collapse All | Expand All

(-)a/C4/Breeding.pm (+3 lines)
Lines 94-99 sub ImportBreeding { Link Here
94
        ($marcrecord, $charset_result, $charset_errors) = 
94
        ($marcrecord, $charset_result, $charset_errors) = 
95
            MarcToUTF8Record($marcarray[$i]."\x1D", C4::Context->preference("marcflavour"), $encoding);
95
            MarcToUTF8Record($marcarray[$i]."\x1D", C4::Context->preference("marcflavour"), $encoding);
96
        
96
        
97
        # Normalize the record so it doesn't have separated diacritics
98
        SetUTF8Flag($marcrecord);
99
97
#         warn "$i : $marcarray[$i]";
100
#         warn "$i : $marcarray[$i]";
98
        # FIXME - currently this does nothing 
101
        # FIXME - currently this does nothing 
99
        my @warnings = $marcrecord->warnings();
102
        my @warnings = $marcrecord->warnings();
(-)a/C4/ImportBatch.pm (+4 lines)
Lines 382-387 sub BatchStageMarcRecords { Link Here
382
        if (scalar($marc_record->fields()) == 0) {
382
        if (scalar($marc_record->fields()) == 0) {
383
            push @invalid_records, $marc_blob;
383
            push @invalid_records, $marc_blob;
384
        } else {
384
        } else {
385
386
            # Normalize the record so it doesn't have separated diacritics
387
            SetUTF8Flag($marc_record);
388
385
            $num_valid++;
389
            $num_valid++;
386
            if ($record_type eq 'biblio') {
390
            if ($record_type eq 'biblio') {
387
                $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0);
391
                $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0);
(-)a/acqui/z3950_search.pl (+4 lines)
Lines 277-282 warn "query ".$query if $DEBUG; Link Here
277
## In HEAD i change everything to UTF-8
277
## In HEAD i change everything to UTF-8
278
# In rel2_2 i am not sure what encoding is so no character conversion is done here
278
# In rel2_2 i am not sure what encoding is so no character conversion is done here
279
##Add necessary encoding changes to here -TG
279
##Add necessary encoding changes to here -TG
280
281
                        # Normalize the record so it doesn't have separated diacritics
282
                        SetUTF8Flag($marcrecord);
283
280
                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
284
                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
281
                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
285
                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
282
                        # pad | and ( with spaces to allow line breaks in the HTML
286
                        # pad | and ( with spaces to allow line breaks in the HTML
(-)a/cataloguing/z3950_search.pl (-1 / +4 lines)
Lines 249-254 warn "query ".$query if $DEBUG; Link Here
249
## In HEAD i change everything to UTF-8
249
## In HEAD i change everything to UTF-8
250
# In rel2_2 i am not sure what encoding is so no character conversion is done here
250
# In rel2_2 i am not sure what encoding is so no character conversion is done here
251
##Add necessary encoding changes to here -TG
251
##Add necessary encoding changes to here -TG
252
253
                        # Normalize the record so it doesn't have separated diacritics
254
                        SetUTF8Flag($marcrecord);
255
252
                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
256
                        my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
253
                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
257
                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
254
                        # pad | and ( with spaces to allow line breaks in the HTML
258
                        # pad | and ( with spaces to allow line breaks in the HTML
255
- 

Return to bug 8610