[Koha-cvs] koha/acqui.simple addbiblio.pl [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <address@hidden>   06/06/02 15:32:52

Modified files:
        acqui.simple   : addbiblio.pl 

Log message:
        - moving active color to grey instead of yellow
        - ******** IMPORTANT *********
        if TemplateEncoding system preference is set to iso8859-1, there are a 
lot of encoding problems : MARC::File::XML don't like it, as MARC::Record is 
supposed to work in MARC8 or UNICODE.
        Thus, it seems that all accents are transformed in the process html => 
xml => marc.
        Thus, i've reintroduced the html => marc behaviour if the 
TemplateEncoding is set to iso8859-1
        (i've fixed the html2marc as joshua proposed previously, fixing a 
remaining bug)
        
        This solution is a workaround : we will have to find a correct solution 
for Koha 3.0, to move every Koha to UNICODE and UNICODE only. But for instance, 
I tried some things but failed. Thust this solution, that works correctly for 
french libraries and should change nothing for unicode ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/acqui.simple/addbiblio.pl.diff?only_with_tag=rel_2_2&tr1=1.52.2.40&tr2=1.52.2.41&r1=text&r2=text

Patches:
Index: koha/acqui.simple/addbiblio.pl
diff -u koha/acqui.simple/addbiblio.pl:1.52.2.40 
koha/acqui.simple/addbiblio.pl:1.52.2.41
--- koha/acqui.simple/addbiblio.pl:1.52.2.40    Fri Apr 21 08:54:55 2006
+++ koha/acqui.simple/addbiblio.pl      Fri Jun  2 15:32:52 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.52.2.40 2006/04/21 08:54:55 hdl Exp $
+# $Id: addbiblio.pl,v 1.52.2.41 2006/06/02 15:32:52 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -177,7 +177,6 @@
                        push @authorised_values, $itemtype;
                        $authorised_lib{$itemtype}=$description;
                }
-               $value=$itemtype unless ($value);
 
        #---- "true" authorised value
        } else {
@@ -212,7 +211,7 @@
        my %subfield_data;
        $subfield_data{tag}=$tag;
        $subfield_data{subfield}=$subfield;
-       $subfield_data{marc_lib}="<span 
id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</span>";
+       $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib};
        $subfield_data{marc_lib_plain}=$tagslib->{$tag}->{$subfield}->{lib};
        $subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory};
        $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
@@ -225,7 +224,7 @@
                $subfield_data{marc_value}= build_authorized_values_list($tag, 
$subfield, $value, $dbh,$authorised_values_sth);
        # it's a thesaurus / authority field
        } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
-               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#ffff00;'\"\" tabindex=\"1\" 
type=\"text\" name=\"field_value\" value=\"$value\" size=\"70\" 
maxlength=\"255\" DISABLE READONLY> <a  style=\"cursor: help;\" 
href=\"javascript:openAuth('tag$tag','$tagslib->{$tag}->{$subfield}->{authtypecode}','subfield$tag$i')\">...</a>";
+               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#DDDDDD;'\"\" tabindex=\"1\" 
type=\"text\" name=\"field_value\" value=\"$value\" size=\"70\" 
maxlength=\"255\" DISABLE READONLY> <a  style=\"cursor: help;\" 
href=\"javascript:openAuth('tag$tag','$tagslib->{$tag}->{$subfield}->{authtypecode}','subfield$tag$i')\">...</a>";
        # it's a plugin field
        } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
                # opening plugin. Just check wether we are on a developper 
computer on a production one
@@ -241,15 +240,15 @@
                $subfield_data{marc_value}="<input tabindex=\"1\" type=\"text\" 
name=\"field_value\"  value=\"$value\" size=\"70\" maxlength=\"255\" 
OnFocus=\"javascript:Focus$function_name($i)\" 
OnBlur=\"javascript:Blur$function_name($i); \"> <a  style=\"cursor: help;\" 
href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
        # it's an hidden field
        } elsif  ($tag eq '') {
-               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#ffff00'; \" tabindex=\"1\" 
type=\"hidden\" name=\"field_value\" value=\"$value\">";
+               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#DDDDDD'; \" tabindex=\"1\" 
type=\"hidden\" name=\"field_value\" value=\"$value\">";
        } elsif  ($tagslib->{$tag}->{$subfield}->{'hidden'}) {
-               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#ffff00'; \" tabindex=\"1\" type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"70\" maxlength=\"255\" >";
+               $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#DDDDDD'; \" tabindex=\"1\" type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"70\" maxlength=\"255\" >";
        # it's a standard field
        } else {
                if (length($value) >100) {
                        $subfield_data{marc_value}="<textarea tabindex=\"1\" 
name=\"field_value\" cols=\"40\" rows=\"5\" >$value</textarea>";
                } else {
-                       $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#ffff00'; \" tabindex=\"1\" type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"70\">"; #"
+                       $subfield_data{marc_value}="<input 
onblur=\"this.style.backgroundColor='#ffffff';\" 
onfocus=\"this.style.backgroundColor='#DDDDDD'; \" tabindex=\"1\" type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"70\">"; #"
                }
        }
        return \%subfield_data;
@@ -486,11 +485,13 @@
        # build indicator hash.
        my @ind_tag = $input->param('ind_tag');
        my @indicator = $input->param('indicator');
-       my $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
-       #warn $xml;
-       my 
$record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
-       #warn $record->as_formatted;
-       #warn "IN ADDBIB";
+       my $record;
+       if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
+               $record = 
MARChtml2marc($dbh,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
+       } else {
+               my $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
+               
$record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
+       }
        # check for a duplicate
        my ($duplicatebiblionumber,$duplicatebibid,$duplicatetitle) = 
FindDuplicate($record) if ($op eq "addbiblio") && (!$is_a_modif);
        my $confirm_not_duplicate = $input->param('confirm_not_duplicate');