[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22 |
Date: |
Wed, 11 Feb 2004 00:40:13 -0800 |
Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui.simple
Modified Files:
addbiblio.pl additem.pl
Log Message:
synch'ing 2.0.0 branch and head
Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** addbiblio.pl 22 Dec 2003 19:16:58 -0000 1.33
--- addbiblio.pl 11 Feb 2004 08:40:11 -0000 1.34
***************
*** 161,164 ****
--- 161,165 ----
sub create_input () {
my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_;
+ $value =~ s/"/"/g;
my $dbh = C4::Context->dbh;
my %subfield_data;
***************
*** 197,201 ****
my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
from authorised_values
! where category=? order by authorised_value");
# loop through each tab 0 through 9
--- 198,202 ----
my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
from authorised_values
! where category=? order by lib");
# loop through each tab 0 through 9
***************
*** 213,218 ****
my $value=$field->data();
my $subfield="@";
! push(@subfields_data,
&create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth))
! unless
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
$i++;
} else {
--- 214,219 ----
my $value=$field->data();
my $subfield="@";
! next if
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
! push(@subfields_data,
&create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth));
$i++;
} else {
***************
*** 231,236 ****
next if
subfield_is_koha_internal_p($subfield);
next if
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
! next if ($tag > 10 &&
defined($record->field($tag)->subfield($subfield)));
! next if ($tag < 10 &&
defined($record->field($tag)->data()));
push(@subfields_data,
&create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth));
$i++;
--- 232,237 ----
next if
subfield_is_koha_internal_p($subfield);
next if
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
! next if ($tag<10);
! next if
(defined($record->field($tag)->subfield($subfield)));
push(@subfields_data,
&create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth));
$i++;
***************
*** 240,244 ****
$tag_data{tag} = $tag;
$tag_data{tag_lib} =
$tagslib->{$tag}->{lib};
! $tag_data{indicator} =
$indicator;
$tag_data{subfield_loop} =
address@hidden;
push (@loop_data, \%tag_data);
--- 241,245 ----
$tag_data{tag} = $tag;
$tag_data{tag_lib} =
$tagslib->{$tag}->{lib};
! $tag_data{indicator} =
$record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if
($tag>=10);
$tag_data{subfield_loop} =
address@hidden;
push (@loop_data, \%tag_data);
***************
*** 325,329 ****
type => "intranet",
authnotrequired => 0,
! flagsrequired => {catalogue => 1},
debug => 1,
});
--- 326,330 ----
type => "intranet",
authnotrequired => 0,
! flagsrequired => {editcatalogue => 1},
debug => 1,
});
Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** additem.pl 12 Jan 2004 17:00:09 -0000 1.21
--- additem.pl 11 Feb 2004 08:40:11 -0000 1.22
***************
*** 275,277 ****
$template->param($error => 1);
}
! output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
--- 275,277 ----
$template->param($error => 1);
}
! output_html_with_http_headers $input, $cookie, $template->output;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67
- Next by Date:
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86
- Previous by thread:
[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67
- Next by thread:
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86
- Index(es):