X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Fadditem.pl;h=20007dae1340ab69892bfa3bc8827644e4d03123;hb=58e76f605c7d991ffd78c1b6c732bb568950e956;hp=3d32130e09208d4b2f1c8f216049e80c62bbaea1;hpb=38685bdf906dd14cb5eaa3bb1db65b004e01d556;p=koha.git diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 3d32130e09..20007dae13 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -23,9 +23,12 @@ use strict; use C4::Auth; use C4::Output; use C4::Biblio; +use C4::Items; use C4::Context; use C4::Koha; # XXX subfield_is_koha_internal_p -use Date::Calc qw(Today); +use C4::Branch; # XXX subfield_is_koha_internal_p +use C4::ClassSource; +use C4::Dates; use MARC::File::XML; @@ -55,17 +58,37 @@ sub get_item_from_barcode { return($result); } +sub set_item_default_location { + my $itemnumber = shift; + if ( C4::Context->preference('NewItemsDefaultLocation') ) { + my $item = GetItem( $itemnumber ); + $item->{'permanent_location'} = $item->{'location'}; + $item->{'location'} = C4::Context->preference('NewItemsDefaultLocation'); + ModItem( $item, undef, $itemnumber); + } +} + my $input = new CGI; my $dbh = C4::Context->dbh; -my $error = $input->param('error'); +my $error = $input->param('error'); my $biblionumber = $input->param('biblionumber'); -my $itemnumber = $input->param('itemnumber'); -warn Data::Dumper::Dumper($input->param()); -my $op = $input->param('op'); +my $itemnumber = $input->param('itemnumber'); +my $op = $input->param('op'); + +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "cataloguing/additem.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {editcatalogue => 1}, + debug => 1, + }); -# find itemtype my $frameworkcode = &GetFrameworkCode($biblionumber); +my $today_iso = C4::Dates->today('iso'); +$template->param(today_iso => $today_iso); + my $tagslib = &GetMarcStructure(1,$frameworkcode); my $record = GetMarcBiblio($biblionumber); my $oldrecord = TransformMarcToKoha($dbh,$record); @@ -76,16 +99,25 @@ my @errors; # store errors found while checking data BEFORE saving item. if ($op eq "additem") { #------------------------------------------------------------------------------- # rebuild - my @tags = $input->param('tag'); + my @tags = $input->param('tag'); my @subfields = $input->param('subfield'); - my @values = $input->param('field_value'); + my @values = $input->param('field_value'); # build indicator hash. - my @ind_tag = $input->param('ind_tag'); + my @ind_tag = $input->param('ind_tag'); my @indicator = $input->param('indicator'); my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); - my $record=MARC::Record::new_from_xml($xml, 'UTF-8'); - # if autoBarcode is ON, calculate barcode... - if (C4::Context->preference('autoBarcode')) { + my $record = MARC::Record::new_from_xml($xml, 'UTF-8'); + + # type of add + my $add_submit = $input->param('add_submit'); + my $add_duplicate_submit = $input->param('add_duplicate_submit'); + my $add_multiple_copies_submit = $input->param('add_multiple_copies_submit'); + my $number_of_copies = $input->param('number_of_copies'); + + # if autoBarcode is set to 'incremental', calculate barcode... + # NOTE: This code is subject to change in 3.2 with the implemenation of ajax based autobarcode code + # NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript + if (C4::Context->preference('autoBarcode') eq 'incremental') { my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode); unless ($record->field($tagfield)->subfield($tagsubfield)) { my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items"); @@ -99,59 +131,156 @@ if ($op eq "additem") { $record->insert_fields_ordered($fieldItem); } } -# check for item barcode # being unique + my $addedolditem = TransformMarcToKoha($dbh,$record); - my $exists = get_item_from_barcode($addedolditem->{'barcode'}); - push @errors,"barcode_not_unique" if($exists); - # if barcode exists, don't create, but report The problem. - my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItem($record,$biblionumber) unless ($exists); - if ($exists) { - $nextop = "additem"; + + # If we have to add or add & duplicate, we add the item + if ($add_submit || $add_duplicate_submit) { + # check for item barcode # being unique + my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'}); + push @errors,"barcode_not_unique" if($exist_itemnumber); + # if barcode exists, don't create, but report The problem. + unless ($exist_itemnumber) { + my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber); + set_item_default_location($oldbibitemnum); + } + $nextop = "additem"; + if ($exist_itemnumber) { + $itemrecord = $record; + } + } + + # If we have to add & duplicate + if ($add_duplicate_submit) { + + # We try to get the next barcode + use C4::Barcodes; + my $barcodeobj = C4::Barcodes->new; + my $barcodevalue = $barcodeobj->next_value($addedolditem->{'barcode'}) if $barcodeobj; + my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode); + if ($record->field($tagfield)->subfield($tagsubfield)) { + # If we got the next codebar value, we put it in the record + if ($barcodevalue) { + $record->field($tagfield)->update($tagsubfield => $barcodevalue); + # If not, we delete the recently inserted barcode from the record (so the user can input a barcode himself) + } else { + $record->field($tagfield)->update($tagsubfield => ''); + } + } $itemrecord = $record; - } else { - $nextop = "additem"; } + + # If we have to add multiple copies + if ($add_multiple_copies_submit) { + + use C4::Barcodes; + my $barcodeobj = C4::Barcodes->new; + my $oldbarcode = $addedolditem->{'barcode'}; + my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode); + + # If there is a barcode and we can't find him new values, we can't add multiple copies + my $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj; + if ($oldbarcode && !$testbarcode) { + + push @errors, "no_next_barcode"; + $itemrecord = $record; + + } else { + # We add each item + + # For the first iteration + my $barcodevalue = $oldbarcode; + my $exist_itemnumber; + + + for (my $i = 0; $i < $number_of_copies;) { + + # If there is a barcode + if ($barcodevalue) { + + # Getting a new barcode (if it is not the first iteration or the barcode we tried already exists) + $barcodevalue = $barcodeobj->next_value($oldbarcode) if ($i > 0 || $exist_itemnumber); + + # Putting it into the record + if ($barcodevalue) { + $record->field($tagfield)->update($tagsubfield => $barcodevalue); + } + + # Checking if the barcode already exists + $exist_itemnumber = get_item_from_barcode($barcodevalue); + } + + # Adding the item + if (!$exist_itemnumber) { + my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber); + set_item_default_location($oldbibitemnum); + + # We count the item only if it was really added + # That way, all items are added, even if there was some already existing barcodes + # FIXME : Please note that there is a risk of infinite loop here if we never find a suitable barcode + $i++; + } + + # Preparing the next iteration + $oldbarcode = $barcodevalue; + } + undef($itemrecord); + } + } + + #------------------------------------------------------------------------------- } elsif ($op eq "edititem") { #------------------------------------------------------------------------------- # retrieve item if exist => then, it's a modif - $itemrecord = GetMarcItem($biblionumber,$itemnumber); - $nextop="saveitem"; + $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber); + $nextop = "saveitem"; #------------------------------------------------------------------------------- } elsif ($op eq "delitem") { #------------------------------------------------------------------------------- # check that there is no issue on this item before deletion. - my $sth=$dbh->prepare("select * from issues i where i.returndate is null and i.itemnumber=?"); - $sth->execute($itemnumber); - my $onloan=$sth->fetchrow; - push @errors,"book_on_loan" if ($onloan); ##error book_on_loan added to template as well - if ($onloan){ - $nextop="additem"; - } else { - &DelItem($dbh,$biblionumber,$itemnumber); + $error = &DelItemCheck($dbh,$biblionumber,$itemnumber); + if($error == 1){ print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"); - #$nextop="additem"; + }else{ + push @errors,$error; + $nextop="additem"; } #------------------------------------------------------------------------------- +} elsif ($op eq "delallitems") { +#------------------------------------------------------------------------------- + my @biblioitems = &GetBiblioItemByBiblioNumber($biblionumber); + foreach my $biblioitem (@biblioitems){ + my $items = &GetItemsByBiblioitemnumber($biblioitem->{biblioitemnumber}); + + foreach my $item (@$items){ + &DelItem($dbh,$biblionumber,$item->{itemnumber}); + } + } +#------------------------------------------------------------------------------- } elsif ($op eq "saveitem") { #------------------------------------------------------------------------------- # rebuild - my @tags = $input->param('tag'); + my @tags = $input->param('tag'); my @subfields = $input->param('subfield'); - my @values = $input->param('field_value'); + my @values = $input->param('field_value'); # build indicator hash. - my @ind_tag = $input->param('ind_tag'); + my @ind_tag = $input->param('ind_tag'); my @indicator = $input->param('indicator'); - warn "tags :@tags" ; - warn "subfields :@subfields" ; - warn "values :@values" ; -# my $itemnumber = $input->param('itemnumber'); + # my $itemnumber = $input->param('itemnumber'); my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,'ITEM'); - my $itemrecord=MARC::Record::new_from_xml($xml, 'UTF-8'); -# MARC::Record builded => now, record in DB -# warn "R: ".$record->as_formatted; - my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItem($itemrecord,$biblionumber,$itemnumber,0); - $itemnumber=""; + my $itemtosave=MARC::Record::new_from_xml($xml, 'UTF-8'); + # MARC::Record builded => now, record in DB + # warn "R: ".$record->as_formatted; + # check that the barcode don't exist already + my $addedolditem = TransformMarcToKoha($dbh,$itemtosave); + my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'}); + if ($exist_itemnumber && $exist_itemnumber != $itemnumber) { + push @errors,"barcode_not_unique"; + } else { + my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($itemtosave,$biblionumber,$itemnumber); + $itemnumber=""; + } $nextop="additem"; } @@ -159,14 +288,6 @@ if ($op eq "additem") { #------------------------------------------------------------------------------- # build screen with existing items. and "new" one #------------------------------------------------------------------------------- -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "cataloguing/additem.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {editcatalogue => 1}, - debug => 1, - }); # now, build existiing item list my $temp = GetMarcBiblio( $biblionumber ); @@ -175,24 +296,27 @@ my @fields = $temp->fields(); my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code my @big_array; #---- finds where items.itemnumber is stored -my ($itemtagfield,$itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber",$frameworkcode); -my ($branchtagfield,$branchtagsubfield) = &GetMarcFromKohaField("items.homebranch",$frameworkcode); +my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", $frameworkcode); +my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", $frameworkcode); foreach my $field (@fields) { next if ($field->tag()<10); - my @subf=$field->subfields; + my @subf = $field->subfields or (); # don't use ||, as that forces $field->subfelds to be interpreted in scalar context my %this_row; # loop through each subfield for my $i (0..$#subf) { next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10 - && ($field->tag() ne $itemtagfield - && $subf[$i][0] ne $itemtagsubfield)); + && ($field->tag() ne $itemtagfield + && $subf[$i][0] ne $itemtagsubfield)); $witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib} if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10); + if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10) { + $this_row{$subf[$i][0]}=GetAuthorisedValueDesc( $field->tag(), + $subf[$i][0], $subf[$i][1], '', $tagslib) + || $subf[$i][1]; + } - $this_row{$subf[$i][0]} =$subf[$i][1] if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10); - - if (($field->tag eq $branchtagfield) && ($subf[$i][$0] eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) { + if (($field->tag eq $branchtagfield) && ($subf[$i][$0] eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) { #verifying rights my $userenv = C4::Context->userenv(); unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subf[$i][1]))){ @@ -205,12 +329,7 @@ foreach my $field (@fields) { push(@big_array, \%this_row); } } -#fill big_row with missing data -foreach my $subfield_code (keys(%witness)) { - for (my $i=0;$i<=$#big_array;$i++) { - $big_array[$i]{$subfield_code}=" " unless ($big_array[$i]{$subfield_code}); - } -} + my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$frameworkcode); @big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array; @@ -218,17 +337,13 @@ my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbran # First, the existing items for display my @item_value_loop; my @header_value_loop; -for (my $i=0;$i<=$#big_array; $i++) { - my $items_data; - foreach my $subfield_code (sort keys(%witness)) { - $items_data .="".$big_array[$i]{$subfield_code}.""; - } +for my $row ( @big_array ) { my %row_data; - $items_data =~ s/"/"/g; - $row_data{item_value} = $items_data; - $row_data{itemnumber} = $big_array[$i]->{itemnumber}; + my @item_fields = map +{ field => $_ || '' }, @$row{ sort keys(%witness) }; + $row_data{item_value} = [ @item_fields ]; + $row_data{itemnumber} = $row->{itemnumber}; #reporting this_row values - $row_data{'nomod'} = $big_array[$i]{'nomod'}; + $row_data{'nomod'} = $row->{'nomod'}; push(@item_value_loop,\%row_data); } foreach my $subfield_code (sort keys(%witness)) { @@ -242,113 +357,122 @@ my @loop_data =(); my $i=0; my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib"); +my $branches = GetBranchesLoop(); # build once ahead of time, instead of multiple times later. +my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); + +# Getting the fields where the item location is +my ($location_field, $location_subfield) = GetMarcFromKohaField('items.location', $frameworkcode); + +# Getting the name of the authorised values' category for item location +my $item_location_category = $tagslib->{$location_field}->{$location_subfield}->{'authorised_value'}; + foreach my $tag (sort keys %{$tagslib}) { - my $previous_tag = ''; # loop through each subfield foreach my $subfield (sort keys %{$tagslib->{$tag}}) { next if subfield_is_koha_internal_p($subfield); - next if ($tagslib->{$tag}->{$subfield}->{'tab'} ne "10"); + next if ($tagslib->{$tag}->{$subfield}->{'tab'} ne "10"); my %subfield_data; - my $index_subfield= int(rand(1000000)); - if($subfield eq '@'){ - $subfield_data{id} = "tag_".$tag."_subfield_0_".$index_subfield; + my $index_subfield = int(rand(1000000)); + if ($subfield eq '@'){ + $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_subfield; } else { - $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_subfield; + $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_subfield; } - $subfield_data{tag}=$tag; - $subfield_data{subfield}=$subfield; - $subfield_data{random}=int(rand(1000000)); -# $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib}; - $subfield_data{marc_lib}="{$tag}->{$subfield}->{lib}."\">".$tagslib->{$tag}->{$subfield}->{lib}.""; - $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory}; - $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable}; + $subfield_data{tag} = $tag; + $subfield_data{subfield} = $subfield; + $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms? +# $subfield_data{marc_lib} = $tagslib->{$tag}->{$subfield}->{lib}; + $subfield_data{marc_lib} ="{$tag}->{$subfield}->{lib}."\">".$tagslib->{$tag}->{$subfield}->{lib}.""; + $subfield_data{mandatory} = $tagslib->{$tag}->{$subfield}->{mandatory}; + $subfield_data{repeatable} = $tagslib->{$tag}->{$subfield}->{repeatable}; my ($x,$value); ($x,$value) = find_value($tag,$subfield,$itemrecord) if ($itemrecord); $value =~ s/"/"/g; 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 ) = split ',', $today_iso; # FIXME: iso dates don't have commas! $value =~ s/YYYY/$year/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; } - $subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1) and $value ne ''); - #testing branch value if IndependantBranches. - my $test = (C4::Context->preference("IndependantBranches")) && - ($tag eq $branchtagfield) && ($subfield eq $branchtagsubfield) && - (C4::Context->userenv->{flags} != 1) && ($value) && ($value ne C4::Context->userenv->{branch}) ; -# print $input->redirect(".pl?biblionumber=$biblionumber") if ($test); - # search for itemcallnumber if applicable - if (!$value && $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && C4::Context->preference('itemcallnumber')) { - my $CNtag = substr(C4::Context->preference('itemcallnumber'),0,3); - my $CNsubfield = substr(C4::Context->preference('itemcallnumber'),3,1); - my $CNsubfield2 = substr(C4::Context->preference('itemcallnumber'),4,1); - my $temp2 = $temp->field($CNtag); - if ($temp2) { - $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2)); -#remove any trailing space incase one subfield is used - $value=~s/^\s+|\s+$//g; - } + $subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} > 4) || ($tagslib->{$tag}->{$subfield}->{hidden} < -4)); + # testing branch value if IndependantBranches. + if (!$value && $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && $pref_itemcallnumber) { + my $CNtag = substr($pref_itemcallnumber, 0, 3); + my $CNsubfield = substr($pref_itemcallnumber, 3, 1); + my $CNsubfield2 = substr($pref_itemcallnumber, 4, 1); + my $temp2 = $temp->field($CNtag); + if ($temp2) { + $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2)); + #remove any trailing space incase one subfield is used + $value =~ s/^\s+|\s+$//g; + } } + + my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" ); + my $attributes = qq($attributes_no_value value="$value" ); if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { my @authorised_values; my %authorised_lib; - my $dbh=C4::Context->dbh; - # 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" ) { + foreach my $thisbranch (@$branches) { + push @authorised_values, $thisbranch->{value}; + $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname}; + $value = $thisbranch->{value} if $thisbranch->{selected}; } - - #----- itemtypes } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { - my $sth = - $dbh->prepare( - "select itemtype,description from itemtypes order by description"); + push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + my $sth = $dbh->prepare("select itemtype,description from itemtypes order by description"); $sth->execute; - 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; } - $value = $itemtype unless ($value); + + unless ( $value ) { + my $itype_sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?"); + $itype_sth->execute( $biblionumber ); + ( $value ) = $itype_sth->fetchrow_array; + } + #---- class_sources + } + elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) { + push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + + my $class_sources = GetClassSources(); + my $default_source = C4::Context->preference("DefaultClassificationSource"); + + foreach my $class_source (sort keys %$class_sources) { + next unless $class_sources->{$class_source}->{'used'} or + ($value and $class_source eq $value) or + ($class_source eq $default_source); + push @authorised_values, $class_source; + $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'}; + } + $value = $default_source unless ($value); + #---- "true" authorised value } else { - $authorised_values_sth->execute( - $tagslib->{$tag}->{$subfield}->{authorised_value} ); - - push @authorised_values, "" - unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); - + push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} ); while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { push @authorised_values, $value; - $authorised_lib{$value} = $lib; + + if ($tagslib->{$tag}->{$subfield}->{authorised_value} eq $item_location_category) { + $authorised_lib{$value} = $value . " - " . $lib; + } else { + $authorised_lib{$value} = $lib; + } } } - $subfield_data{marc_value} =CGI::scrolling_list( + $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list -name => "field_value", -values => \@authorised_values, -default => $value, @@ -363,131 +487,68 @@ foreach my $tag (sort keys %{$tagslib}) { # it's a thesaurus / authority field } elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) { - $subfield_data{marc_value} = - " - {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... + $subfield_data{marc_value} = " + {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... "; # 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 - # (the cgidir differs) - my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder"; - unless ( opendir( DIR, "$cgidir" ) ) { - $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder"; + elsif ( $tagslib->{$tag}->{$subfield}->{value_builder} ) { + # opening plugin + my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $tagslib->{$tag}->{$subfield}->{'value_builder'}; + if (do $plugin) { + my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); + my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); + $subfield_data{marc_value} = qq[ + ... + $javascript]; + } else { + warn "Plugin Failed: $plugin"; + $subfield_data{marc_value} = ""; # supply default input form } - my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'}; - do $plugin || die "Plugin Failed: ".$plugin; - my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); - my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); -# my ( $function_name, $javascript,$extended_param ); - - $subfield_data{marc_value} = - " - ... - $javascript"; - # it's an hidden field } - elsif ( $tag eq '' ) { - $subfield_data{marc_value} = - " - "; + elsif ( $tag eq '' ) { # it's an hidden field + $subfield_data{marc_value} = qq(); } - elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { - $subfield_data{marc_value} = - ""; - - # it's a standard field + elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? + $subfield_data{marc_value} = qq(); } - 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{marc_value}=""; - push(@loop_data, \%subfield_data); - $i++ + elsif ( length($value) > 100 + or (C4::Context->preference("marcflavour") eq "UNIMARC" and + 300 <= $tag && $tag < 400 && $subfield eq 'a' ) + or (C4::Context->preference("marcflavour") eq "MARC21" and + 500 <= $tag && $tag < 600 ) + ) { + # oversize field (textarea) + $subfield_data{marc_value} = "\n"; + } else { + # it's a standard field + $subfield_data{marc_value} = ""; } +# $subfield_data{marc_value}=""; + push (@loop_data, \%subfield_data); + $i++ + } } # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit. $template->param( title => $record->title() ) if ($record ne "-1"); -$template->param(item_loop => \@item_value_loop, - item_header_loop => \@header_value_loop, - biblionumber => $biblionumber, - title => $oldrecord->{title}, - author => $oldrecord->{author}, - item => \@loop_data, - itemnumber => $itemnumber, - itemtagfield => $itemtagfield, - itemtagsubfield =>$itemtagsubfield, - op => $nextop, - opisadd => ($nextop eq "saveitem")?0:1); +$template->param( + biblionumber => $biblionumber, + title => $oldrecord->{title}, + author => $oldrecord->{author}, + item_loop => \@item_value_loop, + item_header_loop => \@header_value_loop, + item => \@loop_data, + itemnumber => $itemnumber, + itemtagfield => $itemtagfield, + itemtagsubfield => $itemtagsubfield, + op => $nextop, + opisadd => ($nextop eq "saveitem") ? 0 : 1, + C4::Search::enabled_staff_search_views, +); foreach my $error (@errors) { $template->param($error => 1); }