From e14fdf1f5e9a54fe693f48daabf36a07a47e759b Mon Sep 17 00:00:00 2001 From: toins Date: Tue, 31 Jul 2007 16:03:09 +0000 Subject: [PATCH] addbiblio cleaned. TODO: There is still a encoding pb when modifying a biblio. --- cataloguing/addbiblio.pl | 1048 +++++++++-------- cataloguing/additem.pl | 2 +- .../prog/en/cataloguing/addbiblio.tmpl | 681 +++++++---- .../prog/en/includes/intranet2.css | 158 ++- 4 files changed, 1119 insertions(+), 770 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index f51d63051e..9ebe8dce3f 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -21,64 +21,24 @@ use strict; use CGI; -use C4::Auth; use C4::Output; +use C4::Auth; use C4::Biblio; use C4::Search; use C4::AuthoritiesMarc; use C4::Context; use MARC::Record; use C4::Log; -use C4::Koha; # XXX subfield_is_koha_internal_p +use C4::Koha; # XXX subfield_is_koha_internal_p use Date::Calc qw(Today); - use MARC::File::USMARC; use MARC::File::XML; -if (C4::Context->preference('marcflavour') eq 'UNIMARC') { - MARC::File::XML->default_record_format( 'UNIMARC' ); -} - -use vars qw( $tagslib); -use vars qw( $authorised_values_sth); -use vars qw( $is_a_modif ); -my $itemtype; # created here because it can be used in build_authorized_values_list sub - -=item find_value - - ($indicators, $value) = find_value($tag, $subfield, $record,$encoding); - -Find the given $subfield in the given $tag in the given -MARC::Record $record. If the subfield is found, returns -the (indicators, value) pair; otherwise, (undef, undef) is -returned. - -=cut - -sub find_value { - my ($tagfield,$insubfield,$record,$encoding) = @_; - my @result; - my $indicator; - if ($tagfield <10) { - if ($record->field($tagfield)) { - push @result, $record->field($tagfield)->data(); - } else { - push @result,""; - } - } else { - foreach my $field ($record->field($tagfield)) { - my @subfields = $field->subfields(); - foreach my $subfield (@subfields) { - if (@$subfield[0] eq $insubfield) { - push @result,@$subfield[1]; - $indicator = $field->indicator(1).$field->indicator(2); - } - } - } - } - return($indicator,@result); +if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) { + MARC::File::XML->default_record_format('UNIMARC'); } +our($tagslib,$authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950); =item MARCfindbreeding @@ -92,89 +52,108 @@ Returns as second parameter the character encoding. =cut sub MARCfindbreeding { - my ($dbh,$id) = @_; - my $sth = $dbh->prepare("select file,marc,encoding from marc_breeding where id=?"); + my ( $dbh, $id ) = @_; + my $sth = + $dbh->prepare("select file,marc,encoding from marc_breeding where id=?"); $sth->execute($id); - my ($file,$marc,$encoding) = $sth->fetchrow; + my ( $file, $marc, $encoding ) = $sth->fetchrow; if ($marc) { my $record = MARC::Record->new_from_usmarc($marc); - if ($record->field('010')){ - foreach my $field ($record->field('010')) - { - foreach my $subfield ($field->subfield('a')){ + if ( $record->field('010') ) { + foreach my $field ( $record->field('010') ) { + foreach my $subfield ( $field->subfield('a') ) { my $newisbn = $field->subfield('a'); $newisbn =~ s/-//g; $field->update( 'a' => $newisbn ); } - # $record->insert_fields_ordered($record->field('010')); - } + # record->insert_fields_ordered($record->field('010')); + } } + if ($record->subfield(100,'a')) { my $f100a=$record->subfield(100,'a'); my $f100 = $record->field(100); my $f100temp = $f100->as_string; $record->delete_field($f100); - if (length($f100temp)>28) { - substr($f100temp,26,2,"50"); - $f100->update('a' => $f100temp); - my $f100 = MARC::Field->new('100','','','a' => $f100temp); + if ( length($f100temp) > 28 ) { + substr( $f100temp, 26, 2, "50" ); + $f100->update( 'a' => $f100temp ); + my $f100 = MARC::Field->new( '100', '', '', 'a' => $f100temp ); $record->insert_fields_ordered($f100); } } - if (ref($record) eq undef) { + + if ( ref($record) eq undef ) { return -1; - } else { - if (C4::Context->preference("z3950NormalizeAuthor") and C4::Context->preference("z3950AuthorAuthFields")){ - my ($tag,$subfield) = GetMarcFromKohaField("biblio.author"); -# my $summary = C4::Context->preference("z3950authortemplate"); - my $auth_fields = C4::Context->preference("z3950AuthorAuthFields"); - my @auth_fields= split /,/,$auth_fields; + } + else { + if ( C4::Context->preference("z3950NormalizeAuthor") + and C4::Context->preference("z3950AuthorAuthFields") ) + { + my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author"); + + # my $summary = C4::Context->preference("z3950authortemplate"); + my $auth_fields = + C4::Context->preference("z3950AuthorAuthFields"); + my @auth_fields = split /,/, $auth_fields; my $field; - #warn $record->as_formatted; - if ($record->field($tag)){ - foreach my $tmpfield ($record->field($tag)->subfields){ -# foreach my $subfieldcode ($tmpfield->subfields){ - my $subfieldcode=shift @$tmpfield; - my $subfieldvalue=shift @$tmpfield; - if ($field){ - $field->add_subfields("$subfieldcode"=>$subfieldvalue) if ($subfieldcode ne $subfield); - } else { - $field=MARC::Field->new($tag,"","",$subfieldcode=>$subfieldvalue) if ($subfieldcode ne $subfield); + + if ( $record->field($tag) ) { + foreach my $tmpfield ( $record->field($tag)->subfields ) { + + # foreach my $subfieldcode ($tmpfield->subfields){ + my $subfieldcode = shift @$tmpfield; + my $subfieldvalue = shift @$tmpfield; + if ($field) { + $field->add_subfields( + "$subfieldcode" => $subfieldvalue ) + if ( $subfieldcode ne $subfield ); + } + else { + $field = + MARC::Field->new( $tag, "", "", + $subfieldcode => $subfieldvalue ) + if ( $subfieldcode ne $subfield ); } } -# warn $field->as_formatted; -# } } - $record->delete_field($record->field($tag)); - foreach my $fieldtag (@auth_fields){ - next unless ($record->field($fieldtag)); - my $lastname = $record->field($fieldtag)->subfield('a'); - my $firstname= $record->field($fieldtag)->subfield('b'); - my $title = $record->field($fieldtag)->subfield('c'); - my $number= $record->field($fieldtag)->subfield('d'); - if ($title){ + $record->delete_field( $record->field($tag) ); + foreach my $fieldtag (@auth_fields) { + next unless ( $record->field($fieldtag) ); + my $lastname = $record->field($fieldtag)->subfield('a'); + my $firstname = $record->field($fieldtag)->subfield('b'); + my $title = $record->field($fieldtag)->subfield('c'); + my $number = $record->field($fieldtag)->subfield('d'); + if ($title) { + # $field->add_subfields("$subfield"=>"[ ".ucfirst($title).ucfirst($firstname)." ".$number." ]"); - $field->add_subfields("$subfield"=>ucfirst($title)." ".ucfirst($firstname)." ".$number); - }else{ -# $field->add_subfields("$subfield"=>"[ ".ucfirst($firstname).", ".ucfirst($lastname)." ]"); - $field->add_subfields("$subfield"=>ucfirst($firstname).", ".ucfirst($lastname)); + $field->add_subfields( + "$subfield" => ucfirst($title) . " " + . ucfirst($firstname) . " " + . $number ); + } + else { + +# $field->add_subfields("$subfield"=>"[ ".ucfirst($firstname).", ".ucfirst($lastname)." ]"); + $field->add_subfields( + "$subfield" => ucfirst($firstname) . ", " + . ucfirst($lastname) ); } } $record->insert_fields_ordered($field); } - return $record,$encoding; + return $record, $encoding; } } return -1; } - =item build_authorized_values_list =cut -sub build_authorized_values_list ($$$$$) { - my($tag, $subfield, $value, $dbh,$authorised_values_sth) = @_; +sub build_authorized_values_list ($$$$$$$) { + my ( $tag, $subfield, $value, $dbh, $authorised_values_sth,$index_tag,$index_subfield ) = @_; my @authorised_values; my %authorised_lib; @@ -182,47 +161,95 @@ sub build_authorized_values_list ($$$$$) { # builds list, depending on authorised value... #---- branch - if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) { - my $sth=$dbh->prepare("select branchcode,branchname from branches order by branchname"); - $sth->execute; - push @authorised_values, "" - unless ($tagslib->{$tag}->{$subfield}->{mandatory}); - - while (my ($branchcode,$branchname) = $sth->fetchrow_array) { - push @authorised_values, $branchcode; - $authorised_lib{$branchcode}=$branchname; - } + if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) { + my $sth = + $dbh->prepare( + "select branchcode,branchname from branches order by branchname"); + $sth->execute; + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + + while ( my ( $branchcode, $branchname ) = $sth->fetchrow_array ) { + push @authorised_values, $branchcode; + $authorised_lib{$branchcode} = $branchname; + } - #----- itemtypes - } elsif ($tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes") { - my $sth=$dbh->prepare("select itemtype,description from itemtypes order by description"); + #----- itemtypes + } + elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { + my $sth = + $dbh->prepare( + "select itemtype,description from itemtypes order by description"); $sth->execute; - push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory}); - - while (my ($itemtype,$description) = $sth->fetchrow_array) { + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + + my $itemtype; + + while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) { push @authorised_values, $itemtype; - $authorised_lib{$itemtype}=$description; + $authorised_lib{$itemtype} = $description; } - $value=$itemtype unless ($value); + $value = $itemtype unless ($value); - #---- "true" authorised value - } else { - $authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value}); + #---- "true" authorised value + } + else { + $authorised_values_sth->execute( + $tagslib->{$tag}->{$subfield}->{authorised_value} ); - push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory}); - - while (my ($value,$lib) = $authorised_values_sth->fetchrow_array) { + push @authorised_values, "" + unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + + while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { push @authorised_values, $value; - $authorised_lib{$value}=$lib; + $authorised_lib{$value} = $lib; } } - return CGI::scrolling_list( -name => 'field_value', - -values => \@authorised_values, - -default => $value, - -labels => \%authorised_lib, - -override => 1, - -size => 1, - -multiple => 0 ); + return CGI::scrolling_list( + -name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield, + -values => \@authorised_values, + -default => $value, + -labels => \%authorised_lib, + -override => 1, + -size => 1, + -multiple => 0, + -tabindex => 1, + -id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield, + -class => "input_marceditor", + ); +} + +=item CreateKey + + Create a random value to set it into the input name + +=cut + +sub CreateKey(){ + return int(rand(1000000)); +} + +=item GetMandatoryFieldZ3950 + + This function return an hashref which containts all mandatory field + to search with z3950 server. + +=cut + +sub GetMandatoryFieldZ3950($){ + my $frameworkcode = shift; + my @isbn = GetMarcFromKohaField('biblioitems.isbn',$frameworkcode); + my @title = GetMarcFromKohaField('biblio.title',$frameworkcode); + my @author = GetMarcFromKohaField('biblio.author',$frameworkcode); + my @issn = GetMarcFromKohaField('biblioitems.issn',$frameworkcode); + + return { + $isbn[0].$isbn[1] => 'isbn', + $title[0].$title[1] => 'title', + $author[0].$author[1] => 'author', + $issn[0].$issn[1] => 'issn', + }; } =item create_input @@ -231,387 +258,461 @@ sub build_authorized_values_list ($$$$$) { =cut -sub create_input () { - my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_; - # must be encoded as utf-8 before it reaches the editor - #use Encode; - #$value = encode('utf-8', $value); +sub create_input { + my ( $tag, $subfield, $value, $index_tag, $tabloop, $rec, $authorised_values_sth,$cgi ) = @_; + + my $index_subfield = CreateKey(); # create a specifique key for each subfield + $value =~ s/"/"/g; - # if there is no value provided but a default value in parameters, get it + + # if there is no value provided but a default value in parameters, get it unless ($value) { $value = $tagslib->{$tag}->{$subfield}->{defaultvalue}; + # get today date & replace YYYY, MM, DD if provided in the default value - my ($year,$month,$day) = Today(); - $month = sprintf("%02d",$month); - $day = sprintf("%02d",$day); + my ( $year, $month, $day ) = Today(); + $month = sprintf( "%02d", $month ); + $day = sprintf( "%02d", $day ); $value =~ s/YYYY/$year/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; - } my $dbh = C4::Context->dbh; - my %subfield_data; - $subfield_data{tag}=$tag; - $subfield_data{subfield}=$subfield; - $subfield_data{marc_lib}="{$tag}->{$subfield}->{lib}."\">".substr($tagslib->{$tag}->{$subfield}->{lib},0,15).""; - $subfield_data{marc_lib_plain}=$tagslib->{$tag}->{$subfield}->{lib}; - $subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory}; - $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory}; - $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable}; - $subfield_data{kohafield}=$tagslib->{$tag}->{$subfield}->{kohafield}; - $subfield_data{index} = $i; - $subfield_data{visibility} = "display:none" unless (($tagslib->{$tag}->{$subfield}->{hidden}%2==0) or $value ne ''); #check parity + my %subfield_data = ( + tag => $tag, + subfield => $subfield, + marc_lib => substr( $tagslib->{$tag}->{$subfield}->{lib}, 0, 22 ), + marc_lib_plain => $tagslib->{$tag}->{$subfield}->{lib}, + tag_mandatory => $tagslib->{$tag}->{mandatory}, + mandatory => $tagslib->{$tag}->{$subfield}->{mandatory}, + repeatable => $tagslib->{$tag}->{$subfield}->{repeatable}, + kohafield => $tagslib->{$tag}->{$subfield}->{kohafield}, + index => $index_tag, + id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield, + value => $value, + ); + if($subfield eq '@'){ + $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_tag."_".$index_subfield; + } else { + $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield; + } + + if(exists $mandatory_z3950->{$tag.$subfield}){ + $subfield_data{z3950_mandatory} = $mandatory_z3950->{$tag.$subfield}; + } + + $subfield_data{visibility} = "display:none;" + unless ( ( $tagslib->{$tag}->{$subfield}->{hidden} % 2 == 0 ) + or $value ne '' ); #check parity + # it's an authorised field - if ($tagslib->{$tag}->{$subfield}->{authorised_value}) { - $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth); + if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { + $subfield_data{marc_value} = + build_authorized_values_list( $tag, $subfield, $value, $dbh, + $authorised_values_sth,$index_tag,$index_subfield ); + # it's a thesaurus / authority field - } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) { - $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">..."; + } + elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) { + $subfield_data{marc_value} = + " + {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">... + "; # it's a plugin field - } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) { + } + elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) { + # opening plugin. Just check wether we are on a developper computer on a production one # (the cgidir differs) - my $cgidir = C4::Context->intranetdir ."/cgi-bin/cataloguing/value_builder"; - unless (opendir(DIR, "$cgidir")) { - $cgidir = C4::Context->intranetdir."/cataloguing/value_builder"; + my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder"; + unless ( opendir( DIR, "$cgidir" ) ) { + $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder"; } - my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; + my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'}; + do $plugin; - my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop); - my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop); - $subfield_data{marc_value}=" ... $javascript"; - # it's an hidden field - } elsif ($tag eq '') { - $subfield_data{marc_value}=""; - } elsif ($tagslib->{$tag}->{$subfield}->{'hidden'}) { - $subfield_data{marc_value}=""; - # it's a standard field - } else { - if (length($value) >100 or (C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >=300 and $tag <400 && $subfield eq 'a') or ($tag >=500 and $tag <600 && C4::Context->preference("marcflavour") eq "MARC21")) { - $subfield_data{marc_value}=""; - } else { - $subfield_data{marc_value}=""; #" + my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop ); + my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop ); +# my ( $function_name, $javascript,$extended_param ); + + $subfield_data{marc_value} = + " + ... + $javascript"; + # it's an hidden field + } + elsif ( $tag eq '' ) { + $subfield_data{marc_value} = + " + "; + } + elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { + $subfield_data{marc_value} = + ""; + + # it's a standard field + } + else { + if ( + length($value) > 100 + or + ( C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >= 300 + and $tag < 400 && $subfield eq 'a' ) + or ( $tag >= 500 + and $tag < 600 + && C4::Context->preference("marcflavour") eq "MARC21" ) + ) + { + $subfield_data{marc_value} = + " + "; + } + else { + $subfield_data{marc_value} = + " + "; } } + $subfield_data{'index_subfield'} = $index_subfield; return \%subfield_data; } -sub build_tabs ($$$$) { - my($template, $record, $dbh,$encoding) = @_; +sub build_tabs ($$$$$) { + my ( $template, $record, $dbh, $encoding,$input ) = @_; + # fill arrays - my @loop_data =(); + my @loop_data = (); my $tag; - my $i=0; - my $authorised_values_sth = $dbh->prepare("select authorised_value,lib + + my $authorised_values_sth = $dbh->prepare( + "select authorised_value,lib from authorised_values - where category=? order by lib"); + where category=? order by lib" + ); # in this array, we will push all the 10 tabs # to avoid having 10 tabs in the template : they will all be in the same BIG_LOOP my @BIG_LOOP; - -# loop through each tab 0 through 9 - for (my $tabloop = 0; $tabloop <= 9; $tabloop++) { - my @loop_data = (); - foreach my $tag (sort(keys (%{$tagslib}))) { + my %seen; + my @tab_data; # all tags to display + + foreach my $used ( @$usedTagsLib ){ + push @tab_data,$used->{tagfield} if not $seen{$used->{tagfield}}; + $seen{$used->{tagfield}}++; + } + + my $max_num_tab=-1; + foreach(@$usedTagsLib){ + if($_->{tab} > -1 && $_->{tab} >= $max_num_tab && $_->{tagfield} != '995'){ # FIXME : MARC21 ? + $max_num_tab = $_->{tab}; + } + } + if($max_num_tab >= 9){ + $max_num_tab = 9; + } + # loop through each tab 0 through 9 + for ( my $tabloop = 0 ; $tabloop <= $max_num_tab ; $tabloop++ ) { + my @loop_data = (); #innerloop in the template. + my $i = 0; + foreach my $tag (@tab_data) { + $i++; + next if ! $tag; my $indicator; - # if MARC::Record is not empty => use it as master loop, then add missing subfields that should be in the tab. - # if MARC::Record is empty => use tab as master loop. - if ($record ne -1 && ($record->field($tag) || $tag eq '000')) { + my $index_tag = CreateKey; + + # if MARC::Record is not empty =>use it as master loop, then add missing subfields that should be in the tab. + # if MARC::Record is empty => use tab as master loop. + if ( $record ne -1 && ( $record->field($tag) || $tag eq '000' ) ) { my @fields; - if ($tag ne '000') { + if ( $tag ne '000' ) { @fields = $record->field($tag); - } else { - push @fields,$record->leader(); - } - foreach my $field (@fields) { + } + else { + push @fields, $record->leader(); # if tag == 000 + } + foreach my $field (@fields) { + my @subfields_data; - if ($tag<10) { - my ($value,$subfield); - if ($tag ne '000') { - $value=$field->data(); - $subfield="@"; - } else { - $value = $field; - $subfield='@'; + if ( $tag < 10 ) { + my ( $value, $subfield ); + if ( $tag ne '000' ) { + $value = $field->data(); + $subfield = "@"; } - next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); - next if ($tagslib->{$tag}->{$subfield}->{kohafield} eq 'biblio.biblionumber'); - push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth)); - $i++; - } else { - my @subfields=$field->subfields(); - foreach my $subfieldcount (0..$#subfields) { - my $subfield=$subfields[$subfieldcount][0]; - my $value=$subfields[$subfieldcount][1]; - next if (length $subfield !=1); - next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); - push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth)); - $i++; + else { + $value = $field; + $subfield = '@'; } + next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop ); + next + if ( $tagslib->{$tag}->{$subfield}->{kohafield} eq + 'biblio.biblionumber' ); + push( + @subfields_data, + &create_input( + $tag, $subfield, $value, $index_tag, $tabloop, $record, + $authorised_values_sth,$input + ) + ); } -# now, loop again to add parameter subfield that are not in the MARC::Record - foreach my $subfield (sort( keys %{$tagslib->{$tag}})) { - next if (length $subfield !=1); - next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); - next if ($tag<10); - next if (($tagslib->{$tag}->{$subfield}->{hidden}<=-4) or ($tagslib->{$tag}->{$subfield}->{hidden}>=5) ); #check for visibility flag - next if (defined($field->subfield($subfield))); - push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); - $i++; + else { + my @subfields = $field->subfields(); + foreach my $subfieldcount ( 0 .. $#subfields ) { + my $subfield = $subfields[$subfieldcount][0]; + my $value = $subfields[$subfieldcount][1]; + next if ( length $subfield != 1 ); + next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop ); + push( + @subfields_data, + &create_input( + $tag, $subfield, $value, $index_tag, $tabloop, + $record, $authorised_values_sth,$input + ) + ); + } } - if ($#subfields_data >= 0) { - my %tag_data; - $tag_data{tag} = $tag; - $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; - $tag_data{repeatable} = $tagslib->{$tag}->{repeatable}; - $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); - $tag_data{subfield_loop} = \@subfields_data; - if ($tag<10) { - $tag_data{fixedfield} = 1; - } - - push (@loop_data, \%tag_data); + + # now, loop again to add parameter subfield that are not in the MARC::Record + foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) + { + next if ( length $subfield != 1 ); + next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop ); + next if ( $tag < 10 ); + next + if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -4 ) + or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) + ); #check for visibility flag + next if ( defined( $field->subfield($subfield) ) ); + push( + @subfields_data, + &create_input( + $tag, $subfield, '', $index_tag, $tabloop, $record, + $authorised_values_sth,$input + ) + ); } -# If there is more than 1 field, add an empty hidden field as separator. - if ($#fields >=1 && $#loop_data >=0 && $loop_data[$#loop_data]->{'tag'} eq $tag) { - my @subfields_data; - my %tag_data; - push(@subfields_data, &create_input('','','',$i,$tabloop,$record,$authorised_values_sth)); - $tag_data{tag} = ''; - $tag_data{tag_lib} = ''; - $tag_data{indicator} = ''; - $tag_data{subfield_loop} = \@subfields_data; - if ($tag<10) { - $tag_data{fixedfield} = 1; - } - push (@loop_data, \%tag_data); - $i++; + if ( $#subfields_data >= 0 ) { + my %tag_data = ( + tag => $tag, + index => $index_tag, + tag_lib => $tagslib->{$tag}->{lib}, + subfield_loop => \@subfields_data, + fixedfield => ($tag < 10)?(1):(0), + ); + if ($tag >= 010){ # no indicator for theses tag + $tag_data{indicator} = $field->indicator(1).$field->indicator(2); + } + push( @loop_data, \%tag_data ); } - } - # if breeding is empty - } else { + } # foreach $field end + + # if breeding is empty + } + else { my @subfields_data; - foreach my $subfield (sort(keys %{$tagslib->{$tag}})) { - next if (length $subfield !=1); - next if (($tagslib->{$tag}->{$subfield}->{hidden}<=-5) or ($tagslib->{$tag}->{$subfield}->{hidden}>=4) ); #check for visibility flag - next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); - push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); - $i++; + foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) { + next if ( length $subfield != 1 ); + next + if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -5 ) + or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 4 ) ) + ; #check for visibility flag + next + if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop ); + push( + @subfields_data, + &create_input( + $tag, $subfield, '', $index_tag, $tabloop, $record, + $authorised_values_sth,$input + ) + ); } - if ($#subfields_data >= 0) { - my %tag_data; - $tag_data{tag} = $tag; - $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; - $tag_data{repeatable} = $tagslib->{$tag}->{repeatable}; - $tag_data{indicator} = $indicator; - $tag_data{subfield_loop} = \@subfields_data; - $tag_data{tagfirstsubfield} = $tag_data{subfield_loop}[0]; - if ($tag<10) { - $tag_data{fixedfield} = 1; - } - push (@loop_data, \%tag_data); + if ( $#subfields_data >= 0 ) { + my %tag_data = ( + tag => $tag, + index => $index_tag, + tag_lib => $tagslib->{$tag}->{lib}, + repeatable => $tagslib->{$tag}->{repeatable}, + indicator => $indicator, + subfield_loop => \@subfields_data, + tagfirstsubfield => $subfields_data[0], + fixedfield => ($tag < 10)?(1):(0) + ); + + push @loop_data, \%tag_data ; } } } - if ($#loop_data >=0) { - my %big_loop_line; - $big_loop_line{number}=$tabloop; - $big_loop_line{innerloop}=\@loop_data; - push @BIG_LOOP,\%big_loop_line; + if ( $#loop_data >= 0 ) { + push @BIG_LOOP, { + number => $tabloop, + innerloop => \@loop_data, + }; } -# $template->param($tabloop."XX" =>\@loop_data); - } - $template->param(BIG_LOOP => \@BIG_LOOP); -} - - - -sub build_hidden_data () { - # build hidden data => - # we store everything, even if we show only requested subfields. - - my @loop_data =(); - my $i=0; - foreach my $tag (keys %{$tagslib}) { - my $previous_tag = ''; - - # loop through each subfield - foreach my $subfield (keys %{$tagslib->{$tag}}) { - next if ($subfield eq 'lib'); - next if ($subfield eq 'tab'); - next if ($subfield eq 'mandatory'); - next if ($subfield eq 'repeatable'); - next if ($tagslib->{$tag}->{$subfield}->{'tab'} ne "-1"); - my %subfield_data; - $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib}; - $subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory}; - $subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable}; - $subfield_data{marc_value}=""; - push(@loop_data, \%subfield_data); - $i++ - } } + $template->param( BIG_LOOP => \@BIG_LOOP ); } - -sub BiblioAddAuthorities{ - my ( $record, $frameworkcode ) = @_; - my $dbh=C4::Context->dbh; - my $query=$dbh->prepare(qq| -SELECT authtypecode,tagfield -FROM marc_subfield_structure -WHERE frameworkcode=? -AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|); -# SELECT authtypecode,tagfield -# FROM marc_subfield_structure -# WHERE frameworkcode=? -# AND (authtypecode IS NOT NULL OR authtypecode<>\"\")|); - $query->execute($frameworkcode); - my ($countcreated,$countlinked); - while (my $data=$query->fetchrow_hashref){ - if ($record->field($data->{tagfield})){ - next if ($record->subfield($data->{tagfield},'3')||$record->subfield($data->{tagfield},'9')); - # No authorities id in the tag. - # Search if there is any authorities to link to. - my $query='at='.$data->{authtypecode}.' '; - map {$query.= " and he=\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/)} $record->field($data->{tagfield})->subfields(); - warn $query; - my ($error,$results)=SimpleSearch($query,"authorityserver"); - # there is at least 1 result => return the 1st one - if (@$results>1) { - my $marcrecord = MARC::File::USMARC::decode($results->[0]); - $record->field($data->{tagfield})->add_subfields('9'=>$marcrecord->field('001')->data); - $countlinked++; - } else { - #There are no results, build authority record, add it to Authorities, get authid and add it to 9 - ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode - - - my $authtypedata=GetAuthType($data->{authtypecode}); - my $marcrecordauth=MARC::Record->new(); - my $field=MARC::Field->new($authtypedata->{auth_tag_to_report},'','',"a"=>"".$record->subfield($data->{tagfield},'a')); - map { $field->add_subfields($_->[0]=>$_->[1]) if ($_->[0]=~/[A-z]/ && $_->[0] ne "a" )} $record->field($data->{tagfield})->subfields(); - $marcrecordauth->insert_fields_ordered($field); - my $authid=AddAuthority($record,'',$data->{authtypecode}); - $countcreated++; - $record->field($data->{tagfield})->add_subfields('9'=>$authid); - } - } - } - return ($countlinked,$countcreated); -} - -# ======================== -# MAIN +# ======================== +# MAIN #========================= my $input = new CGI; my $error = $input->param('error'); -my $biblionumber=$input->param('biblionumber'); # if biblionumber exists, it's a modif, not a new biblio. -my $breedingid = $input->param('breedingid'); -my $z3950 = $input->param('z3950'); -my $op = $input->param('op'); -my $mode = $input->param('mode'); +my $biblionumber = $input->param('biblionumber'); # if biblionumber exists, it's a modif, not a new biblio. +my $breedingid = $input->param('breedingid'); +my $z3950 = $input->param('z3950'); +my $op = $input->param('op'); +my $mode = $input->param('mode'); my $frameworkcode = $input->param('frameworkcode'); -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; -$frameworkcode = &GetFrameworkCode($biblionumber) if ($biblionumber and not ($frameworkcode)); +$frameworkcode = &GetFrameworkCode($biblionumber) + if ( $biblionumber and not($frameworkcode) ); -$frameworkcode='' if ($frameworkcode eq 'Default'); -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "cataloguing/addbiblio.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {editcatalogue => 1}, - debug => 1, - }); +$frameworkcode = '' if ( $frameworkcode eq 'Default' ); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "cataloguing/addbiblio.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { editcatalogue => 1 }, + } +); #Getting the list of all frameworks -my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework"); +my $queryfwk = $dbh->prepare("select frameworktext, frameworkcode from biblio_framework"); $queryfwk->execute; my %select_fwk; my @select_fwk; my $curfwk; -push @select_fwk,"Default"; +push @select_fwk, "Default"; $select_fwk{"Default"} = "Default"; -while (my ($description, $fwk) =$queryfwk->fetchrow) { + +while ( my ( $description, $fwk ) = $queryfwk->fetchrow ) { push @select_fwk, $fwk; $select_fwk{$fwk} = $description; } -$curfwk=$frameworkcode; -my $framework=CGI::scrolling_list( - -name => 'Frameworks', - -id => 'Frameworks', - -default => $curfwk, - -OnChange => 'Changefwk(this);', - -values => \@select_fwk, - -labels => \%select_fwk, - -size => 1, - -multiple => 0 ); -$template->param( framework => $framework, breedingid => $breedingid); - -$tagslib = &GetMarcStructure(1,$frameworkcode); -my $record=-1; -my $encoding=""; -$record = GetMarcBiblio( $biblionumber ) if ($biblionumber); -($record,$encoding) = MARCfindbreeding($dbh,$breedingid) if ($breedingid); - -# warn "biblionumber : $biblionumber = ".$record->as_formatted; -$is_a_modif=0; -my ($biblionumtagfield,$biblionumtagsubfield); -my ($biblioitemnumtagfield,$biblioitemnumtagsubfield,$bibitem,$biblioitemnumber); +$curfwk = $frameworkcode; +my $framework = CGI::scrolling_list( + -name => 'Frameworks', + -id => 'Frameworks', + -default => $curfwk, + -OnChange => 'Changefwk(this);', + -values => \@select_fwk, + -labels => \%select_fwk, + -size => 1, + -multiple => 0 +); +$template->param( framework => $framework, breedingid => $breedingid ); + +# ++ Global +$tagslib = &GetMarcStructure( 1, $frameworkcode ); +$usedTagsLib = &GetUsedMarcStructure( $frameworkcode ); +$mandatory_z3950 = GetMandatoryFieldZ3950($frameworkcode); +# -- Global + +my $record = -1; +my $encoding = ""; +my ( + $biblionumtagfield, + $biblionumtagsubfield, + $biblioitemnumtagfield, + $biblioitemnumtagsubfield, + $bibitem, + $biblioitemnumber +); + +if (($biblionumber) && !($breedingid)){ + $record = GetMarcBiblio($biblionumber); +} +if ($breedingid) { + ( $record, $encoding ) = MARCfindbreeding( $dbh, $breedingid ) ; +} + +$is_a_modif = 0; + if ($biblionumber) { - $is_a_modif=1; + $is_a_modif = 1; + # if it's a modif, retrieve bibli and biblioitem numbers for the future modification of old-DB. - ($biblionumtagfield,$biblionumtagsubfield) = &GetMarcFromKohaField("biblio.biblionumber",$frameworkcode); - ($biblioitemnumtagfield,$biblioitemnumtagsubfield) = &GetMarcFromKohaField("biblioitems.biblioitemnumber",$frameworkcode); + ( $biblionumtagfield, $biblionumtagsubfield ) = + &GetMarcFromKohaField( "biblio.biblionumber", $frameworkcode ); + ( $biblioitemnumtagfield, $biblioitemnumtagsubfield ) = + &GetMarcFromKohaField( "biblioitems.biblioitemnumber", $frameworkcode ); + # search biblioitems value - my $sth=$dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); + my $sth = $dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?"); $sth->execute($biblionumber); ($biblioitemnumber) = $sth->fetchrow; } + #------------------------------------------------------------------------------------- -if ($op eq "addbiblio") { +if ( $op eq "addbiblio" ) { #------------------------------------------------------------------------------------- - # rebuild - my @tags = $input->param('tag'); - my @subfields = $input->param('subfield'); - my @values = $input->param('field_value'); - # build indicator hash. - my @ind_tag = $input->param('ind_tag'); - my @indicator = $input->param('indicator'); - if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") { - $record = TransformHtmlToMarc($dbh,\@tags,\@subfields,\@values,\@indicator,\@ind_tag); - } else { - my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag); - $record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour')); -# warn "MARC :".$record->as_formatted; -# die; - } + # getting html input + my @params = $input->param(); + $record = TransformHtmlToMarc( \@params , $input ); # check for a duplicate my ($duplicatebiblionumber,$duplicatetitle) = FindDuplicate($record) if (!$is_a_modif); my $confirm_not_duplicate = $input->param('confirm_not_duplicate'); # it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate) - if (!$duplicatebiblionumber or $confirm_not_duplicate) { - # MARC::Record built => now, record in DB + if ( !$duplicatebiblionumber or $confirm_not_duplicate ) { my $oldbibnum; my $oldbibitemnum; - if ($is_a_modif) { - ModBiblioframework($biblionumber,$frameworkcode); - ModBiblio($record,$biblionumber,$frameworkcode); + if ( $is_a_modif ) { + ModBiblioframework( $biblionumber, $frameworkcode ); + ModBiblio( $record, $biblionumber, $frameworkcode ); } else { - ($biblionumber,$oldbibitemnum) = AddBiblio($record,$frameworkcode); + ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode ); } + if (C4::Context->preference("BiblioAddsAuthorities")){ my ($countlinked,$countcreated)=BiblioAddAuthorities($record,$frameworkcode); } - - # now, redirect to additem page + if ($mode ne "popup"){ - print $input->redirect("/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"); - exit; + print $input->redirect( + "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode" + ); + exit; } else { $template->param( biblionumber => $biblionumber, @@ -621,16 +722,15 @@ if ($op eq "addbiblio") { $template->param( title => $record->subfield('200',"a") ) if ($record ne "-1" && C4::Context->preference('marcflavour') =~/unimarc/i); $template->param( title => $record->title() ) if ($record ne "-1" && C4::Context->preference('marcflavour') eq "usmarc"); $template->param( - popup => $mode, - itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled ! - ); + popup => $mode, + itemtype => $frameworkcode, + ); output_html_with_http_headers $input, $cookie, $template->output; exit; - } + } } else { # it may be a duplicate, warn the user and do nothing - build_tabs ($template, $record, $dbh,$encoding); - build_hidden_data; + build_tabs ($template, $record, $dbh,$encoding,$input); $template->param( biblionumber => $biblionumber, biblionumtagfield => $biblionumtagfield, @@ -643,73 +743,36 @@ if ($op eq "addbiblio") { duplicatetitle => $duplicatetitle, ); } -#-------------------------------------------------------------------------- -} elsif ($op eq "addfield") { -#-------------------------------------------------------------------------- - my $addedfield = $input->param('addfield_field'); - my $cntrepeatfield=$input->param('repeat_field'); - $cntrepeatfield=1 unless ($cntrepeatfield); - my $tagaddfield_subfield = $input->param('addfield_subfield'); - my @tags = $input->param('tag'); - my @subfields = $input->param('subfield'); - my @values = $input->param('field_value'); - # build indicator hash. - my @ind_tag = $input->param('ind_tag'); - my @indicator = $input->param('indicator'); - my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag); - my $record; - if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") { - my %indicators; - for (my $i=0;$i<=$#ind_tag;$i++) { - $indicators{$ind_tag[$i]} = $indicator[$i]; - } - $record = TransformHtmlToMarc($dbh,\@tags,\@subfields,\@values,%indicators); - } else { - my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag); - $record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour')); - } - for (my $i=1;$i<=$cntrepeatfield;$i++){ - my $field = MARC::Field->new("$addedfield",'','',"$tagaddfield_subfield" => ""); - $record->append_fields($field); - } - #warn "result : ".$record->as_formatted; - build_tabs ($template, $record, $dbh,$encoding); - build_hidden_data; - $template->param( - biblionumber => $biblionumber, - biblionumtagfield => $biblionumtagfield, - biblionumtagsubfield => $biblionumtagsubfield, - biblioitemnumtagfield => $biblioitemnumtagfield, - biblioitemnumtagsubfield => $biblioitemnumtagsubfield, - biblioitemnumber => $biblioitemnumber ); -} elsif ($op eq "delete") { -#----------------------------------------------------------------------------- +} +elsif ( $op eq "delete" ) { + my $error = &DelBiblio($biblionumber); if ($error) { warn "ERROR when DELETING BIBLIO $biblionumber : $error"; print "Content-Type: text/html\n\n

ERROR when DELETING BIBLIO $biblionumber : $error

"; - } else { - print "Content-Type: text/html\n\n"; + exit; } + + print $input->redirect('/cgi-bin/koha/catalogue/search.pl'); exit; -#---------------------------------------------------------------------------- + } else { -#---------------------------------------------------------------------------- - # If we're in a duplication case, we have to set to "" the biblionumber - # as we'll save the biblio as a new one. - if ($op eq "duplicate") - { - $biblionumber= ""; + #---------------------------------------------------------------------------- + # If we're in a duplication case, we have to set to "" the biblionumber + # as we'll save the biblio as a new one. + if ( $op eq "duplicate" ) { + $biblionumber = ""; } - #FIXME: it's kind of silly to go from MARC::Record to MARC::File::XML and then back again just to fix the encoding + +#FIXME: it's kind of silly to go from MARC::Record to MARC::File::XML and then back again just to fix the encoding eval { my $uxml = $record->as_xml; - MARC::Record::default_record_format("UNIMARC") if (C4::Context->preference("marcflavour") eq "UNIMARC"); - my $urecord = MARC::Record::new_from_xml($uxml, 'UTF-8'); + MARC::Record::default_record_format("UNIMARC") + if ( C4::Context->preference("marcflavour") eq "UNIMARC" ); + my $urecord = MARC::Record::new_from_xml( $uxml, 'UTF-8' ); $record = $urecord; }; - build_tabs ($template, $record, $dbh,$encoding); - build_hidden_data; + build_tabs( $template, $record, $dbh, $encoding,$input ); $template->param( biblionumber => $biblionumber, biblionumtagfield => $biblionumtagfield, @@ -717,17 +780,14 @@ if ($op eq "addbiblio") { biblioitemnumtagfield => $biblioitemnumtagfield, biblioitemnumtagsubfield => $biblioitemnumtagsubfield, biblioitemnumber => $biblioitemnumber, - ); + ); } -$template->param( title => $record->title() ) if ($record ne "-1"); + +$template->param( title => $record->title() ) if ( $record ne "-1" ); $template->param( - popup => $mode, - frameworkcode => $frameworkcode, - itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled ! - hide_marc => C4::Context->preference('hide_marc'), - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), - advancedMARCEditor => C4::Context->preference("advancedMARCEditor"), - ); + popup => $mode, + frameworkcode => $frameworkcode, + itemtype => $frameworkcode, +); + output_html_with_http_headers $input, $cookie, $template->output; diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 3f8e1d305a..64ba8af254 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -68,7 +68,7 @@ my $frameworkcode = &GetFrameworkCode($biblionumber); my $tagslib = &GetMarcStructure(1,$frameworkcode); my $record = GetMarcBiblio($biblionumber); -# warn "==>".$record->as_formatted; +warn "==>".$record->as_formatted; my $oldrecord = TransformMarcToKoha($dbh,$record); my $itemrecord; my $nextop="additem"; diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl index c854bb9c09..8f24263fdb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl @@ -3,28 +3,27 @@ - - + + + - + -
+ + +

Edit MARC Record Number Add MARC Record

- - - - - - - + + +
@@ -32,16 +31,14 @@ Change framework : + - - " /> " /> " /> -
@@ -52,7 +49,6 @@
- @@ -64,108 +60,120 @@
-

Is this a duplicate of " onclick="openWindow('../MARCdetail.pl?biblionumber=&popup=1', 'Duplicate biblio'; return false;)">?

+

Is this a duplicate of " onclick="openWindow('../MARCdetail.pl?biblionumber=&popup=1', 'Duplicate biblio'; return false;)">?

You must either :

+ -
"> - -

- "> + +

_"> +
- "> + "> - " class="flat"> + _indicator_" + size="2" + maxlength="2" + value="" + class="flat" /> - " class="flat"> + _indicator_" + size="2" + maxlength="2" + value="" + class="flat" /> - - "> + _indicator_" + value="" /> - "> + _indicator_" + value="" /> + - + + - " onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+',this.value)" > -

- - -

- - " onclick="unHideSubfield('subfield','label')"> - - + _')">+ -

-

- -

+ + + +
+ + + + + - ')">+ + + - "/> - " size="2" maxlength="1"/> - "/> - "/> - "/> -

+
+ +
+
-
- - "> - "> - "> - "> - "> - -
- - "> - "> - "> - - "> - "> - "> - "> - - "> - "> - - - - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css index 8212da6846..39d5cb788d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css @@ -66,9 +66,9 @@ select { } fieldset { - border : 1px solid #bbb; - display: inline; - vertical-align: top; + border : 1px solid #bbb; + display: inline; + vertical-align: top; } input[type=submit], input[type=button], input[type=reset] { @@ -89,7 +89,6 @@ label { vertical-align:top; display:block; float:left; -/* text-align:right; */ width:10em; margin-right:0.2em; } @@ -119,6 +118,14 @@ tr.highlight td, tr.highlight th { text-decoration:none; } +.click{ + cursor:pointer; + color: #027ac6;/*blue*/ +} +.click:hover{ + text-decoration:underline; +} + #problem { color: red; background-color:white; @@ -146,6 +153,13 @@ legend { margin:10px; } +.toogle{ + background-color:#ffffcc; +} + +.pages{ + margin:.7em; +} /* css styles for reserves color alerts */ .onloan { background-color: #FFED3D; @@ -463,8 +477,9 @@ legend { #tabs a { color:white; text-decoration:none; - padding-right:10px; - padding-left:10px; + padding-right:1.2em; + padding-left:1.2em; + -moz-border-radius:4px; } /* specify that we to do when the mouse is on 1 button */ @@ -473,8 +488,8 @@ legend { } #tabs { - margin-top:45px; - margin-bottom:5px; + margin-top:35px; + margin-bottom:20px; } /* styles for the 11 content blocks */ @@ -490,22 +505,10 @@ legend { display:block; } -/* the style of tag description */ -p.tag { - font-weight:bold; -} -/* the style of subfield paragraph */ -p.subfield { - -} - - - .lineSelected { background-color:yellow; } - /* display more informations with css layer */ a.info { position: relative; @@ -550,4 +553,117 @@ a.info:hover span { #itemtypelist p { margin:0px; -} \ No newline at end of file +} + +/* MARC Editor stylesheet */ + +/* the style of tag description */ +div.tag_title { + font-weight:bold; +} + +div.tag_title span { + display:inline; + letter-spacing:5px; + font-size:1.2em; + text-transform: capitalize; + color : #027ac6; +} + +div.tag_title a:hover{ + text-decoration:none; +} + +div.tag { + margin-bottom:1.8em; +} + +.subfield_line{ + margin-left:1.1em; +} + +.CursorHelp{ + cursor:help; +} + +.buttonDot{ + cursor:help; +} + +.buttonUp { + cursor: crosshair; + color: grey; + font-size: .8em; +} + +.labelsubfield{ + min-width:210px; + display:inline; +} + +.subfield_mandatory{ + color:red; +} + +.subfield_not_filled { + width:506px; + color:darkblue; + background-color:#ffe5ed; + border:1px solid #ffe5ed; + border-bottom:1px solid red; + padding:0.15em; +} + +.line_not_filled{ + margin-left:1.1em; + background-color:#ffe5ed; + border:1px solid red; +} + +.indicator{ + width:20px; + color:darkblue; + background-color: #ffffff; + border:1px dotted #a4cde6; + padding:0.15em; +} + +.indicator:focus { + background-color:#fdfde3; + border-bottom:1px solid darkblue; + width:20px; + color:darkblue; +} + +.input_marceditor { + width:506px; + color:darkblue; + background-color:#ffffff; + border:1px solid #ffffff; + border-bottom:1px solid lightgray; + padding:0.15em; +} + +.input_marceditor:focus{ + background-color:#fdfde3; + border-bottom:1px solid darkblue; + width:506px; + color:darkblue; +} + +.tag{ + padding-bottom:1.1em; +/* border-bottom:1px dotted #a4cde6; */ +} + +.buttonPlus { + cursor: crosshair; + color: grey; + font-size: 80%; +} + +/*.flat{ + border:0px; +}*/ + +/* End of Marc Editor stylesheet */ -- 2.39.5