[Koha-cvs] koha/cataloguing addbiblio.pl addbooks.pl addit...
paul poulain
paul at koha-fr.org
Fri Mar 9 15:32:55 CET 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/03/09 14:32:55
Modified files:
cataloguing : addbiblio.pl addbooks.pl additem.pl
Log message:
rel_3_0 moved to HEAD
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&r1=1.12&r2=1.13
Patches:
Index: addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- addbiblio.pl 27 Sep 2006 21:19:21 -0000 1.19
+++ addbiblio.pl 9 Mar 2007 14:32:55 -0000 1.20
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.19 2006/09/27 21:19:21 tgarip1957 Exp $
+# $Id: addbiblio.pl,v 1.20 2007/03/09 14:32:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -25,33 +25,63 @@
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
-use C4::Search; # also includes Biblio.pm, Search is used to FindDuplicate
+use C4::Search;
use C4::Context;
-use C4::Koha; # XXX subfield_is_koha_internal_p
use MARC::Record;
+use C4::Log;
+use C4::Koha; # XXX subfield_is_koha_internal_p
+
use MARC::File::USMARC;
-my $format="USMARC";
-$format="UNIMARC" if (C4::Context->preference('marcflavour') eq 'UNIMARC');
-use MARC::File::XML(RecordFormat =>$format);
-use Encode;
+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 $input = new CGI;
-my $z3950 = $input->param('z3950');
-my $logstatus=C4::Context->preference('Activate_log');
-my $xml;
+
my $itemtype; # created here because it can be used in build_authorized_values_list sub
-my $fromserials=$input->param('fromserials');## if a serial is being added do not display navigation menus
-###Find related tags for Z3950 searches- required by template
-my($isbntag,$isbnsub)=MARCfind_marc_from_kohafield("isbn","biblios");
-my($issntag,$issnsub)=MARCfind_marc_from_kohafield("issn","biblios");
-my($titletag,$titlesub)=MARCfind_marc_from_kohafield("title","biblios");
-my($authortag,$authorsub)=MARCfind_marc_from_kohafield("author","biblios");
+=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, at result);
+}
+
+
=item MARCfindbreeding
- $record = MARCfindbreeding($dbh, $breedingid,$frameworkcode);
+ $record = MARCfindbreeding($dbh, $breedingid);
Look up the breeding farm with database handle $dbh, for the
record with id $breedingid. If found, returns the decoded
@@ -61,23 +91,51 @@
=cut
sub MARCfindbreeding {
- my ($dbh,$id,$oldbiblionumber) = @_;
- my $sth = $dbh->prepare("select 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 ($marc,$encoding) = $sth->fetchrow;
- $sth->finish;
+ my ($file,$marc,$encoding) = $sth->fetchrow;
if ($marc) {
- my $record = MARC::File::USMARC::decode($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')){
+ my $newisbn = $field->subfield('a');
+ $newisbn =~ s/-//g;
+ $field->update( 'a' => $newisbn );
+
+
+ }
+# $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);
+ $record->insert_fields_ordered($f100);
+ }
+ }
if (ref($record) eq undef) {
return -1;
- }
+ } else {
if (C4::Context->preference("z3950NormalizeAuthor") and C4::Context->preference("z3950AuthorAuthFields")){
- my ($tag,$subfield) = MARCfind_marc_from_kohafield("author","biblios");
+ my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,"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){
@@ -86,6 +144,8 @@
$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){
@@ -95,32 +155,17 @@
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));
}
}
$record->insert_fields_ordered($field);
}
-##Delete biblionumber tag in case a similar tag is used in imported MARC ##
- my ( $tagfield, $tagsubfield ) =MARCfind_marc_from_kohafield("biblionumber","biblios");
- my $old_field = $record->field($tagfield);
- $record->delete_field($old_field);
- ##add the old biblionumber if a modif but coming from breedingfarm
- if ($oldbiblionumber){
- my $newfield;
- if ($tagfield<10){
- $newfield = MARC::Field->new($tagfield, $oldbiblionumber);
- }else{
- $newfield = MARC::Field->new($tagfield, '', '', "$tagsubfield" => $oldbiblionumber);
- }
- $record->insert_fields_ordered($newfield);
+ return $record,$encoding;
}
- my $xml=MARC::File::XML::record($record);
- $xml=Encode::encode('utf8',$xml);
- my $xmlhash=XML_xml2hash_onerecord($xml);
- return $xmlhash,$encoding;
-
}
return -1;
}
@@ -183,208 +228,126 @@
}
=item create_input
+
builds the <input ...> entry for a subfield.
+
=cut
+
sub create_input () {
- my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth,$id) = @_;
- my $dbh=C4::Context->dbh;
+ 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);
$value =~ s/"/"/g;
+ my $dbh = C4::Context->dbh;
my %subfield_data;
- $subfield_data{id}=$id;
$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}="<span id=\"error$i\" title=\"".$tagslib->{$tag}->{$subfield}->{lib}."\">".substr($tagslib->{$tag}->{$subfield}->{lib},0,15)."</span>";
$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" if (substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "0") ; #check parity
+ $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);
- # it's an authority field
+ # 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='#ffffff;'\"\" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY> <a style=\"cursor: help;\" href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$id',$id);\">...</a>";
+ $subfield_data{marc_value}="<input type=\"text\" 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:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$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
# (the cgidir differs)
- my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
+ my $cgidir = C4::Context->intranetdir ."/cgi-bin/cataloguing/value_builder";
unless (opendir(DIR, "$cgidir")) {
- $cgidir = C4::Context->intranetdir."/value_builder";
+ $cgidir = C4::Context->intranetdir."/cataloguing/value_builder";
}
my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
- require $plugin;
+ 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}="<input tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i); \"> <a style=\"cursor: help;\" href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
+ $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='#ffffff'; \" tabindex=\"1\" type=\"hidden\" name=\"field_value\" id=\"field_value$id\" value=\"$value\">";
- } elsif (substr($tagslib->{$tag}->{$subfield}->{'hidden'},2,1) gt "1") {
-
- $subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"40\" maxlength=\"255\" >";
+ $subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffff00'; \" 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\" >";
# it's a standard field
} else {
- if (length($value) >100) {
- $subfield_data{marc_value}="<textarea tabindex=\"1\" name=\"field_value\" id=\"field_value$id\" cols=\"40\" rows=\"5\" >$value</textarea>";
+ 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}="<textarea tabindex=\"1\" name=\"field_value\" cols=\"70\" rows=\"5\" >$value</textarea>";
} else {
- $subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"50\">"; #"
+ $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\">"; #"
}
}
return \%subfield_data;
}
-sub build_tabs ($$$;$){
- my($template, $xmlhash, $dbh,$addedfield) = @_;
+sub build_tabs ($$$$) {
+ my($template, $record, $dbh,$encoding) = @_;
# fill arrays
my @loop_data =();
my $tag;
my $i=0;
-my $id=100;
my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
from authorised_values
where category=? order by lib");
-my ($biblionumtagfield,$biblionumtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"biblionumber","biblios");
-my $biblio;
-my $controlfields;
-my $leader;
-if ($xmlhash){
- $biblio=$xmlhash->{'datafield'};
- $controlfields=$xmlhash->{'controlfield'};
- $leader=$xmlhash->{'leader'};
-}
+ # 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;
-my %built;
# loop through each tab 0 through 9
-for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
-
+ for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
my @loop_data = ();
foreach my $tag (sort(keys (%{$tagslib}))) {
- next if ($tag eq $biblionumtagfield);## Otherwise biblionumber will be duplicated on modifs if user has set visibility to true
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.
- my @subfields_data;
-
- if ($xmlhash) {
- ####
-
- my %tagdefined;
- my %definedsubfields;
-
- my ($ind1,$ind2);
-
- if ($tag>9){
- foreach my $data (@$biblio){
- my @subfields_data;
- undef %definedsubfields;
- if ($data->{'tag'} eq $tag){
- $tagdefined{$tag}=1 ;
- $ind1=" ";
- $ind2=" ";
- foreach my $subfieldcode ( $data->{'subfield'}){
- foreach my $code ( @$subfieldcode){
- next if ($tagslib->{$tag}->{$code->{'code'}}->{tab} ne $tabloop);
- my $subfield=$code->{'code'} ;
- my $value=$code->{'content'};
- $definedsubfields{$tag.$subfield}=1 ;
- $built{$tag}=1;
- push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id)) ;
- $i++ ;
- }
- } ##each subfield
- $ind1=$data->{'ind1'};
- $ind2= $data->{'ind2'};
-
-
- # 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 ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "1") ); #check for visibility flag
- next if ($definedsubfields{$tag.$subfield} );
- push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
- $definedsubfields{$tag.$subfield}=1;
- $i++;
+ if ($record ne -1 && ($record->field($tag) || $tag eq '000')) {
+ my @fields;
+ if ($tag ne '000') {
+ @fields = $record->field($tag);
+ } else {
+ push @fields,$record->leader();
}
- 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} = $ind1.$ind2 if ($tag>=10);
- $tag_data{subfield_loop} = \@subfields_data;
- push (@loop_data, \%tag_data);
-
+ 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='@';
}
- $id++;
- }## if tag matches
-
- }#eachdata
- }else{ ## tag <10
- if ($tag eq "000" || $tag eq "LDR"){
- my $subfield="@";
next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
- my @subfields_data;
- my $value=$leader->[0] if $leader->[0];
- $tagdefined{$tag}=1 ;
- push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+ next if ($tagslib->{$tag}->{$subfield}->{kohafield} eq 'biblio.biblionumber');
+ push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth));
$i++;
- 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{subfield_loop} = \@subfields_data;
- $tag_data{fixedfield} = 1;
- push (@loop_data, \%tag_data);
- }
- }else{
- foreach my $control (@$controlfields){
- my $subfield="@";
+ } 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);
- my @subfields_data;
- if ($control->{'tag'} eq $tag){
- $tagdefined{$tag}=1 ;
- my $value=$control->{'content'} ;
- $definedsubfields{$tag.'@'}=1;
- push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+ push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth));
$i++;
-
- $built{$tag}=1;
-
- 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{subfield_loop} = \@subfields_data;
- $tag_data{fixedfield} = 1;
- push (@loop_data, \%tag_data);
}
- $id++;
- }## tag matches
- }# each control
}
- }##tag >9
-
-
- ##### Any remaining tag
- my @subfields_data;
- # now, loop again to add parameter subfield that are not in the MARC::Record
+# now, loop again to add parameter subfield that are not in the MARC::Record
foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
- next if ($tagdefined{$tag} );
next if (length $subfield !=1);
next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
- next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "1") ); #check for visibility flag
-
- push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
- $tagdefined{$tag.$subfield}=1;
+ 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++;
}
if ($#subfields_data >= 0) {
@@ -392,7 +355,7 @@
$tag_data{tag} = $tag;
$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
- $tag_data{indicator} = $ind1.$ind2 if ($tag>=10);
+ $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;
@@ -400,44 +363,30 @@
push (@loop_data, \%tag_data);
}
-
-
- if ($addedfield eq $tag) {
- my %tag_data;
+# 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;
- $id++;
- $tagdefined{$tag}=1 ;
- foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
- next if (length $subfield !=1);
- next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
- next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "1") ); #check for visibility flag
- $addedfield="";
- push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
- $i++;
- }
- if ($#subfields_data >= 0) {
- $tag_data{tag} = $tag;
- $tag_data{tag_lib} = $tagslib->{$tag}->{lib};
- $tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
- $tag_data{indicator} = ' ' if ($tag>=10);
+ 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 breeding is empty
} else {
my @subfields_data;
foreach my $subfield (sort(keys %{$tagslib->{$tag}})) {
next if (length $subfield !=1);
- next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "1") ); #check for visibility flag
+ 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,$xmlhash,$authorised_values_sth,$id));
+ push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth));
$i++;
}
if ($#subfields_data >= 0) {
@@ -454,7 +403,6 @@
push (@loop_data, \%tag_data);
}
}
- $id++;
}
if ($#loop_data >=0) {
my %big_loop_line;
@@ -462,11 +410,13 @@
$big_loop_line{innerloop}=\@loop_data;
push @BIG_LOOP,\%big_loop_line;
}
+# $template->param($tabloop."XX" =>\@loop_data);
+ }
$template->param(BIG_LOOP => \@BIG_LOOP);
-}## tab loop
}
+
sub build_hidden_data () {
# build hidden data =>
# we store everything, even if we show only requested subfields.
@@ -500,17 +450,14 @@
#=========================
my $input = new CGI;
my $error = $input->param('error');
-my $oldbiblionumber=$input->param('oldbiblionumber'); # if bib exists, it's a modif, not a new biblio.
+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 $duplicateok = $input->param('duplicateok');
-my $suggestionid=$input->param('suggestionid');
my $frameworkcode = $input->param('frameworkcode');
my $dbh = C4::Context->dbh;
-my $biblionumber;
-$biblionumber=$oldbiblionumber if $oldbiblionumber;
+$frameworkcode = &MARCfind_frameworkcode($biblionumber) if ($biblionumber and not ($frameworkcode));
$frameworkcode='' if ($frameworkcode eq 'Default');
my ($template, $loggedinuser, $cookie)
@@ -523,7 +470,7 @@
});
#Getting the list of all frameworks
-my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblios_framework");
+my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
$queryfwk->execute;
my %select_fwk;
my @select_fwk;
@@ -535,7 +482,8 @@
$select_fwk{$fwk} = $description;
}
$curfwk=$frameworkcode;
-my $framework=CGI::scrolling_list( -name => 'Frameworks',
+my $framework=CGI::scrolling_list(
+ -name => 'Frameworks',
-id => 'Frameworks',
-default => $curfwk,
-OnChange => 'Changefwk(this);',
@@ -543,59 +491,48 @@
-labels => \%select_fwk,
-size => 1,
-multiple => 0 );
-$template->param( framework => $framework);
-my $xmlhash;
-my $xml;
-#####DO NOT RETRIVE FROM ZEBRA######
-my $record =XMLgetbiblio($dbh,$biblionumber) if ($biblionumber);
-$xmlhash=XML_xml2hash_onerecord($record) if ($biblionumber);
-$frameworkcode=MARCfind_frameworkcode( $dbh, $biblionumber );
-###########
+$template->param( framework => $framework, breedingid => $breedingid);
+
$tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
-if ($suggestionid && !$biblionumber){
-my $data=GetSuggestion($suggestionid) ;
-$xml=$data->{xml};
-$xmlhash=XML_xml2hash_onerecord($xml);
-}
+my $record=-1;
my $encoding="";
-($xmlhash,$encoding) = MARCfindbreeding($dbh,$breedingid,$oldbiblionumber) if ($breedingid);
+$record = GetMarcBiblio( $biblionumber ) if ($biblionumber);
+($record,$encoding) = MARCfindbreeding($dbh,$breedingid) if ($breedingid);
+# warn "biblionumber : $biblionumber = ".$record->as_formatted;
$is_a_modif=0;
-$is_a_modif=1 if $oldbiblionumber;
-my ($oldbiblionumtagfield,$oldbiblionumtagsubfield);
-if ($biblionumber && !$z3950) {
+my ($biblionumtagfield,$biblionumtagsubfield);
+my ($biblioitemnumtagfield,$biblioitemnumtagsubfield,$bibitem,$biblioitemnumber);
+if ($biblionumber) {
$is_a_modif=1;
- # if it's a modif, retrieve old biblionumber for the future modification of old-DB.
- ($oldbiblionumtagfield,$oldbiblionumtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"biblionumber","biblios");
-
-
+ # if it's a modif, retrieve bibli and biblioitem numbers for the future modification of old-DB.
+ ($biblionumtagfield,$biblionumtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"biblio.biblionumber",$frameworkcode);
+ ($biblioitemnumtagfield,$biblioitemnumtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"biblioitems.biblioitemnumber",$frameworkcode);
+ # search biblioitems value
+ my $sth=$dbh->prepare("select biblioitemnumber from biblioitems where biblionumber=?");
+ $sth->execute($biblionumber);
+ ($biblioitemnumber) = $sth->fetchrow;
}
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------------
if ($op eq "addbiblio") {
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------------
# rebuild
my @tags = $input->param('tag');
- my @subfields =$input->param('subfield');
- my @values=$input->param('field_value');
+ 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 @tagindex=$input->param('tagindex');
-
-
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,\@tagindex);
-};
- if ($@){
-warn $@;
- $template->param(error =>1,xmlerror=>1,);
-goto FINAL;
- };
-my $xmlhash=XML_xml2hash_onerecord($xml);
- my ($duplicatebiblionumber,$duplicatetitle) = FindDuplicate($xmlhash) if (($op eq "addbiblio") && (!$is_a_modif) && (!$duplicateok));
+ if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
+ $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+ } else {
+ my $xml = MARChtml2xml(\@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;
+ }
+ # check for a duplicate
+ my ($duplicatebiblionumber,$duplicatebiblionumber,$duplicatetitle) = FindDuplicate($record) if ($op eq "addbiblio") && (!$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) {
@@ -603,108 +540,108 @@
my $oldbibnum;
my $oldbibitemnum;
if ($is_a_modif) {
- NEWmodbiblio($dbh,$biblionumber,$xmlhash,$frameworkcode);
-
- } else {
-
- ($biblionumber) = NEWnewbiblio($dbh,$xmlhash,$frameworkcode);
-
+ ModBiblioframework($biblionumber,$frameworkcode);
+ ModBiblio($record,$biblionumber,$frameworkcode);
+ }
+ else {
+ ($biblionumber,$oldbibitemnum) = AddBiblio($record,$frameworkcode);
}
# now, redirect to additem page
- unless ($fromserials){
- print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode") unless $fromserials;
+ print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
exit;
- }else{
- my $title=XML_readline_onerecord($xmlhash,"title","biblios");
- $template->param(exit=>1,biblionumber=>$biblionumber,title=>$title);
- goto FINAL;
- }
-
} else {
-FINAL:
# it may be a duplicate, warn the user and do nothing
- build_tabs ($template, $xmlhash, $dbh);
+ build_tabs ($template, $record, $dbh,$encoding);
build_hidden_data;
- $template->param(fromserials=>$fromserials,
- oldbiblionumber => $oldbiblionumber,
+ $template->param(
biblionumber => $biblionumber,
- oldbiblionumtagfield => $oldbiblionumtagfield,
- oldbiblionumtagsubfield => $oldbiblionumtagsubfield,
+ biblionumtagfield => $biblionumtagfield,
+ biblionumtagsubfield => $biblionumtagsubfield,
+ biblioitemnumtagfield => $biblioitemnumtagfield,
+ biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
+ biblioitemnumber => $biblioitemnumber,
duplicatebiblionumber => $duplicatebiblionumber,
+ duplicatebibid => $duplicatebiblionumber,
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 @tagindex=$input->param('tagindex');
- my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,\@tagindex);
- my $xmlhash=XML_xml2hash_onerecord($xml);
- # adding an empty field
- build_tabs ($template, $xmlhash, $dbh,$addedfield);
+ my $xml = MARChtml2xml(\@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 = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
+ } else {
+ my $xml = MARChtml2xml(\@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(
- oldbiblionumber => $oldbiblionumber,
biblionumber => $biblionumber,
- oldbiblionumtagfield => $oldbiblionumtagfield,
- oldbiblionumtagsubfield => $oldbiblionumtagsubfield,
- fromserials=>$fromserials
- );
+ biblionumtagfield => $biblionumtagfield,
+ biblionumtagsubfield => $biblionumtagsubfield,
+ biblioitemnumtagfield => $biblioitemnumtagfield,
+ biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
+ biblioitemnumber => $biblioitemnumber );
} elsif ($op eq "delete") {
-#------------------------------------------------------------------------------------------------------------------------------
-my $sth=$dbh->prepare("select iss.itemnumber from items i ,issues iss where iss.itemnumber=i.itemnumber and iss.returndate is null and i.biblionumber=?");
- $sth->execute($biblionumber);
-my $onloan=$sth->fetchrow;
-
- if (!$onloan){
- NEWdelbiblio($dbh,$biblionumber);
-print $input->redirect("/cgi-bin/koha/catalogue/catalogue-search.pl");
- exit;
- }else{
-
-$template->param(error => 1, onloan=>1,);
+#-----------------------------------------------------------------------------
+ my $error = &DelBiblio($biblionumber);
+ if ($error) {
+ warn "ERROR when DELETING BIBLIO $biblionumber : $error";
+ print "Content-Type: text/html\n\n<html><body><h1>ERROR when DELETING BIBLIO $biblionumber : $error</h1></body></html>";
+ } else {
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=/cgi-bin/koha/catalogue/search.pl?type=intranet\"></html>";
}
-#------------------------------------------------------------------------------------------------------------------------------
-#------------------------------------------------------------------------------------------------------------------------------
+ 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 = "";
- $oldbiblionumber= "";
- $template->param(duplicateok => 1);
+ $biblionumber= "";
}
- build_tabs ($template, $xmlhash, $dbh);
+ #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');
+ $record = $urecord;
+ };
+ build_tabs ($template, $record, $dbh,$encoding);
build_hidden_data;
$template->param(
- oldbiblionumber => $oldbiblionumber,
biblionumber => $biblionumber,
- oldbiblionumtagfield => $oldbiblionumtagfield,
- oldbiblionumtagsubfield => $oldbiblionumtagsubfield,
- fromserials=>$fromserials
+ biblionumtagfield => $biblionumtagfield,
+ biblionumtagsubfield => $biblionumtagsubfield,
+ biblioitemnumtagfield => $biblioitemnumtagfield,
+ biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
+ biblioitemnumber => $biblioitemnumber,
);
}
-$template->param(
- isbntag => $isbntag,
- isbnsub => $isbnsub,
- issntag => $isbntag,
- issnsub => $issnsub,
- titletag => $titletag,
- titlesub => $titlesub,
- authortag => $authortag,
- authorsub => $authorsub,
- );
-
+$template->param( title => $record->title() ) if ($record ne "-1");
$template->param(
frameworkcode => $frameworkcode,
itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled !
@@ -714,5 +651,4 @@
IntranetNav => C4::Context->preference("IntranetNav"),
advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
);
-
output_html_with_http_headers $input, $cookie, $template->output;
Index: addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- addbooks.pl 27 Sep 2006 21:19:21 -0000 1.7
+++ addbooks.pl 9 Mar 2007 14:32:55 -0000 1.8
@@ -1,6 +1,19 @@
#!/usr/bin/perl
-# $Id: addbooks.pl,v 1.7 2006/09/27 21:19:21 tgarip1957 Exp $
+# $Id: addbooks.pl,v 1.8 2007/03/09 14:32:55 tipaul Exp $
+
+#
+# Modified saas at users.sf.net 12:00 01 April 2001
+# The biblioitemnumber was not correctly initialised
+# The max(barcode) value was broken - koha 'barcode' is a string value!
+# - If left blank, barcode value now defaults to max(biblionumber)
+
+#
+# TODO
+#
+# Add info on biblioitems and items already entered as you enter new ones
+#
+# Add info on biblioitems and items already entered as you enter new ones
# Copyright 2000-2002 Katipo Communications
#
@@ -23,18 +36,23 @@
use CGI;
use C4::Auth;
use C4::Biblio;
+use C4::Breeding;
use C4::Output;
use C4::Interface::CGI::Output;
+
use C4::Koha;
+use C4::Search;
+
+my $input = new CGI;
-my $query = new CGI;
+my $success = $input->param('biblioitem');
+my $query = $input->param('q');
+my @value = $input->param('value');
-my $error = $query->param('error');
-my $success = $query->param('biblioitem');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "cataloguing/addbooks.tmpl",
- query => $query,
+ query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { editcatalogue => 1 },
@@ -52,8 +70,78 @@
push @frameworkcodeloop, \%row;
}
-my $marc_p = C4::Context->boolean_preference("marc");
-$template->param( NOTMARC => !$marc_p,
- frameworkcodeloop => \@frameworkcodeloop );
+# Searching the catalog.
+if($query) {
+ my ($error, $marcresults) = SimpleSearch($query);
+
+ if (defined $error) {
+ $template->param(error => $error);
+ warn "error: ".$error;
+ output_html_with_http_headers $input, $cookie, $template->output;
+ exit;
+ }
+
+ my $total = scalar @$marcresults;
+ my @results;
+
+ for(my $i=0;$i<$total;$i++) {
+ my %resultsloop;
+ my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
+ my $biblio = MARCmarc2koha(C4::Context->dbh,$marcrecord,'');
+
+ #hilight the result
+ $biblio->{'title'} =~ s/$query/<span class=term>$&<\/span>/gi;
+ $biblio->{'subtitle'} =~ s/$query/<span class=term>$&<\/span>/gi;
+ $biblio->{'biblionumber'} =~ s/$query/<span class=term>$&<\/span>/gi;
+ $biblio->{'author'} =~ s/$query/<span class=term>$&<\/span>/gi;
+ $biblio->{'publishercode'} =~ s/$query/<span class=term>$&<\/span>/gi;
+ $biblio->{'publicationyear'} =~ s/$query/<span class=term>$&<\/span>/gi;
+
+ #build the hash for the template.
+ $resultsloop{highlight} = ($i % 2)?(1):(0);
+ $resultsloop{title} = $biblio->{'title'};
+ $resultsloop{subtitle} = $biblio->{'subtitle'};
+ $resultsloop{biblionumber} = $biblio->{'biblionumber'};
+ $resultsloop{author} = $biblio->{'author'};
+ $resultsloop{publishercode} = $biblio->{'publishercode'};
+ $resultsloop{publicationyear} = $biblio->{'publicationyear'};
+
+ push @results, \%resultsloop;
+ }
+ $template->param(
+ total => $total,
+ query => $query,
+ resultsloop => \@results,
+ );
+}
+
+# fill with books in breeding farm
+my $toggle=0;
+my ($title,$isbn);
+# fill isbn or title, depending on what has been entered
+$isbn=$query if $query =~ /\d/;
+$title=$query unless $isbn;
+my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query;
+my @breeding_loop = ();
+for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
+ my %row_data;
+ if ( $i % 2 ) {
+ $toggle = 0;
+ }
+ else {
+ $toggle = 1;
+ }
+ $row_data{toggle} = $toggle;
+ $row_data{id} = $resultsbr[$i]->{'id'};
+ $row_data{isbn} = $resultsbr[$i]->{'isbn'};
+ $row_data{file} = $resultsbr[$i]->{'file'};
+ $row_data{title} = $resultsbr[$i]->{'title'};
+ $row_data{author} = $resultsbr[$i]->{'author'};
+ push ( @breeding_loop, \%row_data );
+}
+
+$template->param( frameworkcodeloop => \@frameworkcodeloop,
+ breeding_loop => \@breeding_loop,
+ );
-output_html_with_http_headers $query, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
Index: additem.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- additem.pl 27 Sep 2006 21:19:21 -0000 1.12
+++ additem.pl 9 Mar 2007 14:32:55 -0000 1.13
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: additem.pl,v 1.12 2006/09/27 21:19:21 tgarip1957 Exp $
+# $Id: additem.pl,v 1.13 2007/03/09 14:32:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -27,288 +27,203 @@
use C4::Biblio;
use C4::Context;
use C4::Koha; # XXX subfield_is_koha_internal_p
-use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Log;
-my $logstatus=C4::Context->preference('Activate_log');
+use MARC::File::XML;
sub find_value {
my ($tagfield,$insubfield,$record) = @_;
my $result;
my $indicator;
-my $item=$record->{datafield};
-my $controlfield=$record->{controlfield};
-my $leader=$record->{leader};
- if ($tagfield eq '000'){
-## We are getting the leader
-$result=$leader->[0];
-return($indicator,$result);
-}
- if ($tagfield <10){
- foreach my $control (@$controlfield) {
- if ($control->{tag} eq $tagfield){
- $result.=$control->{content};
- }
- }
- }else{
- foreach my $field (@$item) {
- if ($field->{tag} eq $tagfield){
- foreach my $subfield ( $field->{'subfield'}){
- foreach my $code ( @$subfield){
- if ($code->{code} eq $insubfield) {
- $result .= $code->{content};
- $indicator = $field->{ind1}.$field->{ind2};
- }
- }## each code
- }##each subfield
- }## if tag
- }### $field
- }## tag<10
+ foreach my $field ($record->field($tagfield)) {
+ my @subfields = $field->subfields();
+ foreach my $subfield (@subfields) {
+ if (@$subfield[0] eq $insubfield) {
+ $result .= @$subfield[1];
+ $indicator = $field->indicator(1).$field->indicator(2);
+ }
+ }
+ }
return($indicator,$result);
}
+
+sub get_item_from_barcode {
+ my ($barcode)=@_;
+ my $dbh=C4::Context->dbh;
+ my $result;
+ my $rq=$dbh->prepare("SELECT itemnumber from items where items.barcode=?");
+ $rq->execute($barcode);
+ ($result)=$rq->fetchrow;
+ return($result);
+}
+
my $input = new CGI;
my $dbh = C4::Context->dbh;
my $error = $input->param('error');
my $biblionumber = $input->param('biblionumber');
-my $oldbiblionumber =$biblionumber;
-my $frameworkcode=$input->param('frameworkcode');
-my $op = $input->param('op');
my $itemnumber = $input->param('itemnumber');
-my $fromserials=$input->param('fromserials');## if a serial is being added do not display navigation menus
-my $serialid=$input->param('serialid');
-my @itemrecords; ##Builds existing items
-my $bibliorecord; #Bibliorecord relared to this item
-my $newrecord; ## the new record buing built
-my $itemrecexist; #item record we are editing
-my $xml; ## data on html
- $frameworkcode=MARCfind_frameworkcode($dbh,$biblionumber) unless $frameworkcode;
-my $tagslib = &MARCitemsgettagslib($dbh,1,$frameworkcode);
-my $itemrecord;
-my $nextop="additem";
-my @errors; # store errors found while checking data BEFORE saving item.
+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 = &MARCfind_frameworkcode($biblionumber);
-#------------------------------------------------------------------------------------------------------------------------------
+my $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
+my $record = GetMarcBiblio($biblionumber);
+# warn "==>".$record->as_formatted;
+my $oldrecord = MARCmarc2koha($dbh,$record);
+my $itemrecord;
+my $nextop="additem";
+my @errors; # store errors found while checking data BEFORE saving item.
+#-------------------------------------------------------------------------------
if ($op eq "additem") {
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
# 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');
- my %indicators;
- for (my $i=0;$i<=$#ind_tag;$i++) {
- $indicators{$ind_tag[$i]} = $indicator[$i];
- }
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-};
- if ($@){
-push @errors,"non_utf8" ;
-$nextop = "additem";
-goto FINAL;
- };
- my $newrecord=XML_xml2hash_onerecord($xml);
-my $newbarcode=XML_readline_onerecord($newrecord,"barcode","holdings");
-
+ my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+ my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
# if autoBarcode is ON, calculate barcode...
if (C4::Context->preference('autoBarcode')) {
- unless ($newbarcode) {
+ my ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.barcode");
+ unless ($record->field($tagfield)->subfield($tagsubfield)) {
my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items");
$sth_barcode->execute;
- ($newbarcode) = $sth_barcode->fetchrow;
+ my ($newbarcode) = $sth_barcode->fetchrow;
$newbarcode++;
# OK, we have the new barcode, now create the entry in MARC record
- $newrecord=XML_writeline( $newrecord, "barcode", $newbarcode,"holdings" );
+ my $fieldItem = $record->field($tagfield);
+ $record->delete_field($fieldItem);
+ $fieldItem->add_subfields($tagsubfield => $newbarcode);
+ $record->insert_fields_ordered($fieldItem);
}
}
# check for item barcode # being unique
- my ($oldrecord)=XMLgetitem($dbh,"",$newbarcode);
-
- push @errors,"barcode_not_unique" if($oldrecord);
-# MARC::Record builded => now, record in DB
-## User may be keeping serialids in marc records -- check and add it
-if ($fromserials){
-$newrecord=XML_writeline( $newrecord, "serialid", $serialid,"holdings" );
-}
- # if barcode exists, don't create, but report the problem.
- unless ($oldrecord){
- $itemnumber=NEWnewitem($dbh,$newrecord,$biblionumber) ;
- if ($fromserials){
- my $holdingbranch=XML_readline_onerecord($newrecord,"holdingbranch","holdings");
- $template->param(exit=>1,holdingbranch=>$holdingbranch);
- }
+ my $addedolditem = MARCmarc2koha($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";
- }
- else{
+ $itemrecord = $record;
+ } else {
$nextop = "additem";
- $itemrecexist = $newrecord;
}
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
} elsif ($op eq "edititem") {
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
# retrieve item if exist => then, it's a modif
- ($itemrecexist) = XMLgetitemhash($dbh,$itemnumber);## item is already in our array-getit
+ $itemrecord = MARCgetitem($biblionumber,$itemnumber);
$nextop="saveitem";
-
-#logaction($loggedinuser,"acqui.simple","modify",$oldbiblionumber,"item : ".$itemnumber) if ($logstatus);
-
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
} elsif ($op eq "delitem") {
-#------------------------------------------------------------------------------------------------------------------------------
-# retrieve item if exist => then, it's a modif
-my $sth=$dbh->prepare("select * from issues i where i.returndate is null and i.itemnumber=?");
+#-------------------------------------------------------------------------------
+ # 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);
+ 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{
- &NEWdelitem($dbh,$itemnumber);
$nextop="additem";
-}
-#------------------------------------------------------------------------------------------------------------------------------
+ } else {
+ &DelItem($biblionumber,$itemnumber);
+ print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+ #$nextop="additem";
+ }
+#-------------------------------------------------------------------------------
} elsif ($op eq "saveitem") {
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
# rebuild
-#warn "save item";
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 $itemnumber = $input->param('itemnumber');
- my %indicators;
- for (my $i=0;$i<=$#ind_tag;$i++) {
- $indicators{$ind_tag[$i]} = $indicator[$i];
- }
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-};
- if ($@){
-push @errors,"non_utf8" ;
-$nextop = "edititem";
-goto FINAL;
- };
- my $newrecord=XML_xml2hash_onerecord($xml);
- my $newbarcode=XML_readline_onerecord($newrecord,"barcode","holdings");
- my ($oldrecord)=XMLgetitem($dbh,"",$newbarcode);
- $oldrecord=XML_xml2hash_onerecord($oldrecord);
- my $exist=XML_readline_onerecord($oldrecord,"itemnumber","holdings") if $oldrecord;
- if ($exist && ($exist ne $itemnumber)){
- push @errors,"barcode_not_unique" ; ## Although editing user may have changed the barcode
- $nextop="edititem";
- }else{
- NEWmoditem($dbh,$newrecord,$biblionumber,$itemnumber);
+# my $itemnumber = $input->param('itemnumber');
+ my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+ 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="";
$nextop="additem";
-
- }
}
#
-#------------------------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
# build screen with existing items. and "new" one
-#------------------------------------------------------------------------------------------------------------------------------
-FINAL:
+#-------------------------------------------------------------------------------
+my ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "cataloguing/additem.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {editcatalogue => 1},
+ debug => 1,
+ });
+
my %indicators;
$indicators{995}=' ';
-# now, build existing item list
-###DO NOT CHANGE TO RETRIVE FROM ZEBRA#####
-my $record =XMLgetbiblio($dbh,$biblionumber);
-$bibliorecord=XML_xml2hash_onerecord($record);
-my @itemxmls=XMLgetallitems($dbh,$biblionumber);
- foreach my $itemrecord(@itemxmls){
- my $itemhash=XML_xml2hash($itemrecord);
- push @itemrecords, $itemhash;
- }
-####
-
-
-
-my ($itemtagfield,$itemtagsubfield) = &MARCfind_marc_from_kohafield("itemnumber","holdings");
-my @itemnums;
-my @fields;
+# now, build existiing item list
+my $temp = GetMarcBiblio( $biblionumber );
+my @fields = $temp->fields();
+#my @fields = $record->fields();
my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
my @big_array;
-my @item_value_loop;
-my @header_value_loop;
-unless($fromserials){ ## do not display existing items if adding a serial. It could be a looong list
-foreach my $itemrecord (@itemrecords){
-
-my $item=$itemrecord->{datafield};
-my $controlfield=$itemrecord->{controlfield};
-my $leader=$itemrecord->{leader};
-my %this_row;
- ### The leader
- unless ($tagslib->{'000'}->{'@'}->{tab} ne 10 || substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0){
- my @datasub='000@';
- $witness{$datasub[0]} = $tagslib->{'000'}->{'@'}->{lib};
- $this_row{$datasub[0]} =$leader->[0];
- }## leader
- foreach my $control (@$controlfield){
- push @itemnums,$control->{content} if ($control->{tag} eq $itemtagfield);
- next if ($tagslib->{$control->{tag}}->{'@'}->{tab} ne 10);
- next if (substr($tagslib->{$control->{tag}}->{'@'}->{hidden},1,1)>0);
-
- my @datasub=$control->{tag}.'@';
- $witness{$datasub[0]} = $tagslib->{$control->{tag}}->{'@'}->{lib};
- $this_row{$datasub[0]} =$control->{content};
- }## Controlfields
- foreach my $data (@$item){
- foreach my $subfield ( $data->{'subfield'}){
- foreach my $code ( @$subfield){
- # loop through each subfield
- push @itemnums,$code->{content} if ($data->{tag} eq $itemtagfield && $code->{code} eq $itemtagsubfield);
- next if ($tagslib->{$data->{tag}}->{$code->{code}}->{tab} ne 10);
- next if (substr($tagslib->{$data->{tag}}->{$code->{code}}->{hidden},1,1)>0);
- $witness{$data->{tag}.$code->{code}} = $tagslib->{$data->{tag}}->{$code->{code}}->{lib};
- $this_row{$data->{tag}.$code->{code}} =$code->{content};
+#---- finds where items.itemnumber is stored
+my ($itemtagfield,$itemtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.itemnumber",$frameworkcode);
+my ($branchtagfield,$branchtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.homebranch",$frameworkcode);
+
+foreach my $field (@fields) {
+ next if ($field->tag()<10);
+ my @subf=$field->subfields;
+ 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));
+ $witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib} if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10);
+ $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")) {
+ #verifying rights
+ my $userenv = C4::Context->userenv;
+ unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subf[$i][1]))){
+ $this_row{'nomod'}=1;
+ }
+ }
+ $this_row{itemnumber} = $subf[$i][1] if ($field->tag() eq $itemtagfield && $subf[$i][0] eq $itemtagsubfield);
}
-
- }# subfield
-
- }## each data
if (%this_row) {
push(@big_array, \%this_row);
}
-}## each record
+}
#fill big_row with missing datas
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});
}
}
-# now, construct template !
+my ($holdingbrtagf,$holdingbrtagsubf) = &MARCfind_marc_from_kohafield($dbh,"items.holdingbranch",$frameworkcode);
+ at big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
+# now, construct template !
+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 .="<td>".$big_array[$i]{$subfield_code}."</td>";
}
my %row_data;
+ $items_data =~ s/"/"/g;
$row_data{item_value} = $items_data;
- $row_data{itemnumber} = $itemnums[$i];
+ $row_data{itemnumber} = $big_array[$i]->{itemnumber};
+ #reporting this_row values
+ $row_data{'nomod'} = $big_array[$i]{'nomod'};
push(@item_value_loop,\%row_data);
}
foreach my $subfield_code (sort keys(%witness)) {
@@ -316,43 +231,45 @@
$header_value{header_value} = $witness{$subfield_code};
push(@header_value_loop, \%header_value);
}
-}## unless from serials
+
# next item form
my @loop_data =();
my $i=0;
my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=? order by lib");
foreach my $tag (sort keys %{$tagslib}) {
- if ($itemtagfield <10){
-next if($tag==$itemtagfield);
-}
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} eq $itemtagfield && $tagslib->{$tag}->{$subfield} eq $itemtagsubfield);
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}="<span id=\"error$i\" title=\"".$tagslib->{$tag}->{$subfield}->{lib}."\">".substr($tagslib->{$tag}->{$subfield}->{lib},0,12)."</span>";
$subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
- $subfield_data{hidden}= "display:none" if (substr($tagslib->{$tag}->{$subfield}->{hidden},2,1)>0);
-
+ $subfield_data{hidden}= "display:none" if $tagslib->{$tag}->{$subfield}->{hidden};
my ($x,$value);
- ($x,$value) = find_value($tag,$subfield,$itemrecexist) if ($itemrecexist);
+ ($x,$value) = find_value($tag,$subfield,$itemrecord) if ($itemrecord);
+ $value =~ s/"/"/g;
+ #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
- my ($itemcntag,$itemcntagsub)=MARCfind_marc_from_kohafield("itemcallnumber","holdings");
- if ($tag eq $itemcntag && $subfield eq $itemcntagsub && C4::Context->preference('itemcallnumber')) {
+ 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 $temp1 = XML_readline_onerecord($bibliorecord,"","",$CNtag,$CNsubfield);
- my $temp2 = XML_readline_onerecord($bibliorecord,"","",$CNtag,$CNsubfield2);
- $value = $temp1.' '.$temp2;
+ 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;
-
+ }
}
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
my @authorised_values;
@@ -360,6 +277,15 @@
# builds list, depending on authorised value...
#---- branch
if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+ if ((C4::Context->preference("IndependantBranches")) && (C4::Context->userenv->{flags} != 1)){
+ my $sth=$dbh->prepare("select branchcode,branchname from branches where branchcode = ? order by branchname");
+ $sth->execute(C4::Context->userenv->{branch});
+ push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
+ while (my ($branchcode,$branchname) = $sth->fetchrow_array) {
+ push @authorised_values, $branchcode;
+ $authorised_lib{$branchcode}=$branchname;
+ }
+ } else {
my $sth=$dbh->prepare("select branchcode,branchname from branches order by branchname");
$sth->execute;
push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
@@ -367,6 +293,7 @@
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");
@@ -387,21 +314,21 @@
}
$subfield_data{marc_value}= CGI::scrolling_list(-name=>'field_value',
-values=> \@authorised_values,
- -default=>"$value", -labels => \%authorised_lib, -size=>1,
- -multiple=>0, );
+ -default=>"$value",
+ -labels => \%authorised_lib,
+ -size=>1,
+ -tabindex=>'',
+ -multiple=>0,
+ );
} elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=47 maxlength=255 DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=47 maxlength=255> <a href=\"javascript:Dopop('cataloguing/thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
#"
} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
- my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
- unless (opendir(DIR, "$cgidir")) {
- $cgidir = C4::Context->intranetdir."/value_builder";
- }
- my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
+ my $plugin="value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
require $plugin;
- my $extended_param = plugin_parameters($dbh,$newrecord,$tagslib,$i,0);
- my ($function_name,$javascript) = plugin_javascript($dbh,$newrecord,$tagslib,$i,0);
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
+ my $extended_param = plugin_parameters($dbh,$record,$tagslib,$i,0);
+ my ($function_name,$javascript) = plugin_javascript($dbh,$record,$tagslib,$i,0);
+ $subfield_data{marc_value}="<input type=\"text\" value=\"$value\" name=\"field_value\" size=47 maxlength=255 OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
} else {
$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=50 maxlength=255>";
}
@@ -411,32 +338,20 @@
}
}
-
# 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 => &XML_readline_onerecord($bibliorecord,"title","biblios"),
- author => &XML_readline_onerecord($bibliorecord,"author","biblios"),
+ 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,
- fromserials=>$fromserials, serialid=>$serialid,);
+ opisadd => ($nextop eq "saveitem")?0:1);
foreach my $error (@errors) {
$template->param($error => 1);
-
}
output_html_with_http_headers $input, $cookie, $template->output;
-
-sub XMLfinditem {
-my ($itemnumber, at itemrecords)=@_;
-foreach my $record (@itemrecords){
-my $inumber=XML_readline_onerecord($record,"itemnumber","holdings");
- if ($inumber ==$itemnumber){
- return $record;
- }
-}
-}
More information about the Koha-cvs
mailing list