[Koha-cvs] CVS: koha ISBDdetail.pl,1.4,1.5 MARCdetail.pl,1.25,1.26 about.pl,1.4,1.5 boraccount.pl,1.9,1.10 bull-home.pl,1.2,1.3 detail.pl,1.24,1.25 pay.pl,1.10,1.11 plugin_launcher.pl,1.3,1.4 renewscript.pl,1.7,1.8 request.pl,1.29,1.30
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 1 14:41:50 CET 2005
- Previous message: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/includes basket.js,1.1,1.2 opac-basket-menu.inc,1.4,1.5 opac-basket-top.inc,1.4,1.5 opac-bottom.inc,1.3,1.4 opac-top.inc,1.6,1.7 opac.css,1.5,1.6
- Next message: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915
Modified Files:
ISBDdetail.pl MARCdetail.pl about.pl boraccount.pl
bull-home.pl detail.pl pay.pl plugin_launcher.pl
renewscript.pl request.pl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
Index: ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/ISBDdetail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ISBDdetail.pl 8 Dec 2004 10:30:29 -0000 1.4
--- ISBDdetail.pl 1 Mar 2005 13:40:35 -0000 1.5
***************
*** 100,104 ****
for my $i (0..$#subf) {
my $subfieldcode = $subf[$i][0];
! my $subfieldvalue = $subf[$i][1];
my $tagsubf = $tag.$subfieldcode;
$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
--- 100,104 ----
for my $i (0..$#subf) {
my $subfieldcode = $subf[$i][0];
! my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);;
my $tagsubf = $tag.$subfieldcode;
$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
***************
*** 131,132 ****
--- 131,157 ----
output_html_with_http_headers $query, $cookie, $template->output;
+ sub get_authorised_value_desc ($$$$$) {
+ my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+ #---- branch
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+ return getbranchname($value);
+ }
+
+ #---- itemtypes
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+ return ItemType($value);
+ }
+
+ #---- "true" authorized value
+ my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+ if ($category ne "") {
+ my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+ $sth->execute($category, $value);
+ my $data = $sth->fetchrow_hashref;
+ return $data->{'lib'};
+ } else {
+ return $value; # if nothing is found return the original value
+ }
+ }
Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** MARCdetail.pl 3 Jan 2005 12:57:21 -0000 1.25
--- MARCdetail.pl 1 Mar 2005 13:40:47 -0000 1.26
***************
*** 57,61 ****
use C4::Biblio;
use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionfrom biblionumber
use HTML::Template;
--- 57,61 ----
use C4::Biblio;
use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionsfrombiblionumber
use HTML::Template;
***************
*** 122,126 ****
$subfield_data{authority}=$fields[$x_i]->subfield(9);
}
! $subfield_data{marc_value}=$subf[$i][1];
}
$subfield_data{marc_subfield}=$subf[$i][0];
--- 122,126 ----
$subfield_data{authority}=$fields[$x_i]->subfield(9);
}
! $subfield_data{marc_value}=get_authorised_value_desc($fields[$x_i]->tag(), $subf[$i][0], $subf[$i][1], '', $dbh);
}
$subfield_data{marc_subfield}=$subf[$i][0];
***************
*** 159,162 ****
--- 159,163 ----
for my $i (0..$#subf) {
next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10);
+ next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
$witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
$this_row{$subf[$i][0]} =$subf[$i][1];
***************
*** 190,194 ****
}
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
$template->param(item_loop => \@item_value_loop,
item_header_loop => \@header_value_loop,
--- 191,195 ----
}
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
$template->param(item_loop => \@item_value_loop,
item_header_loop => \@header_value_loop,
***************
*** 196,202 ****
bibid => $bibid,
biblionumber => $biblionumber,
! subscriptionid => $subscriptionid,
popup => $popup,
);
output_html_with_http_headers $query, $cookie, $template->output;
--- 197,228 ----
bibid => $bibid,
biblionumber => $biblionumber,
! subscriptionsnumber => $subscriptionsnumber,
popup => $popup,
);
output_html_with_http_headers $query, $cookie, $template->output;
+ sub get_authorised_value_desc ($$$$$) {
+ my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+ #---- branch
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+ return getbranchname($value);
+ }
+
+ #---- itemtypes
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+ return ItemType($value);
+ }
+
+ #---- "true" authorized value
+ my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+ if ($category ne "") {
+ my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+ $sth->execute($category, $value);
+ my $data = $sth->fetchrow_hashref;
+ return $data->{'lib'};
+ } else {
+ return $value; # if nothing is found return the original value
+ }
+ }
Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** about.pl 28 Nov 2003 13:59:30 -0000 1.4
--- about.pl 1 Mar 2005 13:40:47 -0000 1.5
***************
*** 25,28 ****
--- 25,29 ----
my $mysqlVersion = `mysql -V`;
my $apacheVersion = `httpd -v`;
+ $apacheVersion = `httpd2 -v` unless $apacheVersion;
$template->param(
Index: bull-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-home.pl 5 Aug 2004 16:37:07 -0000 1.2
--- bull-home.pl 1 Mar 2005 13:40:47 -0000 1.3
***************
*** 13,17 ****
my $title = $query->param('title');
my $ISSN = $query->param('ISSN');
! my @subscriptions = getsubscriptions($title,$ISSN);
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/bull-home.tmpl",
--- 13,18 ----
my $title = $query->param('title');
my $ISSN = $query->param('ISSN');
! my $biblionumber = $query->param('biblionumber');
! my @subscriptions = getsubscriptions($title,$ISSN,$biblionumber);
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/bull-home.tmpl",
Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** detail.pl 8 Dec 2004 10:30:29 -0000 1.24
--- detail.pl 1 Mar 2005 13:40:47 -0000 1.25
***************
*** 1,70 ****
#!/usr/bin/perl
- # NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
- # Copyright 2000-2002 Katipo Communications
- #
- # This file is part of Koha.
- #
- # Koha is free software; you can redistribute it and/or modify it under the
- # terms of the GNU General Public License as published by the Free Software
- # Foundation; either version 2 of the License, or (at your option) any later
- # version.
- #
- # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License along with
- # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- # Suite 330, Boston, MA 02111-1307 USA
-
- use HTML::Template;
use strict;
require Exporter;
- use C4::Context;
- use C4::Output; # contains gettemplate
use CGI;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
! use C4::Date;
my $query=new CGI;
! my $type=$query->param('type');
! ($type) || ($type='intra');
my $biblionumber=$query->param('bib');
!
! # change back when ive fixed request.pl
! my @items = ItemInfo(undef, $biblionumber, $type);
! my $norequests = 1;
! foreach my $itm (@items) {
! $norequests = 0 unless $itm->{'notforloan'};
! }
!
! my $dat=bibdata($biblionumber);
! my ($authorcount, $addauthor)= &addauthor($biblionumber);
my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
my ($websitecount, @websites) = &getwebsites($biblionumber);
! my ($subjectcount, $subjects) = &subject($biblionumber);
$dat->{'count'}=@items;
- $dat->{'norequests'} = $norequests;
$dat->{'additional'}=$addauthor->[0]->{'author'};
for (my $i = 1; $i < $authorcount; $i++) {
! $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
} # for
! $dat->{'subjects'}=$subjects->[0]->{'subject'};
! for (my $i = 1; $i < $subjectcount; $i++) {
! $dat->{'subjects'} .= ", " . $subjects->[$i]->{'subject'};
! } # for
! my @results;
! $results[0]=$dat;
my $resultsarray=\@results;
--- 1,64 ----
#!/usr/bin/perl
use strict;
require Exporter;
use CGI;
use C4::Search;
use C4::Auth;
+ use C4::Bull; #uses getsubscriptionfrom biblionumber
use C4::Interface::CGI::Output;
! use HTML::Template;
! use C4::Biblio;
! use C4::SearchMarc;
my $query=new CGI;
! my ($template, $borrowernumber, $cookie)
! = get_template_and_user({template_name => "catalogue/detail.tmpl",
! query => $query,
! type => "intranet",
! authnotrequired => 1,
! flagsrequired => {borrow => 1},
! });
my $biblionumber=$query->param('bib');
! $template->param(biblionumber => $biblionumber);
! # change back when ive fixed request.pl
! my @items = &ItemInfo(undef, $biblionumber, 'intra');
! my $dat = &bibdata($biblionumber);
! my ($authorcount, $addauthor) = &addauthor($biblionumber);
my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
my ($websitecount, @websites) = &getwebsites($biblionumber);
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
$dat->{'count'}=@items;
$dat->{'additional'}=$addauthor->[0]->{'author'};
for (my $i = 1; $i < $authorcount; $i++) {
! $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
} # for
! my $norequests = 1;
! foreach my $itm (@items) {
! $norequests = 0 unless $itm->{'notforloan'};
! $itm->{$itm->{'publictype'}} = 1;
! }
!
! $template->param(norequests => $norequests);
! ## get notes and subjects from MARC record
! my $marc = C4::Context->preference("marc");
! if ($marc eq "yes") {
! my $dbh = C4::Context->dbh;
! my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
! my $marcflavour = C4::Context->preference("marcflavour");
! my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
! my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
! $template->param(MARCNOTES => $marcnotesarray);
! $template->param(MARCSUBJCTS => $marcsubjctsarray);
! }
!
! my @results = ($dat,);
my $resultsarray=\@results;
***************
*** 73,112 ****
my $sitearray=\@websites;
! my $startfrom=$query->param('startfrom');
! ($startfrom) || ($startfrom=0);
!
! my ($template, $loggedinuser, $cookie) = get_template_and_user({
! template_name => ($type eq 'opac'? 'catalogue/detail-opac.tmpl':
! 'catalogue/detail.tmpl'),
! query => $query,
! type => "intranet",
! authnotrequired => ($type eq 'opac'),
! flagsrequired => {catalogue => 1},
! });
!
! my $count=1;
!
! # now to get the items into a hash we can use and whack that thru
!
!
! my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
! my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
! $template->param(startfrom => $startfrom+1,
! endat => $startfrom+20,
! numrecords => $count,
! nextstartfrom => $nextstartfrom,
! prevstartfrom => $prevstartfrom,
! BIBLIO_RESULTS => $resultsarray,
! ITEM_RESULTS => $itemsarray,
! WEB_RESULTS => $webarray,
! SITE_RESULTS => $sitearray,
! loggedinuser => $loggedinuser,
! biblionumber => $biblionumber,
! );
output_html_with_http_headers $query, $cookie, $template->output;
-
-
- # Local Variables:
- # tab-width: 8
- # End:
--- 67,76 ----
my $sitearray=\@websites;
! $template->param(BIBLIO_RESULTS => $resultsarray,
! ITEM_RESULTS => $itemsarray,
! WEB_RESULTS => $webarray,
! SITE_RESULTS => $sitearray,
! subscriptionsnumber => $subscriptionsnumber,
! );
output_html_with_http_headers $query, $cookie, $template->output;
Index: plugin_launcher.pl
===================================================================
RCS file: /cvsroot/koha/koha/plugin_launcher.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** plugin_launcher.pl 30 Jul 2004 13:54:27 -0000 1.3
--- plugin_launcher.pl 1 Mar 2005 13:40:47 -0000 1.4
***************
*** 30,33 ****
my $plugin_name=$input->param("plugin_name");
my $plugin_name="value_builder/".$input->param("plugin_name");
! require $plugin_name;
&plugin($input);
--- 30,40 ----
my $plugin_name=$input->param("plugin_name");
my $plugin_name="value_builder/".$input->param("plugin_name");
!
! # 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";
! unless (opendir(DIR, "$cgidir/value_builder")) {
! $cgidir = C4::Context->intranetdir;
! }
! require $cgidir."/".$plugin_name;
&plugin($input);
Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** renewscript.pl 27 Jan 2005 19:31:14 -0000 1.7
--- renewscript.pl 1 Mar 2005 13:40:47 -0000 1.8
***************
*** 64,66 ****
} else {
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }
--- 64,66 ----
} else {
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }
\ No newline at end of file
Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** request.pl 19 Jan 2005 21:39:25 -0000 1.29
--- request.pl 1 Mar 2005 13:40:47 -0000 1.30
***************
*** 143,147 ****
}
}
! $reserve{'date'} = format_date($res->{'reservedate'});
$reserve{'borrowernumber'}=$res->{'borrowernumber'};
$reserve{'biblionumber'}=$res->{'biblionumber'};
--- 143,148 ----
}
}
!
! $reserve{'date'} = format_date($res->{'reservedate'});
$reserve{'borrowernumber'}=$res->{'borrowernumber'};
$reserve{'biblionumber'}=$res->{'biblionumber'};
- Previous message: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/includes basket.js,1.1,1.2 opac-basket-menu.inc,1.4,1.5 opac-basket-top.inc,1.4,1.5 opac-bottom.inc,1.3,1.4 opac-top.inc,1.6,1.7 opac.css,1.5,1.6
- Next message: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Koha-cvs
mailing list