gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

big commit, still breaking things... 

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
This commit is contained in:
tipaul 2005-10-26 09:11:02 +00:00
parent 61c133ca31
commit b38997925f
92 changed files with 1981 additions and 1324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
C4/Acquisition.pm
View File

@ -20,6 +20,7 @@ package C4::Acquisition;
use strict;
require Exporter;
use C4::Context;
use C4::Date;
use MARC::Record;
# use C4::Biblio;
@ -487,7 +488,7 @@ C<@results> is sorted alphabetically by book title.
#'
sub getallorders {
#gets all orders from a certain supplier, orders them alphabetically
my ($supid)=@_;
my ($supplierid)=@_;
my $dbh = C4::Context->dbh;
my @results = ();
my $strsth="Select *,aqorders.title as suggestedtitle,biblio.title as truetitle from aqorders,biblio,biblioitems,aqbasket,aqbooksellers ";
@ -506,14 +507,13 @@ sub getallorders {
}
$strsth .= " group by aqorders.biblioitemnumber order by biblio.title";
my $sth=$dbh->prepare($strsth);
$sth->execute($supid);
$sth->execute($supplierid);
while (my $data=$sth->fetchrow_hashref){
push(@results,$data);
}
$sth->finish;
return(scalar(@results),@results);
}
=item getsupplierlistwithlateorders
%results = &getsupplierlistwithlateorders;
@ -590,7 +590,7 @@ sub getlateorders {
AND ((datereceived = '' OR datereceived is null) OR (aqorders.quantityreceived < aqorders.quantity) ) ";
$strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid);
$strsth .= " AND borrowers.branchcode like \'".$branch."\'" if ($branch);
$strsth .= " AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'" if (C4::Context->preference("IndependantBranches") && C4::Context->userenv->{flags}!=1);
$strsth .= " AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'" if (C4::Context->preference("IndependantBranches") && C4::Context->userenv && C4::Context->userenv->{flags}!=1);
$strsth .= " ORDER BY latesince,basketno,borrowers.branchcode, supplier";
} else {
$strsth ="SELECT aqbasket.basketno,
@ -728,33 +728,43 @@ sub ordersearch {
sub histsearch {
my ($title,$author,$name,$from_placed_on,$to_placed_on)=@_;
my $dbh= C4::Context->dbh;
my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio";
$query .= ",borrowers " if (C4::Context->preference("IndependantBranches"));
$query .=" where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and biblio.biblionumber=aqorders.biblionumber ";
$query .= " and aqbasket.authorisedby=borrowers.borrowernumber" if (C4::Context->preference("IndependantBranches"));
$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
$query .= " and creationdate >" .$dbh->quote($from_placed_on) if $from_placed_on;
$query .= " and creationdate<".$dbh->quote($to_placed_on) if $to_placed_on;
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
unless ($userenv->{flags} == 1){
$query .= " and (borrowers.branchcode = '".$userenv->{branch}."' or borrowers.branchcode ='')";
my @order_loop;
my $total_qty=0;
my $total_price=0;
# don't run the query if there are no parameters (list would be too long for sure !
if ($title || $author || $name || $from_placed_on || $to_placed_on) {
my $dbh= C4::Context->dbh;
my $query = "select biblio.title,biblio.author,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio";
$query .= ",borrowers " if (C4::Context->preference("IndependantBranches"));
$query .=" where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and biblio.biblionumber=aqorders.biblionumber ";
$query .= " and aqbasket.authorisedby=borrowers.borrowernumber" if (C4::Context->preference("IndependantBranches"));
$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
$query .= " and creationdate >" .$dbh->quote($from_placed_on) if $from_placed_on;
$query .= " and creationdate<".$dbh->quote($to_placed_on) if $to_placed_on;
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
if (($userenv) &&($userenv->{flags} != 1)){
$query .= " and (borrowers.branchcode = '".$userenv->{branch}."' or borrowers.branchcode ='')";
}
}
$query .=" order by booksellerid";
my $sth = $dbh->prepare($query);
$sth->execute;
my $cnt=1;
while (my $line = $sth->fetchrow_hashref) {
$line->{count}=$cnt++;
$line->{toggle}=1 if $cnt %2;
push @order_loop, $line;
$line->{creationdate} = format_date($line->{creationdate});
$line->{datereceived} = format_date($line->{datereceived});
$total_qty += $line->{'quantity'};
$total_price += $line->{'quantity'}*$line->{'ecost'};
}
}
warn "C4:Acquisition : ".$query;
my $sth = $dbh->prepare($query);
$sth->execute;
my @order_loop;
my $cnt=1;
while (my $line = $sth->fetchrow_hashref) {
$line->{count}=$cnt++;
push @order_loop, $line;
}
return \@order_loop;
return \@order_loop,$total_qty,$total_price;;
}
#
@ -809,13 +819,13 @@ sub bookfunds {
my $dbh = C4::Context->dbh;
my $strsth;
if ($branch eq '') {
if ($branch) {
$strsth="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
=aqbudget.bookfundid
=aqbudget.bookfundid and (aqbookfund.branchcode is null or aqbookfund.branchcode='' or aqbookfund.branchcode= ? )
group by aqbookfund.bookfundid order by bookfundname";
} else {
$strsth="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
=aqbudget.bookfundid and (aqbookfund.branchcode is null or aqbookfund.branchcode='' or aqbookfund.branchcode= ? )
=aqbudget.bookfundid
group by aqbookfund.bookfundid order by bookfundname";
}
my $sth=$dbh->prepare($strsth);

4
C4/Amazon.pm
View File

@ -70,8 +70,8 @@ my $url = "http://xml.amazon.com/onca/xml3?t=$dev_key&dev-t=$af_tag&type=heavy&f
#Here's an example asin for the book "Cryptonomicon"
#0596005423";
use XML::Simple;
use LWP::Simple;
# use XML::Simple;
# use LWP::Simple;
my $content = get($url);
die "could not regrieve $url" unless $content;

87
C4/Auth.pm
View File

@ -146,53 +146,53 @@ sub get_template_and_user {
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
if ($flags && $flags->{circulate} == 1) {
if ($flags && $flags->{circulate} eq 1) {
$template->param(CAN_user_circulate => 1); }
if ($flags && $flags->{catalogue} == 1) {
if ($flags && $flags->{catalogue} eq 1) {
$template->param(CAN_user_catalogue => 1); }
if ($flags && $flags->{parameters} == 1) {
if ($flags && $flags->{parameters} eq 1) {
$template->param(CAN_user_parameters => 1);
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
if ($flags && $flags->{borrowers} == 1) {
if ($flags && $flags->{borrowers} eq 1) {
$template->param(CAN_user_borrowers => 1); }
if ($flags && $flags->{permissions} == 1) {
if ($flags && $flags->{permissions} eq 1) {
$template->param(CAN_user_permission => 1); }
if ($flags && $flags->{reserveforothers} == 1) {
if ($flags && $flags->{reserveforothers} eq 1) {
$template->param(CAN_user_reserveforothers => 1); }
if ($flags && $flags->{borrow} == 1) {
if ($flags && $flags->{borrow} eq 1) {
$template->param(CAN_user_borrow => 1); }
if ($flags && $flags->{reserveforself} == 1) {
if ($flags && $flags->{reserveforself} eq 1) {
$template->param(CAN_user_reserveforself => 1); }
if ($flags && $flags->{editcatalogue} == 1) {
if ($flags && $flags->{editcatalogue} eq 1) {
$template->param(CAN_user_editcatalogue => 1); }
if ($flags && $flags->{updatecharges} == 1) {
if ($flags && $flags->{updatecharges} eq 1) {
$template->param(CAN_user_updatecharge => 1); }
if ($flags && $flags->{acquisition} == 1) {
if ($flags && $flags->{acquisition} eq 1) {
$template->param(CAN_user_acquisition => 1); }
if ($flags && $flags->{management} == 1) {
if ($flags && $flags->{management} eq 1) {
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
if ($flags && $flags->{tools} == 1) {
if ($flags && $flags->{tools} eq 1) {
$template->param(CAN_user_tools => 1); }
}
@ -285,7 +285,7 @@ sub checkauth {
# state variables
my $loggedin = 0;
my %info;
my ($userid, $cookie, $sessionID, $flags, $envcookie);
my ($userid, $cookie, $sessionID, $flags,$envcookie);
my $logout = $query->param('logout.x');
if ($userid = $ENV{'REMOTE_USER'}) {
# Using Basic Authentication, no cookies required
@ -308,19 +308,20 @@ sub checkauth {
);
}
my ($ip , $lasttime);
($userid, $ip, $lasttime) = $dbh->selectrow_array(
"SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?",
undef, $sessionID);
if ($logout) {
# voluntary logout the user
$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
C4::Context->_unset_userenv($sessionID);
$sessionID = undef;
$userid = undef;
open L, ">>/tmp/sessionlog";
my $time=localtime(time());
printf L "%20s from %16s logged out at %30s (manually).\n", $userid, $ip, $time;
close L;
# voluntary logout the user
$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
C4::Context->_unset_userenv($sessionID);
$sessionID = undef;
$userid = undef;
open L, ">>/tmp/sessionlog";
my $time=localtime(time());
printf L "%20s from %16s logged out at %30s (manually).\n", $userid, $ip, $time;
close L;
}
if ($userid) {
if ($lasttime<time()-$timeout) {
@ -367,6 +368,7 @@ sub checkauth {
$userid=$query->param('userid');
C4::Context->_new_userenv($sessionID);
my $password=$query->param('password');
C4::Context->_new_userenv($sessionID);
my ($return, $cardnumber) = checkpw($dbh,$userid,$password);
if ($return) {
$dbh->do("DELETE FROM sessions WHERE sessionID=? AND userid=?",
@ -380,20 +382,29 @@ sub checkauth {
$cookie=$query->cookie(-name => 'sessionID',
-value => $sessionID,
-expires => '');
if ($flags = haspermission($dbh, $userid, $flagsrequired)) {
$loggedin = 1;
} else {
$info{'nopermission'} = 1;
C4::Context->_unset_userenv($sessionID);
C4::Context->_unset_userenv($sessionID);
}
if ($return == 1){
my $sth=$dbh->prepare(
"select cardnumber,borrowernumber,userid,firstname,surname,flags,branchcode,emailaddress
from borrowers where userid=?"
);
my ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress);
my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where userid=?");
$sth->execute($userid);
my ($cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow;
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
unless ($sth->rows){
my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where cardnumber=?");
$sth->execute($cardnumber);
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
unless ($sth->rows){
$sth->execute($userid);
($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
}
# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
}
my $hash = C4::Context::set_userenv(
$bornum,
$userid,
@ -404,6 +415,7 @@ sub checkauth {
$userflags,
$emailaddress,
);
# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
$envcookie=$query->cookie(-name => 'userenv',
-value => $hash,
-expires => '');
@ -414,7 +426,7 @@ sub checkauth {
C4::Context->config('user'),
C4::Context->config('user'),
C4::Context->config('user'),
"",1,'nobody@nowhere_koha.com'
"",1,C4::Context->preference('KohaAdminEmailAddress')
);
$envcookie=$query->cookie(-name => 'userenv',
-value => $hash,
@ -456,7 +468,7 @@ sub checkauth {
$template->param(loginprompt => 1) unless $info{'nopermission'};
my $self_url = $query->url(-absolute => 1);
$template->param(url => $self_url, LibraryName=> C4::Context->preference("LibraryName"),);
$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
$template->param(\%info);
$cookie=$query->cookie(-name => 'sessionID',
-value => $sessionID,
@ -484,7 +496,7 @@ sub checkpw {
return 1,$cardnumber;
}
}
my $sth=$dbh->prepare("select password from borrowers where cardnumber=?");
$sth=$dbh->prepare("select password from borrowers where cardnumber=?");
$sth->execute($userid);
if ($sth->rows) {
my ($md5password) = $sth->fetchrow;
@ -513,12 +525,15 @@ sub getuserflags {
my $sth=$dbh->prepare("SELECT flags FROM borrowers WHERE cardnumber=?");
$sth->execute($cardnumber);
my ($flags) = $sth->fetchrow;
$flags=0 unless $flags;
$sth=$dbh->prepare("SELECT bit, flag, defaulton FROM userflags");
$sth->execute;
while (my ($bit, $flag, $defaulton) = $sth->fetchrow) {
if (($flags & (2**$bit)) || $defaulton) {
$userflags->{$flag}=1;
}
if (($flags & (2**$bit)) || $defaulton) {
$userflags->{$flag}=1;
} else {
$userflags->{$flag}=0;
}
}
return $userflags;
}

57
C4/AuthoritiesMarc.pm
View File

@ -135,12 +135,13 @@ sub authoritysearch {
while (my ($authid) = $sth->fetchrow) {
push @result,$authid;
}
# we have authid list. Now, loads summary from [offset] to [offset]+[length]
my $counter = $offset;
# my $counter = $offset;
my @finalresult = ();
my $oldline;
while (($counter <= $#result) && ($counter <= ($offset + $length))) {
# while (($counter <= $#result) && ($counter <= ($offset + $length))) {
# retrieve everything
for (my $counter=0;$counter <=$#result;$counter++) {
# warn " HERE : $counter, $#result, $offset, $length";
# get MARC::Record of the authority
my $record = AUTHgetauthority($dbh,$result[$counter]);
@ -158,7 +159,7 @@ sub authoritysearch {
my $subfieldcode = $subf[$i][0];
my $subfieldvalue = $subf[$i][1];
my $tagsubf = $tag.$subfieldcode;
$summary =~ s/\[(.?.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue\[$1$tagsubf$2]$2/g;
$summary =~ s/\[(.?.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue$2\[$1$tagsubf$2]/g;
}
}
}
@ -184,11 +185,18 @@ sub authoritysearch {
$newline{biblio_fields} = $tags_using_authtype;
$newline{even} = $counter % 2;
$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
$counter++;
push @finalresult, \%newline;
}
# sort everything
my @finalresult3= sort {$a->{summary} cmp $b->{summary}} @finalresult;
# cut from $offset to $offset+$length;
my @finalresult2;
for (my $i=$offset;$i<=$offset+$length;$i++) {
push @finalresult2,$finalresult3[$i] if $finalresult3[$i];
}
my $nbresults = $#result + 1;
return (\@finalresult, $nbresults);
return (\@finalresult2, $nbresults);
}
# Creates the SQL Request
@ -400,7 +408,6 @@ sub AUTHaddauthority {
# pass the MARC::Record to this function, and it will create the records in the marc tables
my ($dbh,$record,$authid,$authtypecode) = @_;
my @fields=$record->fields();
# warn "IN AUTHaddauthority $authid => ".$record->as_formatted;
# adding main table, and retrieving authid
# if authid is sent, then it's not a true add, it's only a re-add, after a delete (ie, a mod)
# if authid empty => true add, find a new authid number
@ -428,15 +435,19 @@ sub AUTHaddauthority {
);
} else {
my @subfields=$field->subfields();
foreach my $subfieldcount (0..$#subfields) {
&AUTHaddsubfield($dbh,$authid,
$field->tag(),
$field->indicator(1).$field->indicator(2),
$fieldcount,
$subfields[$subfieldcount][0],
$subfieldcount+1,
$subfields[$subfieldcount][1]
);
my $subfieldorder;
foreach my $subfield (@subfields) {
foreach (split /\|/,@$subfield[1]) {
$subfieldorder++;
&AUTHaddsubfield($dbh,$authid,
$field->tag(),
$field->indicator(1).$field->indicator(2),
$fieldcount,
@$subfield[0],
$subfieldorder,
$_
);
}
}
}
}
@ -458,6 +469,7 @@ sub AUTHaddsubfield {
my @subfieldvalues = split /\|/,$subfieldvalues;
foreach my $subfieldvalue (@subfieldvalues) {
my $sth=$dbh->prepare("insert into auth_subfield_table (authid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values (?,?,?,?,?,?,?)");
# warn "==> $authid,".(sprintf "%03s",$tagid).",TAG : $tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue";
$sth->execute($authid,(sprintf "%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue);
if ($sth->errstr) {
warn "ERROR ==> insert into auth_subfield_table (authid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue) values ($authid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
@ -474,7 +486,7 @@ sub AUTHgetauthority {
$record->leader(' ');
my $sth=$dbh->prepare("select authid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue
from auth_subfield_table
where authid=? order by tag,tagorder,subfieldcode
where authid=? order by tag,tagorder,subfieldorder
");
$sth->execute($authid);
my $prevtagorder=1;
@ -927,8 +939,15 @@ Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
# Revision 1.20 2005/08/04 13:27:47 tipaul
# synch'ing 2.2 and head
# Revision 1.21 2005/10/26 09:12:33 tipaul
# big commit, still breaking things...
#
# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
# * code cleaning (cleaning warnings from perl -w) continued
#
# Revision 1.9.2.8 2005/10/25 12:38:59 tipaul
# * fixing bug in summary (separator before subfield was in fact after)
# * fixing bug in authority order : authorities are not ordered alphabetically instead of no order. Requires all the dataset to be retrieved, but the benefits is important !
#
# Revision 1.9.2.7 2005/08/01 15:14:50 tipaul
# minor change in summary handling (accepting 4 digits before the field)

33
C4/Biblio.pm
View File

@ -142,7 +142,7 @@ sub zebra_create {
unless (opendir(DIR, "$cgidir")) {
$cgidir = C4::Context->intranetdir."/";
}
closedir DIR;
my $filename = $cgidir."/zebra/biblios/BIBLIO".$biblionumber."iso2709";
open F,"> $filename";
print F $record->as_usmarc();
@ -202,7 +202,7 @@ sub MARCgettagslib {
while ( ( $tag, $liblibrarian, $libopac, $mandatory, $repeatable ) = $sth->fetchrow ) {
$res->{$tag}->{lib} = ($forlibrarian or !$libopac)?$liblibrarian:$libopac;
$res->{$tab}->{tab} = ""; # XXX
$res->{$tag}->{tab} = ""; # XXX
$res->{$tag}->{mandatory} = $mandatory;
$res->{$tag}->{repeatable} = $repeatable;
}
@ -376,7 +376,7 @@ sub MARCkoha2marcBiblio {
foreach (keys %$biblio) {
$bibliohash->{$_}=$biblio->{$_};
}
my $sth = $dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?");
$sth = $dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?");
my $record = MARC::Record->new();
foreach ( keys %$bibliohash ) {
&MARCkoha2marcOnefield( $sth, $record, "biblio." . $_, $bibliohash->{$_}, '') if $bibliohash->{$_};
@ -548,17 +548,20 @@ sub MARCmarc2koha {
$sth2->execute;
my $field;
while (($field)=$sth2->fetchrow) {
# warn "biblio.".$field;
$result=&MARCmarc2kohaOneField($sth,"biblio",$field,$record,$result,$frameworkcode);
}
$sth2=$dbh->prepare("SHOW COLUMNS from biblioitems");
$sth2->execute;
while (($field)=$sth2->fetchrow) {
if ($field eq 'notes') { $field = 'bnotes'; }
# warn "biblioitems".$field;
$result=&MARCmarc2kohaOneField($sth,"biblioitems",$field,$record,$result,$frameworkcode);
}
$sth2=$dbh->prepare("SHOW COLUMNS from items");
$sth2->execute;
while (($field)=$sth2->fetchrow) {
# warn "items".$field;
$result=&MARCmarc2kohaOneField($sth,"items",$field,$record,$result,$frameworkcode);
}
# additional authors : specific
@ -566,12 +569,14 @@ sub MARCmarc2koha {
$result = &MARCmarc2kohaOneField($sth,"additionalauthors","additionalauthors",$record,$result,$frameworkcode);
# modify copyrightdate to keep only the 1st year found
my $temp = $result->{'copyrightdate'};
$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
if ($1>0) {
$result->{'copyrightdate'} = $1;
} else { # if no cYYYY, get the 1st date.
$temp =~ m/(\d\d\d\d)/;
$result->{'copyrightdate'} = $1;
if ($temp){
$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
if ($1>0) {
$result->{'copyrightdate'} = $1;
} else { # if no cYYYY, get the 1st date.
$temp =~ m/(\d\d\d\d)/;
$result->{'copyrightdate'} = $1;
}
}
# modify publicationyear to keep only the 1st year found
$temp = $result->{'publicationyear'};
@ -1000,7 +1005,7 @@ sub REALmodsubject {
# my $dbh = C4Connect;
my $count = @subject;
my $error;
my $error="";
for ( my $i = 0 ; $i < $count ; $i++ ) {
$subject[$i] =~ s/^ //g;
$subject[$i] =~ s/ $//g;
@ -1042,7 +1047,7 @@ sub REALmodsubject {
} # else
$sth->finish;
} # else
if ( $error eq '' ) {
if ($error eq '') {
my $sth =
$dbh->prepare("Delete from bibliosubject where biblionumber = ?");
$sth->execute($bibnum);
@ -2876,6 +2881,12 @@ Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
# Revision 1.132 2005/10/26 09:12:33 tipaul
# big commit, still breaking things...
#
# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
# * code cleaning (cleaning warnings from perl -w) continued
#
# Revision 1.131 2005/09/22 10:01:45 tipaul
# see mail on koha-devel : code cleaning on Search.pm + normalizing API + use of biblionumber everywhere (instead of bn, biblio, ...)
#

53
C4/Bull.pm
View File

@ -186,6 +186,7 @@ sub get_subscription_list_from_biblionumber {
$subs->{missinglist} =~ s/\n/\<br\/\>/g;
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
$subs->{"periodicity".$subs->{periodicity}} = 1;
$subs->{"status".$subs->{'status'}} = 1;
if ($subs->{enddate} eq '0000-00-00') {
$subs->{enddate}='';
} else {
@ -199,7 +200,7 @@ sub get_subscription_list_from_biblionumber {
sub get_full_subscription_list_from_biblionumber {
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, serial.notes, year(serial.planneddate) as year, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
@ -227,10 +228,7 @@ sub get_full_subscription_list_from_biblionumber {
push @$temp,
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
'status1' => $subs->{'status'}==1,
'status2' => $subs->{'status'}==2,
'status3' => $subs->{'status'}==3,
'status4' => $subs->{'status'}==4,
"status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
}else {
@ -243,10 +241,7 @@ sub get_full_subscription_list_from_biblionumber {
push @temp,
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
'status1' => $subs->{'status'}==1,
'status2' => $subs->{'status'}==2,
'status3' => $subs->{'status'}==3,
'status4' => $subs->{'status'}==4,
"status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
@ -291,15 +286,11 @@ sub modsubscription {
sub delsubscription {
my ($subscriptionid) = @_;
# check again there is only one issue (the subscription is new)
my ($totalissues) = getserials($subscriptionid);
if ($totalissues eq 1) {
my $dbh = C4::Context->dbh;
$subscriptionid=$dbh->quote($subscriptionid);
$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
$dbh->do("delete from serial where subscriptionid=$subscriptionid");
}
my $dbh = C4::Context->dbh;
$subscriptionid=$dbh->quote($subscriptionid);
$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
$dbh->do("delete from serial where subscriptionid=$subscriptionid");
}
sub getsubscriptions {
my ($title,$ISSN,$biblionumber) = @_;
@ -360,8 +351,7 @@ sub getserials {
my ($subscriptionid) = @_;
my $dbh = C4::Context->dbh;
# status = 2 is "arrived"
my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate, notes from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate,notes from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
$sth->execute($subscriptionid);
my @serials;
while(my $line = $sth->fetchrow_hashref) {
@ -396,7 +386,8 @@ sub getlatestserials{
}
sub serialchangestatus {
my ($serialid,$serialseq,$planneddate,$status,$note)=@_;
my ($serialid,$serialseq,$planneddate,$status,$notes)=@_;
# warn "($serialid,$serialseq,$planneddate,$status)";
# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
@ -406,8 +397,8 @@ sub serialchangestatus {
if ($status eq 6){
delissue($serialseq, $subscriptionid)
}else{
$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=?, notes=? where serialid = ?");
$sth->execute($serialseq,$planneddate,$status,$note,$serialid);
$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=?,notes=? where serialid = ?");
$sth->execute($serialseq,$planneddate,$status,$notes,$serialid);
$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
$sth->execute($subscriptionid);
my ($missinglist,$recievedlist) = $sth->fetchrow;
@ -420,24 +411,20 @@ sub serialchangestatus {
$sth->execute($recievedlist,$missinglist,$subscriptionid);
}
# create new waited entry if needed (ie : was a "waited" and has changed)
$sth = $dbh->prepare("select * from subscription where subscriptionid = ? ");
$sth->execute($subscriptionid);
my $subscription = $sth->fetchrow_hashref;
if ($oldstatus eq 1 && $status ne 1) {
$sth = $dbh->prepare("select * from subscription where subscriptionid = ? ");
$sth->execute($subscriptionid);
my $val = $sth->fetchrow_hashref;
# next issue number
my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($subscription);
my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
# next date (calculated from actual date & frequency parameters)
my $nextplanneddate = Get_Next_Date($planneddate,$subscription);
newissue($newserialseq, $subscriptionid, $subscription->{'biblionumber'}, 1, $nextplanneddate);
my $nextplanneddate = Get_Next_Date($planneddate,$val);
newissue($newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextplanneddate);
$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
innerloop1=?,innerloop2=?,innerloop3=?
where subscriptionid = ?");
$sth->execute($newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3,$subscriptionid);
}
# check if an alert must be sent... (= a letter is defined & status became "arrived"
if ($subscription->{letter} && $status eq 2) {
sendalerts('issue',$subscription->{subscriptionid},$subscription->{letter});
}
}
sub newissue {

48
C4/Circulation/Circ2.pm
View File

@ -34,7 +34,7 @@ use C4::Context;
use C4::Stats;
use C4::Reserves2;
use C4::Koha;
use C4::Accounts;
use C4::Accounts2;
use Date::Manip;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@ -618,7 +618,8 @@ sub TooMany ($$){
$sth->execute($iteminformation->{'biblionumber'});
my $type = $sth->fetchrow;
$sth = $dbh->prepare('select * from issuingrules where categorycode = ? and itemtype = ? and branchcode = ?');
my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s where i.borrowernumber = ? and i.returndate is null and i.itemnumber = s.biblioitemnumber and s.itemtype like ?");
# my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s where i.borrowernumber = ? and i.returndate is null and i.itemnumber = s.biblioitemnumber and s.itemtype like ?");
my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s1, items s2 where i.borrowernumber = ? and i.returndate is null and i.itemnumber = s2.itemnumber and s1.itemtype like ? and s1.biblioitemnumber = s2.biblioitemnumber");
my $sth3 = $dbh->prepare('select COUNT(*) from issues where borrowernumber = ? and returndate is null');
my $alreadyissued;
# check the 3 parameters
@ -632,7 +633,7 @@ sub TooMany ($$){
}
# check for branch=*
$sth->execute($cat_borrower, $type, "");
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
my $alreadyissued = $sth2->fetchrow;
@ -640,7 +641,7 @@ sub TooMany ($$){
}
# check for itemtype=*
$sth->execute($cat_borrower, "*", $branch_borrower);
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth3->execute($borrower->{'borrowernumber'});
my ($alreadyissued) = $sth3->fetchrow;
@ -649,7 +650,7 @@ sub TooMany ($$){
}
#check for borrowertype=*
$sth->execute("*", $type, $branch_borrower);
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
my $alreadyissued = $sth2->fetchrow;
@ -657,7 +658,7 @@ sub TooMany ($$){
}
$sth->execute("*", "*", $branch_borrower);
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth3->execute($borrower->{'borrowernumber'});
my $alreadyissued = $sth3->fetchrow;
@ -665,7 +666,7 @@ sub TooMany ($$){
}
$sth->execute("*", $type, "");
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result) && $result->{maxissueqty}>=0) {
$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
my $alreadyissued = $sth2->fetchrow;
@ -673,7 +674,7 @@ sub TooMany ($$){
}
$sth->execute($cat_borrower, "*", "");
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
my $alreadyissued = $sth2->fetchrow;
@ -681,7 +682,7 @@ sub TooMany ($$){
}
$sth->execute("*", "*", "");
my $result = $sth->fetchrow_hashref;
$result = $sth->fetchrow_hashref;
if (defined($result)) {
$sth3->execute($borrower->{'borrowernumber'});
my $alreadyissued = $sth3->fetchrow;
@ -937,31 +938,31 @@ sub getLoanLength {
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute($borrowertype,$itemtype,"");
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute($borrowertype,"*",$branchcode);
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute("*",$itemtype,$branchcode);
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute($borrowertype,"*","");
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute("*","*",$branchcode);
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute("*",$itemtype,"");
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
$sth->execute("*","*","");
my $loanlength = $sth->fetchrow_hashref;
$loanlength = $sth->fetchrow_hashref;
return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
# if no rule is set => 21 days (hardcoded)
@ -1649,7 +1650,7 @@ sub renewstatus {
if ($resfound) {
$renewokay = 0;
}
my ($resfound, $resrec) = CheckReserves($itemno);
($resfound, $resrec) = CheckReserves($itemno);
if ($resfound) {
$renewokay = 0;
}
@ -1792,19 +1793,6 @@ EOT
}
sub getnextacctno {
# Stolen from Accounts.pm
my ($env,$bornumber,$dbh)=@_;
my $nextaccntno = 1;
my $sth = $dbh->prepare("select * from accountlines where (borrowernumber = ?) order by accountno desc");
$sth->execute($bornumber);
if (my $accdata=$sth->fetchrow_hashref){
$nextaccntno = $accdata->{'accountno'} + 1;
}
$sth->finish;
return($nextaccntno);
}
=item find_reserves
($status, $record) = &find_reserves($itemnumber);

2
C4/Circulation/Fines.pm
View File

@ -147,7 +147,7 @@ sub CalcFine {
# firstremind, chargeperiod, accountsent, and chargename from the
# categoryitem table.
my $sth=$dbh->prepare("Select * from items,biblioitems,itemtypes,categoryitem where items.itemnumber=?
my $sth=$dbh->prepare("Select * from items,biblioitems,itemtypes,issuingrules where items.itemnumber=?
and items.biblioitemnumber=biblioitems.biblioitemnumber and
biblioitems.itemtype=itemtypes.itemtype and
categoryitem.itemtype=itemtypes.itemtype and

2
C4/Circulation/Returns.pm
View File

@ -31,7 +31,7 @@ use strict;
require Exporter;
use DBI;
use C4::Context;
use C4::Accounts;
use C4::Accounts2;
use C4::InterfaceCDK;
use C4::Circulation::Main;
# FIXME - C4::Circulation::Main and C4::Circulation::Returns

30
C4/Context.pm
View File

@ -600,21 +600,6 @@ sub _new_stopwords
return $stopwordlist;
}
=item userenv
%userenv = C4::Context->userenv;
Returns a hash with userenvironment variables.
This hash is cached for future use: if you call
C<C4::Context-E<gt>userenv> twice, you will get the same hash without real DB access
Returns Null if userenv is not set.
userenv is set in _new_userenv, called in Auth.pm
=cut
#'
=item userenv
C4::Context->userenv;
@ -632,14 +617,15 @@ sub userenv
{
my $var = $context->{"activeuser"};
return $context->{"userenv"}->{$var} if (defined $context->{"userenv"}->{$var});
return 0;
warn "NO CONTEXT for $var";
}
=item userenv
=item set_userenv
C4::Context->set_userenv;
C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $userflags, $emailaddress);
Builds a hash for user environment variables.
Informs a hash for user environment variables.
This hash shall be cached for future use: if you call
C<C4::Context-E<gt>userenv> twice, you will get the same hash without real DB access
@ -655,8 +641,9 @@ sub set_userenv{
"number" => $usernum,
"id" => $userid,
"cardnumber" => $usercnum,
"firstname" => $userfirstname,
"surname" => $usersurname,
# "firstname" => $userfirstname,
# "surname" => $usersurname,
#possibly a law problem
"branch" => $userbranch,
"flags" => $userflags,
"emailaddress" => $emailaddress,
@ -697,12 +684,11 @@ Destroys the hash for activeuser user environment variables.
sub _unset_userenv
{
my ($sessionID)= @_;
# undef $context->{$sessionID};
undef $context->{"activeuser"} if ($context->{"activeuser"} eq $sessionID);
# $context->{"activeuser"}--;
}
1;
__END__

4
C4/Koha.pm
View File

@ -491,7 +491,7 @@ sub getbranchname
sub getprinter ($$) {
my($query, $printers) = @_; # get printer for this query from printers
my $printer = $query->param('printer');
($printer) || ($printer = $query->cookie('printer'));
($printer) || ($printer = $query->cookie('printer')) || ($printer='');
($printers->{$printer}) || ($printer = (keys %$printers)[0]);
return $printer;
}
@ -567,7 +567,7 @@ sub getalllanguages {
$lang->{$language}=1;
}
}
my $htdocs=C4::Context->config('opachtdocs');
$htdocs=C4::Context->config('opachtdocs');
foreach my $theme (getallthemes('opac')) {
opendir D, "$htdocs/$theme";
foreach my $language (readdir D) {

82
C4/Members.pm
View File

@ -375,43 +375,53 @@ sub fixup_cardnumber ($) {
# automatically. Should be either "1" or something else.
# Defaults to "0", which is interpreted as "no".
if ($cardnumber !~ /\S/ && $autonumber_members) {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select max(substring(borrowers.cardnumber,2,7)) from borrowers");
$sth->execute;
my $data=$sth->fetchrow_hashref;
$cardnumber=$data->{'max(substring(borrowers.cardnumber,2,7))'};
$sth->finish;
# purpose: generate checksum'd member numbers.
# We'll assume we just got the max value of digits 2-8 of member #'s
# from the database and our job is to increment that by one,
# determine the 1st and 9th digits and return the full string.
if (! $cardnumber) { # If DB has no values,
$cardnumber = 1000000; # start at 1000000
} else {
$cardnumber += 1;
# if ($cardnumber !~ /\S/ && $autonumber_members) {
if ($autonumber_members) {
my $dbh = C4::Context->dbh;
if (C4::Context->preference('checkdigit') eq 'katipo') {
# if checkdigit is selected, calculate katipo-style cardnumber.
# otherwise, just use the max()
# purpose: generate checksum'd member numbers.
# We'll assume we just got the max value of digits 2-8 of member #'s
# from the database and our job is to increment that by one,
# determine the 1st and 9th digits and return the full string.
my $sth=$dbh->prepare("select max(substring(borrowers.cardnumber,2,7)) from borrowers");
$sth->execute;
my $data=$sth->fetchrow_hashref;
$cardnumber=$data->{'max(substring(borrowers.cardnumber,2,7))'};
$sth->finish;
if (! $cardnumber) { # If DB has no values,
$cardnumber = 1000000; # start at 1000000
} else {
$cardnumber += 1;
}
my $sum = 0;
for (my $i = 0; $i < 8; $i += 1) {
# read weightings, left to right, 1 char at a time
my $temp1 = $weightings[$i];
# sequence left to right, 1 char at a time
my $temp2 = substr($cardnumber,$i,1);
# mult each char 1-7 by its corresponding weighting
$sum += $temp1 * $temp2;
}
my $rem = ($sum%11);
$rem = 'X' if $rem == 10;
$cardnumber="V$cardnumber$rem";
} else {
my $sth=$dbh->prepare("select max(borrowers.cardnumber) from borrowers");
$sth->execute;
my ($result)=$sth->fetchrow;
$sth->finish;
$cardnumber=$result+1;
}
}
my $sum = 0;
for (my $i = 0; $i < 8; $i += 1) {
# read weightings, left to right, 1 char at a time
my $temp1 = $weightings[$i];
# sequence left to right, 1 char at a time
my $temp2 = substr($cardnumber,$i,1);
# mult each char 1-7 by its corresponding weighting
$sum += $temp1 * $temp2;
}
my $rem = ($sum%11);
$rem = 'X' if $rem == 10;
$cardnumber="V$cardnumber$rem";
}
return $cardnumber;
}

2
C4/Reserves2.pm
View File

@ -312,7 +312,7 @@ sub CancelReserve {
$sth->finish;
# update the database, removing the record...
my $sth = $dbh->prepare("update reserves set cancellationdate = now(),
$sth = $dbh->prepare("update reserves set cancellationdate = now(),
found = Null,
priority = 0
where biblionumber = ?

45
C4/SearchMarc.pm
View File

@ -161,7 +161,12 @@ String... so ',items,issues,reserves' allows the items, issues and reserves tabl
returns an array containing hashes. The hash contains all biblio & biblioitems fields and a reference to an item hash. The "item hash contains one line for each callnumber & the number of items related to the callnumber.
=cut
=head2 my $marcurlsarray = &getMARCurls($dbh,$bibid,$marcflavour);
Returns a reference to an array containing all the URLS stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") isn't used in this version because both flavours of MARC use the same subfield for URLS (but eventually when we get the lables working we'll need to change this.
=cut
sub catalogsearch {
my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring, $extratables) = @_;
@ -413,26 +418,44 @@ sub getMARCsubjects {
$maxtag = "699";
} else { # assume unimarc if not marc21
$mintag = "600";
$maxtag = "619";
$maxtag = "699";
}
my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");
my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode,tagorder,tag FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder,subfieldorder");
$sth->execute($bibid,$mintag,$maxtag);
my @marcsubjcts;
my $subjct = "";
my $subfield = "";
my $subject = "";
my $marcsubjct;
while (my $data=$sth->fetchrow_arrayref) {
my $value = $data->[0];
my $subfield = $data->[1];
if ($subfield eq "a" && $value ne $subjct) {
$marcsubjct = {MARCSUBJCT => $value,};
my $field9;
my $activetagorder=0;
my $lasttag;
my ($subfieldvalue,$subfieldcode,$tagorder,$tag);
while (($subfieldvalue,$subfieldcode,$tagorder,$tag)=$sth->fetchrow) {
$lasttag=$tag if $tag;
if ($activetagorder && $tagorder != $activetagorder) {
$subject=~ s/ -- $//;
$marcsubjct = {MARCSUBJCT => $subject,
link => $tag."9",
linkvalue => $field9,
};
push @marcsubjcts, $marcsubjct;
$subjct = $value;
$subject='';
$tag='';
$field9='';
}
if ($subfieldcode eq 9) {
$field9=$subfieldvalue;
} else {
$subject .= $subfieldvalue." -- ";
}
$activetagorder=$tagorder;
}
$marcsubjct = {MARCSUBJCT => $subject,
link => $lasttag."9",
linkvalue => $field9,
};
push @marcsubjcts, $marcsubjct;
$sth->finish;

12
acqui.simple/addbiblio.pl
View File

@ -173,6 +173,7 @@ sub create_input () {
$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;
# 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);
@ -277,7 +278,7 @@ sub build_tabs ($$$$) {
push (@loop_data, \%tag_data);
}
# If there is more than 1 field, add an empty hidden field as separator.
if ($#fields >1) {
if ($#fields >=1 && $#loop_data >=0 && $loop_data[$#loop_data]->{'tag'} eq $tag) {
my @subfields_data;
my %tag_data;
push(@subfields_data, &create_input('','','',$i,$tabloop,$record,$authorised_values_sth));
@ -353,6 +354,7 @@ my $z3950 = $input->param('z3950');
my $op = $input->param('op');
my $frameworkcode = $input->param('frameworkcode');
my $dbh = C4::Context->dbh;
my $bibid;
$frameworkcode = &MARCfind_frameworkcode($dbh,$biblionumber) if ($biblionumber and not ($frameworkcode));
@ -430,9 +432,8 @@ if ($op eq "addbiblio") {
if (!$duplicatebiblionumber or $confirm_not_duplicate) {
# MARC::Record built => now, record in DB
if ($is_a_modif) {
NEWmodbiblioframework($dbh,$biblionumber,$frameworkcode);
NEWmodbiblio($dbh,$record,$biblionumber,$frameworkcode);
logaction($loggedinuser,"acqui.simple","modify",$biblionumber,"record : ".$record->as_formatted) if (C4::Context->preference("Activate_Log"));
NEWmodbiblioframework($dbh,$bibid,$frameworkcode);
NEWmodbiblio($dbh,$record,$bibid,$frameworkcode);
} else {
my $biblioitemnumber;
($biblionumber,$biblioitemnumber) = NEWnewbiblio($dbh,$record,$frameworkcode);
@ -514,6 +515,7 @@ if ($op eq "addbiblio") {
}
$template->param(
frameworkcode => $frameworkcode,
itemtype => $frameworkcode # HINT: if the library has itemtype = framework, itemtype is auto filled !
itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled !
hide_marc => C4::Context->preference('hide_marc'),
);
output_html_with_http_headers $input, $cookie, $template->output;

80
acqui.simple/additem-nomarc.pl
View File

@ -20,12 +20,11 @@
# Suite 330, Boston, MA 02111-1307 USA
# $Log$
# Revision 1.7 2005/09/02 14:46:40 tipaul
# * road to zebra for MARC=OFF
# * removing Acquisitions/branches.pm call, as it's now in Koha.pm
# Revision 1.8 2005/10/26 09:11:34 tipaul
# big commit, still breaking things...
#
# Revision 1.6 2005/08/04 12:12:13 tipaul
# synch'ing 2.2 and head
# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
# * code cleaning (cleaning warnings from perl -w) continued
#
# Revision 1.4.2.1 2005/03/25 12:52:44 tipaul
# needs "editcatalogue" flag, not "catalogue"
@ -133,7 +132,76 @@ else {
branchloop => \@branchloop,
itemtypeloop => \@itemtypeloop,
);
( $bibliocount, @biblios ) = &getbiblio($biblionumber);
if ( !$bibliocount ) {
print $input->redirect('addbooks.pl');
}
else {
( $biblioitemcount, @biblioitems ) =
&getbiblioitembybiblionumber($biblionumber);
( $branchcount, @branches ) = &branches;
( $itemtypecount, @itemtypes ) = &getitemtypes;
for ( my $i = 0 ; $i < $itemtypecount ; $i++ ) {
$itemtypedescriptions{ $itemtypes[$i]->{'itemtype'} } =
$itemtypes[$i]->{'description'};
} # for
for ( my $i = 0 ; $i < $branchcount ; $i++ ) {
$branchnames{ $branches[$i]->{'branchcode'} } =
$branches[$i]->{'branchname'};
} # for
# print $input->header;
# print startpage();
# print startmenu('acquisitions');
my $input = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "acqui.simple/additem-nomarc.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { editcatalogue => 1 },
debug => 1,
}
);
if ( $error eq "nobarcode" ) {
$template->param( NOBARCODE => 1 );
}
elsif ( $error eq "nobiblioitem" ) {
$template->param( NOBIBLIOITEM => 1 );
}
elsif ( $error eq "barcodeinuse" ) {
$template->param( BARCODEINUSE => 1 );
} # elsif
for ( my $i = 0 ; $i < $biblioitemcount ; $i++ ) {
if ( $biblioitems[$i]->{'itemtype'} eq "WEB" ) {
$biblioitems[$i]->{'WEB'} = 1;
}
$biblioitems[$i]->{'dewey'} =~ /(\d*\.\d\d)/;
$biblioitems[$i]->{'dewey'} = $1;
( $itemcount, @items ) =
&getitemsbybiblioitem( $biblioitems[$i]->{'biblioitemnumber'} );
$biblioitems[$i]->{'items'} = \@items;
} # for
$template->param(
BIBNUM => $biblionumber,
AUTHOR => $biblios[0]->{'author'},
TITLE => $biblios[0]->{'title'},
COPYRIGHT => $biblios[0]->{'copyrightdate'},
SERIES => $biblios[0]->{'seriestitle'},
NOTES => $biblios[0]->{'notes'},
BIBITEMS => \@biblioitems,
BRANCHES => \@branches,
ITEMTYPES => \@itemtypes,
);
output_html_with_http_headers $input, $cookie, $template->output;
} # if

71
acqui.simple/additem.pl
View File

@ -58,7 +58,9 @@ my $op = $input->param('op');
my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
my $record = MARCgetbiblio($dbh,$bibid);
# 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.
@ -76,7 +78,22 @@ if ($op eq "additem") {
for (my $i=0;$i<=$#ind_tag;$i++) {
$indicators{$ind_tag[$i]} = $indicator[$i];
}
my $addeditem = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
# if autoBarcode is ON, calculate barcode...
if (C4::Context->preference('autoBarcode')) {
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;
my ($newbarcode) = $sth_barcode->fetchrow;
$newbarcode++;
# OK, we have the new barcode, now create the entry in MARC record
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 $addedolditem = MARCmarc2koha($dbh,$addeditem);
my $exists = get_item_from_barcode($addedolditem->{'barcode'});
@ -113,9 +130,9 @@ if ($op eq "additem") {
}
my $itemrecord = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
# MARC::Record builded => now, record in DB
# warn "ITEM TO MODIFY : ".$itemrecord->as_formatted;
NEWmoditem($dbh, $itemrecord, $biblionumber, $biblioitemnumber, $itemnumber,0);
$itemnumber="";
# warn "R: ".$record->as_formatted;
my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = NEWmoditem($dbh,$record,$bibid,$itemnum,0);
$itemnum="";
$nextop="additem";
}
@ -132,22 +149,18 @@ my ($template, $loggedinuser, $cookie)
debug => 1,
});
# load the biblio to have the title, the biblioitemnumber & any other useful field
my $record = MARCgetbiblio($dbh,$biblionumber);
# warn $record ->as_formatted;
# warn "REC ".$record->as_formatted;
my $oldrecord = MARCmarc2koha($dbh,$record);
my %indicators;
$indicators{995}=' ';
# now, build existiing item list
my @fields = $record->fields();
my $temp = MARCgetbiblio($dbh,$bibid);
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;
#---- finds where items.itemnumber is stored
my ($itemtagfield,$itemtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.itemnumber",$itemtype);
my ($branchtagfield,$branchtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.homebranch",$itemtype);
my @itemnums; # array to store itemnums
foreach my $field (@fields) {
next if ($field->tag()<10);
my @subf=$field->subfields;
@ -160,14 +173,11 @@ foreach my $field (@fields) {
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){
if (not ($userenv->{'branch'} eq $subf[$i][1])) {
unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subf[$i][1]))){
$this_row{'nomod'}=1;
warn "nomod"
}
}
}
push @itemnums,$this_row{$subf[$i][0]} =$subf[$i][1] if ($field->tag() eq $itemtagfield && $subf[$i][0] eq $itemtagsubfield);
$this_row{itemnum} = $subf[$i][1] if ($field->tag() eq $itemtagfield && $subf[$i][0] eq $itemtagsubfield);
}
if (%this_row) {
push(@big_array, \%this_row);
@ -179,6 +189,9 @@ foreach my $subfield_code (keys(%witness)) {
$big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
}
}
my ($holdingbrtagf,$holdingbrtagsubf) = &MARCfind_marc_from_kohafield($dbh,"items.holdingbranch",$itemtype);
@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
# now, construct template !
my @item_value_loop;
my @header_value_loop;
@ -189,7 +202,7 @@ for (my $i=0;$i<=$#big_array; $i++) {
}
my %row_data;
$row_data{item_value} = $items_data;
$row_data{itemnumber} = $itemnums[$i];
$row_data{itemnum} = $big_array[$i]->{itemnum};
#reporting this_row values
$row_data{'nomod'} = $big_array[$i]{'nomod'};
push(@item_value_loop,\%row_data);
@ -220,13 +233,11 @@ foreach my $tag (sort keys %{$tagslib}) {
$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
my ($x,$value);
($x,$value) = find_value($tag,$subfield,$itemrecord) if ($itemrecord);
#testing branch value if IndependantBranches.
my $test = (C4::Context->preference("IndependantBranches")) &&
($tag==$branchtagfield) && ($subfield==$branchtagsubfield) &&
(C4::Context->userenv->{flags} != 1) && ($value != C4::Context->userenv->{branch}) ;
print $input->redirect("additem.pl?biblionumber=$biblionumber") if ($test);
($tag eq $branchtagfield) && ($subfield eq $branchtagsubfield) &&
(C4::Context->userenv->{flags} != 1) && ($value) && ($value ne C4::Context->userenv->{branch}) ;
# print $input->redirect(".pl?bibid=$bibid") if ($test);
# search for itemcallnumber if applicable
if ($tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && C4::Context->preference('itemcallnumber')) {
my $CNtag = substr(C4::Context->preference('itemcallnumber'),0,3);
@ -301,20 +312,12 @@ foreach my $tag (sort keys %{$tagslib}) {
$i++
}
}
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "acqui.simple/additem.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {editcatalogue => 1},
debug => 1,
});
# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
$template->param(item_loop => \@item_value_loop,
item_header_loop => \@header_value_loop,
biblionumber =>$biblionumber,
biblioitemnumber => $oldrecord->{biblioitemnumber},
bibid => $bibid,
biblionumber =>$oldbiblionumber,
title => $oldrecord->{title},
author => $oldrecord->{author},
item => \@loop_data,

3
acqui/acqui-home.pl
View File

@ -49,7 +49,8 @@ for (my $i=0;$i<$count;$i++){
$totavail+=$avail;
}
#currencies
my ($count,$rates)=getcurrencies();
my $rates;
($count,$rates)=getcurrencies();
my @loop_currency = ();
for (my $i=0;$i<$count;$i++){
my %line;

4
acqui/histsearch.pl
View File

@ -24,8 +24,10 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {acquisition => 1},
debug => 1,
});
my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
my ($order_loop,$total_qty,$total_price)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
$template->param(suggestions_loop => $order_loop,
total_qty => $total_qty,
total_price => sprintf ("%.2f",$total_price),
numresults => scalar(@$order_loop),
title => $title,
author => $author,

6
acqui/newbiblio.pl
View File

@ -177,9 +177,9 @@ $template->param( existing => $biblio,
listincgst => $booksellers[0]->{'listincgst'},
listprice => $booksellers[0]->{'listprice'},
gstreg => $booksellers[0]->{'gstreg'},
invoiceinc => $booksellers[0]->{'invoiceincgst'},
invoicedisc => $booksellers[0]->{'invoicedisc'},
nocalc => $booksellers[0]->{'nocalc'},
invoiceinc => $booksellers[0]->{'invoiceincgst'},
invoicedisc => $booksellers[0]->{'invoicedisc'},
nocalc => $booksellers[0]->{'nocalc'},
name => $booksellers[0]->{'name'},
currency => $booksellers[0]->{'listprice'},
gstrate => C4::Context->preference("gist") ,

97
admin/aqbookfund.pl
View File

@ -40,6 +40,7 @@
use strict;
use CGI;
use C4::Auth;
use C4::Koha;
use C4::Context;
use C4::Acquisition;
use C4::Output;
@ -49,21 +50,21 @@ use C4::Date;
use HTML::Template;
sub StringSearch {
my ($env,$searchstring,%branches)=@_;
my ($env,$searchstring,$branches)=@_;
my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
my $count=@data;
my $strsth= "select bookfundid,bookfundname,bookfundgroup,branchcode from aqbookfund where bookfundname like ? ";
if (%branches){
if ($branches){
$strsth.= "AND (aqbookfund.branchcode is null " ;
foreach my $branchcode (keys %branches){
foreach my $branchcode (keys %$branches){
$strsth .= "or aqbookfund.branchcode = '".$branchcode."' ";
}
$strsth .= ") ";
}
$strsth.= "order by aqbookfund.bookfundid";
warn "chaine de recherche : ".$strsth;
# warn "chaine de recherche : ".$strsth;
my $sth=$dbh->prepare($strsth);
$sth->execute("%$data[0]%");
@ -78,12 +79,12 @@ sub StringSearch {
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $searchfield=$input->param('searchfield');
my $searchfield=$input->param('searchfield') || '';
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/aqbookfund.pl";
my $bookfundid=$input->param('bookfundid');
my $pagesize=20;
my $op = $input->param('op');
my $op = $input->param('op') || '';
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
@ -104,39 +105,34 @@ $template->param(script_name => $script_name,
}
$template->param(action => $script_name);
my @branches;
my @select_branch;
my %select_branches;
my ($count2,@branches)=branches();
# my @branches;
# my @select_branch;
# my %select_branches;
push @select_branch,"";
$select_branches{""}="";
my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
$sthtemp->execute($borrowernumber);
my ($flags, $homebranch)=$sthtemp->fetchrow;
if ($flags>1){
if ($homebranch){
push @select_branch, $homebranch;#
for (my $i=0;$i<$count2;$i++){
$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'} if ($branches[$i]->{'branchcode'} eq $homebranch);
}
}
} else {
for (my $i=0;$i<$count2;$i++){
push @select_branch, $branches[$i]->{'branchcode'};#
$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
}
my $branches = getbranches;
my @branchloop;
foreach my $thisbranch (sort keys %$branches) {
# my $selected = 1 if $thisbranch eq $branch;
my %row =(value => $thisbranch,
# selected => $selected,
branchname => $branches->{$thisbranch}->{'branchname'},
);
push @branchloop, \%row;
# $select_branches{$thisbranch} = $branches->{$thisbranch}->{'branchname'};
}
my $CGIbranch=CGI::scrolling_list( -name => 'branchcode',
-values => \@select_branch,
-labels => \%select_branches,
-size => 1,
-multiple => 0 );
$template->param(CGIbranch => $CGIbranch);
warn "bornum=".$borrowernumber . "flags = ".$flags. " homebranch= ".$homebranch;
$sthtemp->finish;
# my $homebranch=C4::Context->userenv->{branch};
# for (my $i=0;$i<$count2;$i++){
# push @select_branch, $branches[$i]->{'branchcode'};#
# $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
# }
#
# my $CGIbranch=CGI::scrolling_list( -name => 'branchcode',
# -values => \@select_branch,
# -labels => \%select_branches,
# -size => 1,
# -multiple => 0 );
$template->param(branchloop => \@branchloop);
################## ADD_FORM ##################################
# called by default. Used to create form to add or modify a record
@ -175,7 +171,7 @@ if ($op eq 'add_form') {
my $sth=$dbh->prepare("delete from aqbookfund where bookfundid =?");
$sth->execute($bookfundid);
$sth->finish;
my $sth=$dbh->prepare("replace aqbookfund (bookfundid,bookfundname, branchcode) values (?,?,?)");
$sth=$dbh->prepare("replace aqbookfund (bookfundid,bookfundname,branchcode) values (?,?,?)");
$sth->execute($input->param('bookfundid'),$input->param('bookfundname'),$input->param('branchcode'));
$sth->finish;
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqbookfund.pl\"></html>";
@ -211,33 +207,36 @@ if ($op eq 'add_form') {
$template->param(searchfield => $searchfield);
}
my $env;
my ($count,$results)=StringSearch($env,$searchfield,%select_branches);
my ($count,$results)=StringSearch($env,$searchfield,$branches);
my $toggle="white";
my @loop_data =();
my $dbh = C4::Context->dbh;
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
my %row_data;
$row_data{bookfundid} =$results->[$i]{'bookfundid'};
$row_data{bookfundname} = $results->[$i]{'bookfundname'};
warn "".$results->[$i]{'bookfundid'}." ".$results->[$i]{'bookfundname'}." ".$results->[$i]{'branchcode'};
$row_data{branchname} = $select_branches{$results->[$i]{'branchcode'}};
my $strsth2="Select aqbudgetid,startdate,enddate,budgetamount,aqbudget.branchcode from aqbudget where aqbudget.bookfundid = ?";
if ($homebranch){
$strsth2 .= " AND ((aqbudget.branchcode='') OR (aqbudget.branchcode= ".$dbh->quote($homebranch).")) " ;
} else {
$strsth2 .= " AND (aqbudget.branchcode='') " if ($flags>1);
}
# warn "".$results->[$i]{'bookfundid'}." ".$results->[$i]{'bookfundname'}." ".$results->[$i]{'branchcode'};
$row_data{branchname} = $branches->{$results->[$i]{'branchcode'}}->{branchname};
my $strsth2="Select aqbudgetid,startdate,enddate,budgetamount from aqbudget where aqbudget.bookfundid = ?";
# my $strsth2="Select aqbudgetid,startdate,enddate,budgetamount,branchcode from aqbudget where aqbudget.bookfundid = ?";
# if ($homebranch){
# $strsth2 .= " AND ((aqbudget.branchcode is null) OR (aqbudget.branchcode='') OR (aqbudget.branchcode= ".$dbh->quote($homebranch).")) " ;
# } else {
# $strsth2 .= " AND (aqbudget.branchcode='') " if ((C4::Context->userenv) && (C4::Context->userenv->{flags}>1));
# }
$strsth2 .= " order by aqbudgetid";
warn "".$strsth2;
# warn "".$strsth2;
my $sth2 = $dbh->prepare($strsth2);
$sth2->execute($row_data{bookfundid});
my @budget_loop;
while (my ($aqbudgetid,$startdate,$enddate,$budgetamount,$branchcode) = $sth2->fetchrow) {
# while (my ($aqbudgetid,$startdate,$enddate,$budgetamount,$branchcode) = $sth2->fetchrow) {
while (my ($aqbudgetid,$startdate,$enddate,$budgetamount) = $sth2->fetchrow) {
my %budgetrow_data;
$budgetrow_data{aqbudgetid} = $aqbudgetid;
$budgetrow_data{startdate} = format_date($startdate);
$budgetrow_data{enddate} = format_date($enddate);
$budgetrow_data{budgetamount} = $budgetamount;
$budgetrow_data{branchcode} = $branchcode;
# $budgetrow_data{branchcode} = $branchcode;
push @budget_loop,\%budgetrow_data;
}
if ($sth2->rows){

63
admin/aqbudget.pl
View File

@ -109,11 +109,19 @@ if ($op eq 'add_form') {
my $dataaqbookfund;
if ($aqbudgetid) {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select aqbudgetid,bookfundname,aqbookfund.bookfundid,startdate,enddate,budgetamount,aqbudget.branchcode from aqbudget,aqbookfund where aqbudgetid=? and aqbudget.bookfundid=aqbookfund.bookfundid");
# my $sth=$dbh->prepare("select aqbudgetid,bookfundname,aqbookfund.bookfundid,aqbookfund.branchcode as bfbranch,startdate,enddate,budgetamount,aqbudget.branchcode from aqbudget,aqbookfund where aqbudgetid=? and aqbudget.bookfundid=aqbookfund.bookfundid");
my $sth=$dbh->prepare("select aqbudgetid,bookfundname,aqbookfund.bookfundid,aqbookfund.branchcode as bfbranch,startdate,enddate,budgetamount from aqbudget,aqbookfund where aqbudgetid=? and aqbudget.bookfundid=aqbookfund.bookfundid");
$sth->execute($aqbudgetid);
$dataaqbudget=$sth->fetchrow_hashref;
$sth->finish;
}
if ($bookfundid) {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select aqbookfund.branchcode, branches.branchname from aqbookfund LEFT JOIN branches ON aqbookfund.branchcode=branches.branchcode where bookfundid=?");
$sth->execute($bookfundid);
$dataaqbookfund=$sth->fetchrow_hashref;
$sth->finish;
}
my $header;
if ($aqbudgetid) {
$header = "Modify budget";
@ -123,38 +131,35 @@ if ($op eq 'add_form') {
$template->param(header => $header);
if ($aqbudgetid) {
$template->param(modify => 1);
$template->param(bookfundid => $dataaqbudget->{bookfundid});
$template->param(bookfundname => $dataaqbudget->{bookfundname});
$template->param(bookfundid => $dataaqbudget->{'bookfundid'});
$template->param(bookfundname => $dataaqbudget->{'bookfundname'});
} else {
$template->param(bookfundid => $bookfundid,
adding => 1);
}
my @branches;
my @select_branch;
my %select_branches;
my ($count2,@branches)=branches();
push @select_branch,"";
$select_branches{""}="";
if ($flags>1){
if ($homebranch){
push @select_branch, $homebranch;#
for (my $i=0;$i<$count2;$i++){
$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'} if ($branches[$i]->{'branchcode'} eq $homebranch);
}
}
} else {
for (my $i=0;$i<$count2;$i++){
push @select_branch, $branches[$i]->{'branchcode'};#
$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
}
}
my $CGIbranch=CGI::scrolling_list( -name => 'branchcode',
-values => \@select_branch,
-labels => \%select_branches,
-default => $dataaqbudget->{branchcode},
-size => 1,
-multiple => 0 );
$template->param(CGIbranch => $CGIbranch);
# my @select_branch;
# my %select_branches;
# if ($dataaqbookfund->{branchcode}){
# push @select_branch,$dataaqbookfund->{'branchcode'};
# $select_branches{$dataaqbookfund->{'branchcode'}}=$dataaqbookfund->{'branchname'};
# }else {
# my @branches;
# my ($count2,@branches)=branches();
# push @select_branch,"";
# $select_branches{""}="";
# for (my $i=0;$i<$count2;$i++){
# push @select_branch, $branches[$i]->{'branchcode'};#
# $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
# }
# }
# my $CGIbranch=CGI::scrolling_list( -name => 'branchcode',
# -values => \@select_branch,
# -labels => \%select_branches,
# -default => ($dataaqbookfund->{branchcode}?$dataaqbookfund->{branchcode}:$dataaqbudget->{branchcode}),
# -size => 1,
# -multiple => 0 );
# $template->param(CGIbranch => $CGIbranch);
$template->param(dateformat => display_date_format(),
aqbudgetid => $dataaqbudget->{'aqbudgetid'},
startdate => format_date($dataaqbudget->{'startdate'}),

8
admin/branches.pl
View File

@ -66,7 +66,7 @@ my $input = new CGI;
my $branchcode=$input->param('branchcode');
my $branchname=$input->param('branchname');
my $categorycode = $input->param('categorycode');
my $op = $input->param('op');
my $op = $input->param('op') || '';
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "parameters/branches.tmpl",
@ -166,7 +166,7 @@ if ($op eq 'add') {
# html output functions....
sub default {
my ($message) = @_;
my ($message) = @_ || "";
heading("Branches");
$template->param('heading-branches-p' => 1);
$template->param("$message" => 1);
@ -261,7 +261,7 @@ sub branchinfotable {
$branchinfo = getbranchinfo();
}
my $toggle;
my $i;
my $i=0;
my @loop_data =();
foreach my $branch (@$branchinfo) {
($i % 2) ? ($toggle = 1) : ($toggle = 0);
@ -329,8 +329,6 @@ sub branchinfotable {
}
my @branchcategories =();
my $catinfo = getcategoryinfo();
my $toggle;
my $i = 0;
foreach my $cat (@$catinfo) {
($i % 2) ? ($toggle = 1) : ($toggle = 0);
push @branchcategories, {

44
admin/systempreferences.pl
View File

@ -54,12 +54,13 @@ $tabsysprefs{gist}="Acquisitions";
$tabsysprefs{authoritysep}="Authorities";
$tabsysprefs{ISBD}="Catalogue";
$tabsysprefs{marc}="Catalogue";
$tabsysprefs{autoBarcode}="Catalogue";
$tabsysprefs{marcflavour}="Catalogue";
$tabsysprefs{SubscriptionHistory}="Catalogue";
$tabsysprefs{SubscriptionHistory}="OPAC";
$tabsysprefs{maxoutstanding}="Circulation";
$tabsysprefs{printcirculationslips}="Circulation";
$tabsysprefs{ReturnBeforeExpiry}="Circulation";
$tabsysprefs{suggestion}="Acquisitions";
$tabsysprefs{suggestion}="OPAC";
$tabsysprefs{automembernum}="Members";
$tabsysprefs{noissuescharge}="Circulation";
$tabsysprefs{opacthemes}="OPAC";
@ -67,39 +68,11 @@ $tabsysprefs{opaclanguages}="OPAC";
$tabsysprefs{LibraryName}="OPAC";
$tabsysprefs{opacstylesheet}="OPAC";
$tabsysprefs{BiblioDefaultView}="OPAC";
$tabsysprefs{hidelostitem}="OPAC";
$tabsysprefs{opaclargeimage}="OPAC";
$tabsysprefs{opacsmallimage}="OPAC";
$tabsysprefs{hidelostitems}="OPAC";
$tabsysprefs{KohaAdmin}="Admin";
$tabsysprefs{checkdigit}="Admin";
$tabsysprefs{dateformat}="Admin";
$tabsysprefs{insecure}="Admin";
$tabsysprefs{ldapinfos}="Admin";
$tabsysprefs{ldapserver}="Admin";
$tabsysprefs{itemcallnumber}="Catalogue";
$tabsysprefs{maxreserves}="Circulation";
$tabsysprefs{virtualshelves}="OPAC";
my %tabsysprefs;
$tabsysprefs{acquisitions}="Acquisitions";
$tabsysprefs{gist}="Acquisitions";
$tabsysprefs{authoritysep}="Authorities";
$tabsysprefs{ISBD}="Catalogue";
$tabsysprefs{marc}="Catalogue";
$tabsysprefs{marcflavour}="Catalogue";
$tabsysprefs{SubscriptionHistory}="Catalogue";
$tabsysprefs{maxoutstanding}="Circulation";
$tabsysprefs{printcirculationslips}="Circulation";
$tabsysprefs{ReturnBeforeExpiry}="Circulation";
$tabsysprefs{suggestion}="Acquisitions";
$tabsysprefs{automembernum}="Members";
$tabsysprefs{noissuescharge}="Circulation";
$tabsysprefs{opacthemes}="OPAC";
$tabsysprefs{opaclanguages}="OPAC";
$tabsysprefs{LibraryName}="OPAC";
$tabsysprefs{opacstylesheet}="OPAC";
$tabsysprefs{BiblioDefaultView}="OPAC";
$tabsysprefs{hidelostitem}="OPAC";
$tabsysprefs{KohaAdmin}="Admin";
$tabsysprefs{checkdigit}="Admin";
$tabsysprefs{checkdigit}="Members";
$tabsysprefs{dateformat}="Admin";
$tabsysprefs{insecure}="Admin";
$tabsysprefs{ldapinfos}="Admin";
@ -107,6 +80,7 @@ $tabsysprefs{ldapserver}="Admin";
$tabsysprefs{itemcallnumber}="Catalogue";
$tabsysprefs{maxreserves}="Circulation";
$tabsysprefs{virtualshelves}="OPAC";
$tabsysprefs{hide_marc}="Catalogue";
sub StringSearch {
my ($env,$searchstring,$type)=@_;
@ -334,7 +308,7 @@ if ($op eq 'add_form') {
}
}
$sth->finish;
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl\"></html>";
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=".$tabsysprefs{$input->param('variable')}."\"></html>";
exit;
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB

3
authorities/authorities.pl
View File

@ -139,7 +139,7 @@ sub create_input () {
$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;
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
$subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
} elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
@ -419,5 +419,6 @@ foreach my $thisauthtype (keys %$authtypes) {
$template->param(authtypesloop => \@authtypesloop,
authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
hide_marc => C4::Context->preference('hide_marc'),
);
output_html_with_http_headers $input, $cookie, $template->output;

15
authorities/blinddetail-biblio-search.pl
View File

@ -80,15 +80,20 @@ my $tag;
my @loop_data =();
if ($authid) {
foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
my @subfields_data;
my @subf=$field->subfields;
my @subfields_data;
my @subf=$field->subfields;
# loop through each subfield
my %result;
for my $i (0..$#subf) {
$subf[$i][0] = "@" unless $subf[$i][0];
$result{$subf[$i][0]}.=$subf[$i][1]."|";
}
foreach (keys %result) {
my %subfield_data;
$subfield_data{marc_value}=$subf[$i][1];
$subfield_data{marc_subfield}=$subf[$i][0];
$subfield_data{marc_tag}=$field->tag();
chop $result{$_};
$subfield_data{marc_value}=$result{$_};
$subfield_data{marc_subfield}=$_;
# $subfield_data{marc_tag}=$field->tag();
push(@subfields_data, \%subfield_data);
}
if ($#subfields_data>=0) {

2
barcodes/barcodes.pl
View File

@ -82,7 +82,7 @@ my $input = new CGI;
my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($labelConfig{'rows'}, $labelConfig{'columns'});
# It creates a list of posible intervals to choose codes to generate
my %list = ('continuous' => 'Continuous Range of items', 'individuals' => 'Individual Codes', 'continuous2' => 'Continuous range (from - to)');
my %list = ('continuous' => 'Continuous Range of items', 'individuals' => 'Individual Codes');
my @listValues = keys(%list);
my $rangeType = CGI::scrolling_list(-name => 'rangeType',
-values => \@listValues,

10
bull/lateissues.pl
View File

@ -4,6 +4,7 @@ use strict;
use CGI;
use C4::Auth;
use C4::Bull;
use C4::Acquisition;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
@ -30,6 +31,10 @@ my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid',
my @lateissues;
@lateissues = GetLateIssues($supplierid) if $supplierid;
my @supplierinfo;
my $nothing;
($nothing,@supplierinfo)=bookseller($supplierid) if $supplierid;
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/lateissues.tmpl",
query => $query,
@ -41,6 +46,9 @@ my ($template, $loggedinuser, $cookie)
$template->param(
CGIsupplier => $CGIsupplier,
lateissues => \@lateissues
lateissues => \@lateissues,
phone => $supplierinfo[0]->{phone},
booksellerfax => $supplierinfo[0]->{booksellerfax},
bookselleremail => $supplierinfo[0]->{bookselleremail},
);
output_html_with_http_headers $query, $cookie, $template->output;

3
bull/statecollection.pl
View File

@ -37,6 +37,7 @@ my ($template, $loggedinuser, $cookie)
});
my $hassubscriptionexpired = hassubscriptionexpired($subscriptionid);
my $subscription=getsubscription($subscriptionid);
if ($op eq 'modsubscriptionhistory') {
modsubscriptionhistory($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote);
}
@ -66,6 +67,7 @@ my $solhistory = $sth->fetchrow_hashref;
$template->param(
serialslist => \@serialslist,
biblionumber => $subscription->{biblionumber},
histstartdate => format_date($solhistory->{'histstartdate'}),
enddate => format_date($solhistory->{'enddate'}),
recievedlist => $solhistory->{'recievedlist'},
@ -74,6 +76,7 @@ my $solhistory = $sth->fetchrow_hashref;
librariannote => $solhistory->{'librariannote'},
subscriptionid => $subscriptionid,
bibliotitle => $subs->{bibliotitle},
biblionumber => $subs->{biblionumber},
hassubscriptionexpired =>$hassubscriptionexpired,
);
output_html_with_http_headers $query, $cookie, $template->output;

67
circ/branchtransfers.pl
View File

@ -36,8 +36,8 @@ use C4::Koha;
# constants
my %env;
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $linecolor1= 0;
my $linecolor2= 1;
my $branches = getbranches();
my $printers = getprinters(\%env);
@ -63,6 +63,7 @@ my $reqmessage;
my $cancelled;
my $setwaiting;
my $reqbrchname;
my $allmessages;
my $request=$query->param('request');
my $borrnum = $query->param('borrowernumber');
@ -77,6 +78,7 @@ if ($request eq "KillWaiting") {
CancelReserve(0, $item, $borrnum);
$cancelled = 1;
$reqmessage =1;
$allmessages = 1;
}
my $ignoreRs = 0;
@ -87,12 +89,14 @@ if ($request eq "SetWaiting") {
$ignoreRs = 1;
$setwaiting = 1;
$reqmessage =1;
$allmessages = 1;
}
if ($request eq 'KillReserved'){
my $biblio = $query->param('biblionumber');
CancelReserve($biblio, 0, $borrnum);
$cancelled = 1;
$reqmessage =1;
$allmessages = 1;
}
@ -180,13 +184,21 @@ foreach ($query->param){
push (@trsfitemloop, \%item);
}
my $name;
my $title;
my $surname;
my $firstname;
my $bornum;
my $borphone;
my $borstraddress;
my $borcity;
my $borzip;
my $boremail;
my $bornum;
my $borcnum;
my $itemnumber;
my $biblionum;
my $branchname;
my $wastransferred;
#####################
@ -195,8 +207,17 @@ if ($found) {
my $res = $messages->{'ResFound'};
$branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
$name = name($borr);
$bornum = $borr->{'borrowernumber'}; #Hopefully, borr->{borrowernumber}=res->{borrowernumber}
$title = $borr->{'title'};
$surname = $borr->{'surname'};
$firstname = $borr->{'firstname'};
$bornum = $borr->{'borrowernumber'};
$borphone = $borr->{'phone'};
$borstraddress = $borr->{'streetaddress'};
$borcity = $borr->{'city'};
$borzip = $borr->{'zipcode'};
$boremail = $borr->{'emailadress'};
#Hopefully, borr->{borrowernumber}=res->{borrowernumber}
$borcnum = $borr->{'cardnumber'};
$itemnumber = $res->{'itemnumber'};
@ -214,33 +235,39 @@ if ($found) {
my @errmsgloop;
foreach my $code (keys %$messages) {
my %err;
$err{errbadcode} = ($code eq 'BadBarcode');
if ($code eq 'BadBarcode') {
$err{msg}=$messages->{'BadBarcode'};
$err{errbadcode} = 1;
$allmessages = 1;
}
$err{errispermanent} = ($code eq 'IsPermanent');
if ($code eq 'IsPermanent'){
$err{errispermanent} = 1;
$err{msg} = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
# Here, msg contains the branchname
# Not so satisfied with this... But should work
$allmessages = 1;
}
$err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
$err{errwasreturned} = ($code eq 'WasReturned');
if ($code eq 'WasReturned') {
$err{errwasreturned} = 1;
$allmessages = 1;
my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
$name =name($borrowerinfo);
$title = $borrowerinfo->{'title'};
$surname = $borrowerinfo->{'surname'};
$firstname = $borrowerinfo->{'firstname'};
$bornum =$borrowerinfo->{'borrowernumber'};
$borcnum =$borrowerinfo->{'cardnumber'};
}
if ($code eq 'WasTransfered'){
# if ($code eq 'WasTransfered'){
# Put code here if you want to notify the user that item was transfered...
}
# $wastransferred = 1;
# }
push (@errmsgloop, \%err);
}
#######################################################################################
# Make the page .....
my ($template, $borrowernumber, $cookie)
@ -250,6 +277,10 @@ my ($template, $borrowernumber, $cookie)
authnotrequired => 0,
flagsrequired => {circulate => 1},
});
if($allmessages){
$template->param(allmessages => 1);
}
$template->param( genbrname => $genbrname,
genprname => $genprname,
branch => $branch,
@ -257,7 +288,14 @@ $template->param( genbrname => $genbrname,
found => $found,
reserved => $reserved,
waiting => $waiting,
name => $name,
title => $title,
surname => $surname,
firstname => $firstname,
borphone => $borphone,
borstraddress => $borstraddress,
borcity => $borcity,
borzip => $borzip,
boremail => $boremail,
bornum => $bornum,
borcnum => $borcnum,
branchname => $branchname,
@ -268,6 +306,7 @@ $template->param( genbrname => $genbrname,
reqmessage => $reqmessage,
cancelled => $cancelled,
setwaiting => $setwaiting,
wastransferred => $wastransferred,
trsfitemloop => \@trsfitemloop,
branchoptionloop => \@branchoptionloop,
errmsgloop => \@errmsgloop

6
circ/circulation.pl
View File

@ -58,8 +58,8 @@ my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;
$findborrower =~ s|'| |g;
my $borrowernumber = $query->param('borrnumber');
my $print=$query->param('print');
my $barcode = $query->param('barcode');
my $print=$query->param('print') || '';
my $barcode = $query->param('barcode') || '';
my $year=$query->param('year');
my $month=$query->param('month');
my $day=$query->param('day');
@ -280,7 +280,7 @@ if ($borrowerslist) {
#title
my ($patrontable, $flaginfotable) = patrontable($borrower);
my $amountold=$borrower->{flags}->{'CHARGES'}->{'message'};
my $amountold=$borrower->{flags}->{'CHARGES'}->{'message'} || 0;
my @temp=split(/\$/,$amountold);
$amountold=$temp[1];
$template->param(

27
circ/returns.pl
View File

@ -26,6 +26,7 @@
use strict;
use CGI;
use C4::Circulation::Circ2;
use C4::Date;
use C4::Search;
use C4::Output;
use C4::Print;
@ -201,6 +202,12 @@ if ( $messages->{'ResFound'} ) {
my ($iteminfo) = getiteminformation( \%env, 0, $barcode );
if ( $res->{'ResFound'} eq "Waiting" ) {
if($branch eq $res->{'branchcode'}){
$template->param(intransit => 0);
} else {
$template->param(intransit => 1);
}
$template->param(
found => 1,
name => $name,
@ -208,11 +215,15 @@ if ( $messages->{'ResFound'} ) {
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borphone => $borr->{'phone'},
boremail => $borr->{'emailaddress'},
borstraddress => $borr->{'streetaddress'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
bornum => $res->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
currentbranch => $branches->{ $branch }->{'branchname'},
branchname => $branches->{ $res->{'branchcode'} }->{'branchname'},
waiting => 1,
itemnumber => $res->{'itemnumber'},
@ -230,8 +241,16 @@ if ( $messages->{'ResFound'} ) {
sprintf( "%0.2d", ( $da[3] + 1 ) ) . "/"
. sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
. ( $da[5] + 1900 );
if($branch eq $res->{'branchcode'}){
$template->param(intransit => 0);
} else {
$template->param(intransit => 1);
}
$template->param(
found => 1,
currentbranch => $branches->{ $branch }->{'branchname'},
branchname => $branches->{ $res->{'branchcode'} }->{'branchname'},
reserved => 1,
today => $todaysdate,
@ -251,7 +270,9 @@ if ( $messages->{'ResFound'} ) {
borsub => $borr->{'suburb'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
boremail => $borr->{'emailadress'},
boremail => $borr->{'emailaddress'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
barcode => $barcode
);
}
@ -353,7 +374,7 @@ if ($borrower) {
my ($iteminformation) =
getiteminformation( \%env, $item->{'itemnumber'}, 0 );
my %overdueitem;
$overdueitem{duedate} = $item->{'date_due'};
$overdueitem{duedate} = format_date($item->{'date_due'});
$overdueitem{biblionum} = $iteminformation->{'biblionumber'};
$overdueitem{barcode} = $iteminformation->{'barcode'};
$overdueitem{title} = $iteminformation->{'title'};
@ -409,7 +430,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
$datearr[5] . '-'
. sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
. sprintf( "%0.2d", $datearr[3] );
$ri{duedate}=$duedate;
$ri{duedate}=format_date($duedate);
my ($borrower) =
getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
$ri{bornum} = $borrower->{'borrowernumber'};

285
koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
View File

@ -63,9 +63,14 @@
<!-- TMPL_LOOP NAME="0XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -74,14 +79,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -94,9 +104,14 @@
<!-- TMPL_LOOP NAME="1XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -105,14 +120,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -125,9 +145,14 @@
<!-- TMPL_LOOP NAME="2XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -136,14 +161,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -156,9 +186,14 @@
<!-- TMPL_LOOP NAME="3XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -167,14 +202,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -187,9 +227,14 @@
<!-- TMPL_LOOP NAME="4XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -198,14 +243,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -218,9 +268,14 @@
<!-- TMPL_LOOP NAME="5XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -229,14 +284,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -249,9 +309,14 @@
<!-- TMPL_LOOP NAME="6XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -260,14 +325,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -280,9 +350,14 @@
<!-- TMPL_LOOP NAME="7XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -291,14 +366,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -311,9 +391,14 @@
<!-- TMPL_LOOP NAME="8XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -322,14 +407,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -342,9 +432,14 @@
<!-- TMPL_LOOP NAME="9XX" -->
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
<!-- TMPL_VAR NAME="tag" -->
<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_UNLESS name="hide_marc" -->
<!-- TMPL_VAR NAME="tag" -->
<input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
<!-- TMPL_ELSE -->
<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- TMPL_IF name="repeatable" -->
<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
<!-- /TMPL_IF -->
@ -353,14 +448,19 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -491,28 +591,28 @@ function Check(f) {
}
alert(alertString2);
} else {
document.forms[0].submit();
document.forms['f'].submit();
}
}
function Dopop(link,i) {
defaultvalue=document.forms[0].field_value[i].value;
defaultvalue=document.forms['f'].field_value[i].value;
newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
}
function PopupZ3950() {
var strQuery="";
for (i=0 ; i<document.forms[0].field_value.length ; i++) {
if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&isbn="+document.forms[0].field_value[i].value;
for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&isbn="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&title="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&title="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) {
strQuery += "&author="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
strQuery += "&author="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&issn="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&issn="+document.forms['f'].field_value[i].value;
}
}
newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=800,height=400,toolbar=false,scrollbars=yes');
@ -523,10 +623,29 @@ function Changefwk(FwkList) {
}
function AddField(field) {
document.forms[0].op.value = "addfield";
document.forms[0].addfield_field.value=field;
document.forms['f'].op.value = "addfield";
document.forms['f'].addfield_field.value=field;
document.f.submit();
}
function upSubfield(index) {
// alert("UP "+index);
temp = document.forms['f'].field_value[index-1].value;
document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
document.forms['f'].field_value[index].value= temp;
temp = document.forms['f'].subfield[index-1].value;
document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
document.forms['f'].subfield[index].value = temp;
temp = document.forms['f'].mandatory[index-1].value;
document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
document.forms['f'].mandatory[index].value = temp;
temp = document.forms['f'].kohafield[index-1].value;
document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
document.forms['f'].kohafield[index].value = temp;
// temp = document.getElementById('error'+index).value = "XXX";
// document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
// document.forms['f'].kohafield[index].value = temp;
}
</script>
</body>
</html>

3
koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
View File

@ -76,7 +76,6 @@
<input type="hidden" name="mandatory" value="0">
<input type="button" value="Modify item" onClick="Check(this.form)" accesskey="w" class="button catalogue">
<!-- /TMPL_IF -->
</center>
</form>
</div>
<script LANGUAGE="JavaScript">
@ -120,7 +119,7 @@ function Check(f) {
}
}
function Dopop(link,i) {
defaultvalue=document.forms[0].field_value[i].value;
defaultvalue=document.forms['f'].field_value[i].value;
newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
}
function confirm_deletion(bibid,itemnum) {

32
koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
View File

@ -60,19 +60,17 @@
</td>
<!-- TMPL_ELSE -->
<td>
<p>
<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
<!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
</p>
<!-- TMPL_IF name="notes" --></p><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
</td>
<!-- /TMPL_IF -->
<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
<td class="number"><p><!-- TMPL_VAR NAME="rrp" --></p></td>
<td class="doNotPrint number"><p><!-- TMPL_VAR NAME="ecost" --></p></td>
<td class="number"><p><!-- TMPL_VAR NAME="quantity" --></p></td>
<td class="number"><p><!-- TMPL_VAR NAME="line_total" --></p></td>
<td class="doNotPrint"><p><!-- TMPL_VAR NAME="bookfundid" --></p></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<td class="doNotPrint">
@ -100,20 +98,20 @@
<p><!-- TMPL_VAR NAME="gist_est" --></p>
<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
</td>
<td class="acquisition number">
<p><!-- TMPL_VAR NAME="sub_total" --></p>
<p><!-- TMPL_VAR NAME="gist" --></p>
<p><!-- TMPL_VAR NAME="grand_total" --></p>
</td>
<td class="acquisition">
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
</td>
<td class="acquisition number">
<p><!-- TMPL_VAR name="qty_total" --></p>
<p>&nbsp;</p>
<p>&nbsp;</p>
</td>
<td class="acquisition">
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<td class="acquisition number">
<p><!-- TMPL_VAR NAME="sub_total" --></p>
<p><!-- TMPL_VAR NAME="gist" --></p>
<p><!-- TMPL_VAR NAME="grand_total" --></p>
</td>
<td class="acquisition">
<p>&nbsp;</p>

138
koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
View File

@ -6,9 +6,8 @@
<table>
<tr>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">Title</th>
<th class="acquisition">Author</th>
<th class="acquisition">Supplier</th>
<th class="acquisition">Title/Author</th>
<th class="acquisition">Placed on</th>
<th class="acquisition">Recieved on</th>
<th class="acquisition">Quantity ordered</th>
@ -16,18 +15,76 @@
<th class="acquisition">&nbsp;</th>
</tr>
<tr>
<form>
<form action="/cgi-bin/koha/acqui/histsearch.pl" method="get">
<th class="acquisition">
Filter on
</th>
<th class="acquisition">
<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
<input type="text" name="name" value="<!-- TMPL_VAR name="name" -->">
</th>
<th class="acquisition">
<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">/
<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
</th>
<th class="acquisition">
<input type="text" name="name" value="<!-- TMPL_VAR name="name" -->">
From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
<script language="JavaScript" type="text/javascript">
function validate1(date) {
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var weekDay = date.getDay();
var dayMonth = month + '-' + day;
var dateString = year + '-' + month + '-' + day;
var dateTo = document.getElementById('to').value.split("-");
var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
if (date > limitDate) {
return true;
} else {
return false;
}
}
Calendar.setup(
{
inputField : "from",
ifFormat : "%Y-%m-%d",
button : "openCalendarFrom",
disableFunc : validate1,
dateStatusFunc : validate1
}
);
</script>
<br/>
To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
<script type="text/javascript">
function validate2(date) {
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var weekDay = date.getDay();
var dayMonth = month + '-' + day;
var dateString = year + '-' + month + '-' + day;
var dateFrom = document.getElementById('from').value.split("-");
var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
if (limitDate > date) {
return true;
} else {
return false;
}
}
Calendar.setup(
{
inputField : "to",
ifFormat : "%Y-%m-%d",
button : "openCalendarTo",
disableFunc : validate2,
dateStatusFunc : validate2
}
);
</script>
</th>
<th class="acquisition">
From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
@ -107,32 +164,77 @@
</tr>
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
<td>
<!-- TMPL_VAR Name="count"-->
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="count" -->
</td>
<td>
<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a>
</td>
<td>
<!-- TMPL_VAR NAME="author" -->
</td>
<td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="name" -->
</td>
<td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<p><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></p>
<p><!-- TMPL_VAR NAME="author" --></p>
</td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_VAR name="creationdate" -->
</td>
<td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_VAR name="datereceived" -->
</td>
<td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted number">
<!-- TMPL_ELSE -->
<td class="number">
<!-- /TMPL_IF -->
<!-- TMPL_VAR name="quantity" -->
</td>
<td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted number">
<!-- TMPL_ELSE -->
<td class="number">
<!-- /TMPL_IF -->
<!-- TMPL_VAR name="ecost" -->
</td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
&nbsp;
</td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">&nbsp;</th>
<th class="acquisition">&nbsp;</th>
<th class="acquisition"><!-- TMPL_VAR name="total_qty" --></th>
<th class="acquisition"><!-- TMPL_VAR name="total_price" --></th>
<th class="acquisition">&nbsp;</th>
</tr>
</table>
</div>

8
koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
View File

@ -170,19 +170,19 @@ function check(f) {
</p>
<p>
<label class="label100">Replacement Cost </label>
<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" onchange="update(this.form)">
<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
</p>
<p>
<label class="label100">Budgeted Cost</label>
<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" onchange="update(this.form)">
<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->">
</p>
<p>
<label class="label100">Budgeted GST</label>
<input type="text" size="20" name="GST" value="" onchange="update(this.form)">
<input type="text" size="20" name="GST" value="">
</p>
<p>
<label class="label100"><b>BUDGETED TOTAL</b></label>
<input type="text" size="20" name="total" value="" onchange="update(this.form)">
<input type="text" size="20" name="total" value="">
</p>
<p>
<label class="label100">Actual Cost</label>

3
koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl
View File

@ -9,7 +9,7 @@
<th class="acquisition">&nbsp;</th>
</tr>
<tr>
<form>
<form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="get">
<th class="acquisition">
<p>Filter on :
title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->">
@ -56,6 +56,5 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
<form>
</div>
<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

2
koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
View File

@ -3,7 +3,7 @@
<h1 class="authority">Authority search</h1>
<form name="f" method="post">
<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="type" value="intranet">
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">

2
koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
View File

@ -3,7 +3,7 @@
<h1 class="authority">Authority search</h1>
<form name="f" method="post">
<form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="post">
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="type" value="intranet">
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">

46
koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
View File

@ -47,14 +47,18 @@
<!-- TMPL_LOOP NAME="subfield_loop" -->
<p>
<label class="labelsubfield">
<b><!-- TMPL_VAR NAME="subfield" --></b>
<!-- TMPL_UNLESS name="hide_marc" -->
<img src="<!-- TMPL_VAR NAME="themelang" -->/images/prev.gif" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
</label>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
@ -150,28 +154,28 @@ function Check(f) {
alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
alert(alertString2);
} else {
document.forms[1].submit();
document.forms[0].submit();
}
}
function Dopop(link,i) {
defaultvalue=document.forms[0].field_value[i].value;
defaultvalue=document.forms['f'].field_value[i].value;
newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
}
function PopupZ3950() {
var strQuery="";
for (i=0 ; i<document.forms[0].field_value.length ; i++) {
if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&isbn="+document.forms[0].field_value[i].value;
for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&isbn="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&title="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&title="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) {
strQuery += "&author="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
strQuery += "&author="+document.forms['f'].field_value[i].value;
}
if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) {
strQuery += "&issn="+document.forms[0].field_value[i].value;
if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
strQuery += "&issn="+document.forms['f'].field_value[i].value;
}
}
newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
@ -182,6 +186,22 @@ function AddField(field) {
document.forms[1].addfield_field.value=field;
document.f.submit();
}
function upSubfield(index) {
temp = document.forms['f'].field_value[index-1].value;
document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
document.forms['f'].field_value[index].value= temp;
temp = document.forms['f'].subfield[index-1].value;
document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
document.forms['f'].subfield[index].value = temp;
temp = document.forms['f'].mandatory[index-1].value;
document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
document.forms['f'].mandatory[index].value = temp;
temp = document.forms['f'].kohafield[index-1].value;
document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
document.forms['f'].kohafield[index].value = temp;
}
</script>
</body>
</html>

11
koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl
View File

@ -5,9 +5,11 @@
<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
</a>
<a href="javascript:confirm_deletion()">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
</a>
<!-- TMPL_UNLESS name="count" -->
<a href="javascript:confirm_deletion()">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
</a>
<!-- /TMPL_UNLESS -->
<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">
Print
</a>
@ -22,9 +24,6 @@
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15">
</a>
<!-- TMPL_VAR NAME="marc_subfield" -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->

2
koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
View File

@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h2 class="catalogue">Select bookshelf</h2>
<form>
<form action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl" method="get">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>

32
koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
View File

@ -2,23 +2,23 @@
<div id="mainbloc">
<!-- TMPL_IF Name="viewshelf" -->
<form>
<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
<div id="bloc25">
<h2 class="catalogue">Shelf content</h2>
<h2 class="catalogue">Shelf contents</h2>
<table class="small">
<tr colspan="4">
<th class="catalogue">delete</th>
<th class="catalogue">barcode</th>
<th class="catalogue">title</th>
<th class="catalogue"><!-- TMPL_IF name="manageshelf" -->Delete<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></th>
<th class="catalogue">Barcode</th>
<th class="catalogue">Title</th>
<th class="catalogue">Author</th>
</tr>
<!-- TMPL_LOOP Name="itemsloop" -->
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
<td><!-- TMPL_IF name="manageshelf" --><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
<td><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
</tr>
<!-- /TMPL_LOOP -->
@ -34,7 +34,7 @@
<!-- TMPL_IF name="manageshelf" -->
<div id="bloc25">
<form>
<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<h2 class="catalogue">Add a book by barcode</h2>
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
<input type="hidden" name="modifyshelfcontents" value="1">
@ -47,7 +47,7 @@
</div>
<!-- /TMPL_IF -->
<div id="bloc25">
<a href="shelves.pl" class="button catalogue">Shelf list</a>
<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">Shelf list</a>
</div>
<!-- TMPL_ELSE -->
<!-- TMPL_IF Name="shelves" -->
@ -62,7 +62,7 @@
<!-- /TMPL_LOOP -->
<div id="bloc25">
<h2 class="catalogue">Select Shelves to Delete</h2>
<form method="post">
<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<input type="hidden" name="shelves" value="1">
<!-- TMPL_LOOP Name="shelvesloop" -->
<!-- TMPL_IF name="canmanage" -->
@ -80,7 +80,7 @@
</form>
</div>
<div id="bloc25">
<form method="post">
<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
<input type="hidden" name="shelves" value="1">
<h2 class="catalogue">Add Shelf</h2>
<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
@ -98,7 +98,7 @@
</p>
<p>
<input type="submit" value="Add New Shelf" class="button catalogue">
<a href="shelves.pl" class="button catalogue">back to shelf list</a>
<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">back to shelf list</a>
</p>
</form>
@ -116,7 +116,7 @@
<!-- TMPL_LOOP Name="shelvesloop" -->
<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td>
<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
<a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
<!-- TMPL_VAR NAME="shelfname" -->
</a>
</td>
@ -136,7 +136,7 @@
</td>
<!-- TMPL_IF name="mine" -->
<td>
<a href="shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modify</a>
<a href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modify</a>
<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
</td>
<!-- TMPL_ELSE -->
@ -147,14 +147,14 @@
</table>
</div>
<div id="bloc25">
<a href="shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
<a href="/cgi-bin/koha/bookshelves/shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
</div>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="edit" -->
<div id="bloc25">
<form method="post">
<form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl">
<input type="hidden" name="op" value="modifsave">
<h2 class="catalogue">Modify shelf</h2>
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">

6
koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl
View File

@ -16,7 +16,11 @@
<!-- TMPL_VAR name="CGIsupplier" -->
</td>
<td>
&nbsp;
<p>
<!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="bookselleremail" --></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->" class="button bull"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
</p>
</td>
<td>
<input type="submit" value="filter" class="button bull">

22
koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl
View File

@ -3,7 +3,7 @@
<h1 class="catalogue">Catalogue search</h1>
<form name="f" method="post">
<form name="f" action="/cgi-bin/koha/bull/subscription-bib-search.pl" method="post">
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="type" value="intranet">
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
@ -15,7 +15,7 @@
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
<input type="hidden" name="operator" value="contains">
<input type="text" name="value" onchange="sql_update()">
<input type="text" name="value">
</p>
</div>
<div id="bloc25">
@ -41,24 +41,10 @@
</div>
</form>
<script>
function sql_update() {
document.f.sql.value="";
for (i=0 ; i<document.f.marclist.length ; i++) {
if (document.f.value[i].value.length>0) {
document.f.sql.value = document.f.sql.value+
document.f.and_or[i].value + ' (' +
document.f.excluding[i].value + ' ' +
document.f.marclist[i].value + ' ' +
document.f.operator[i].value + ' ' +
'\''+document.f.value[i].value + '\') ';
}
}
}
<script language="Javascript" type="text/javascript">
function AddStatement() {
document.forms[0].op.value="AddStatement";
document.forms['f'].op.value="AddStatement";
document.f.submit();
}

4
koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
View File

@ -59,9 +59,9 @@
<option value="4">Missing</option>
<!-- /TMPL_IF -->
<!--TMPL_IF name="status5" -->
<option value="5" selected>Not issued</option>
<option value="5" selected>Not published</option>
<!-- TMPL_ELSE -->
<option value="5">Not issued</option>
<option value="5">Not published</option>
<!-- /TMPL_IF -->
<!--TMPL_IF name="status6" -->
<option value="6" selected>Delete</option>

4
koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
View File

@ -164,6 +164,7 @@
<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;</th>
<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;</th>
<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Note&nbsp;&nbsp;&nbsp;&nbsp;</th>
</tr>
<!-- TMPL_LOOP name="serialslist" -->
<tr>
@ -188,6 +189,9 @@
<!-- /TMPL_IF -->
</select>
</td>
<td>
<!-- TMPL_VAR name="notes" -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>

2
koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl
View File

@ -3,7 +3,7 @@
<h1 class="bull">subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
<form name="f" method="post">
<form name="f" action="/cgi-bin/koha/bull/subscription-renew.pl" method="post">
<div id="bloc25">
<input type="hidden" name="op" value="renew">
<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">

52
koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
View File

@ -13,17 +13,17 @@
<a href="javascript:Addbiblio('duplicate')" class="button catalogue">
Duplicate
</a>
<a href="acqui.simple/additem.pl?biblionumber=<!-- TMPL_VAR name="biblionumber"-->" class="button catalogue">
<a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
Edit item
</a>
<a href="javascript:confirm_deletion()" class="button catalogue">
delete
</a>
<a href="detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
<a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
Complete
</a>
<a href="detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
<a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
Normal
</a>
<a href="ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
@ -93,8 +93,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -121,8 +121,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -149,8 +149,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -177,8 +177,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -205,8 +205,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -233,8 +233,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -261,8 +261,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -289,8 +289,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -317,8 +317,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -345,8 +345,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
<label class="labelsubfield">
<!-- TMPL_VAR NAME="marc_subfield" -->
<label class="labelsubfield">&nbsp;
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
@ -405,11 +405,11 @@ function Dopop(link) {
}
function Changefwk(FwkList) {
var fwk = FwkList.options[FwkList.selectedIndex].value;
window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
window.location = "MARCdetail.pl?bib=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
}
function Addbiblio(op) {
var fwk = document.forms[0].Frameworks.options[document.forms[0].Frameworks.selectedIndex].value;
window.location = "acqui.simple/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op;
var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op;
}
</script>
</body>

17
koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl
View File

@ -69,6 +69,7 @@
</td></tr></table>
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="allmessages" -->
<table>
<tr><th class="circulation">Messages</th></tr>
<tr><td>
@ -97,7 +98,7 @@ onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME=
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->&nbsp;
</td></tr></table>
<!-- /TMPL_IF -->
<form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
<p><b>Select Destination Branch: </b><select name="tobranchcd">
<!-- TMPL_LOOP Name="branchoptionloop" -->
@ -115,19 +116,19 @@ onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME=
<!-- /TMPL_LOOP --></p>
</form>
<!-- TMPL_IF Name="transferred" -->
<!-- TMPL_IF Name="trsfitemloop" -->
<p>
<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
<!-- TMPL_LOOP Name="trsfitemloop" -->
<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
<!-- TMPL_IF NAME="color" --><tr class="hilighted"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><td align="center">
<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="itemtype" --></td>
<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="frbrname" --></td>
<td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="tobrname" --></td>
<td><!-- TMPL_VAR NAME="title" --></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td align="center"><!-- TMPL_VAR NAME="itemtype" --></td>
<td align="center"><!-- TMPL_VAR NAME="frbrname" --></td>
<td align="center"><!-- TMPL_VAR NAME="tobrname" --></td>
</tr>
<!-- /TMPL_LOOP -->
</table>

3
koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
View File

@ -135,7 +135,8 @@
<p>
<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->','Member'); return false;">
<!-- TMPL_VAR NAME="riborcnum" -->
</a>
</a>
<!-- TMPL_IF NAME="boremail" -->(<a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- TMPL_VAR Name="boremail" --></a>)<!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="riborsurname" -->, <!-- TMPL_VAR NAME="ribortitle" --> <!-- TMPL_VAR NAME="riborfirstname" --></p>
<!-- TMPL_IF Name="flagset" -->
<h2 class="circulation">Flags</h2>

7
koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
View File

@ -53,8 +53,8 @@ label {
font-family: Arial;
font-size:12px;
padding: 2px 5px 2px 5px;
margin:5px;
/* margin-bottom:5px; */
margin-top:5px;
margin-bottom:5px;
display:inline;
position:static;
border : 1px solid black;
@ -138,6 +138,7 @@ td.numberhilighted {
border-right : 1px solid Black;
}
h1 {
color:#000000;
background-color:#DDDDDD;
@ -275,7 +276,7 @@ a.resultnumber:hover {
a.resultlist {
font-weight : bold;
display : block;
/* display : block;*/
padding-left : 5px;
}

2
koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
View File

@ -16,13 +16,11 @@ function Help() {
background-color: #86c268;
color:#FFFFFF;
text-decoration: normal;
font-weight: bold;
}
a.members:hover {
background-color: #86c268;
color: #FFFFFF;
text-decoration: normal;
font-weight: bold;
}
</style>
</head>

9
koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc
View File

@ -3,7 +3,16 @@
<html>
<head>
<title>KOHA: INTRANET: Parameters</title>
<!-- Additions to enable Calendar system -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
<!-- End of additions -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<!-- Additions to enable Calendar system -->
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
<!-- End of additions -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">

27
koha-tmpl/intranet-tmpl/default/en/includes/reportswcal-top.inc
View File

@ -3,10 +3,10 @@
<html>
<head>
<title>KOHA: INTRANET: Reports</title>
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<!-- Additions to enable Calendar system -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
<!-- End of additions -->
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<!-- Additions to enable Calendar system -->
@ -15,6 +15,7 @@
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
<!-- End of additions -->
<script language="JavaScript" type="text/javascript">
function Help() {
newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
@ -26,39 +27,21 @@ function Help() {
background-color: #6b7cbe;
color:#FFFFFF;
text-decoration: normal;
font-weight: bold;
background-image:none;
}
a.reports:hover {
background-color: #6b7cbe;
color: #FFFFFF;
text-decoration: normal;
font-weight: bold;
}
</style>
</head>
<body>
<!-- MENUS -->
<div id="menubar">
<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
<a class="circulation" href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
<a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
<a class="about" href="/cgi-bin/koha/about.pl">About</a>
<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
</div>
<div id="submenu">
<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
<a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes" class="submenu">Itemtypes</a>
</div>
<!-- TMPL_INCLUDE name="menus.inc" -->
<!-- TMPL_IF NAME="loggedinusername" -->
<p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
<p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
<!-- TMPL_ELSE -->
<p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
<p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
<!-- /TMPL_IF -->

86
koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
View File

@ -2,15 +2,10 @@
<div id="mainbloc">
<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
<!-- TMPL_IF NAME="picture" -->
<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="picture" -->">
<!-- /TMPL_IF --><br>
<a href="/cgi-bin/koha/members/member-picupload.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&name=<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->" class="button">Upload Picture</a><br>
<div class="bloc25">
<h2 class="members">Membership record</h2>
<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
<p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
<p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
<label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
<!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
<label class="label100">Phone home: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
@ -68,25 +63,7 @@
<!-- TMPL_IF name="password" -->(password defined)<!-- TMPL_ELSE -->(no password)<!-- /TMPL_IF -->
</p>
<p>
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<!-- TMPL_IF NAME="I" -->
<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- /TMPL_IF -->
<a href="javascript:confirm_deletion()" class="button">Delete</a>
<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
<a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
</p>
<br/>
<p>
<!-- TMPL_IF NAME="IS_ADULT" -->
<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
<!-- /TMPL_IF -->
<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
<!-- TMPL_IF NAME="I" -->
<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
<!-- TMPL_ELSE -->
@ -102,7 +79,7 @@
<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
<!-- /TMPL_IF -->
<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Print Slip</a>
</p>
</div>
@ -124,23 +101,14 @@
No debts
</TMPL_IF>
<p>
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
View Account
</a>
<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
Pay Fines
</a>
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
View Account
</a>
<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
Pay Fines
</a>
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
</p>
</div>
<div class="bloc25">
@ -175,18 +143,11 @@
<!-- /TMPL_LOOP -->
<tr>
<td colspan="5" align="right">
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<!-- TMPL_IF NAME="reserveloop" -->
<input type="submit" name="submit" value="Update" class="button">
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS NAME="unvalidlibrarian"-->
<!-- TMPL_IF NAME="reserveloop" -->
<input type="submit" name="submit" value="Update" class="button">
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
</td>
</tr>
</table>
@ -212,13 +173,9 @@
<th>Due</th>
<th>Itemtype</th>
<th>Charge</th>
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<th>Renew</th>
<!-- /TMPL_IF-->
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
<th>Renew</th>
<!-- /TMPL_IF-->
<!-- /TMPL_UNLESS -->
</tr>
<!-- TMPL_LOOP NAME="issueloop" -->
@ -232,37 +189,22 @@
<td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF --><!-- TMPL_VAR NAME="date_due" --></p></td>
<td><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="charge" --></td>
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<td>
<!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
<td>
<!-- TMPL_IF NAME="norenew" -->
<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
<!-- TMPL_ELSE -->
<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
<!-- /TMPL_IF -->
</td>
<!-- /TMPL_IF-->
<!-- TMPL_ELSE -->
<td>
<!-- TMPL_IF NAME="norenew" -->
<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
<!-- TMPL_ELSE -->
<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
<!-- /TMPL_IF -->
</td>
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_IF NAME="independantbranches"-->
<!-- TMPL_IF NAME="samebranch"-->
<input type="submit" class="button" value="Renew Items">
<!-- /TMPL_IF-->
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS Name ="unvalidlibrarian"-->
<input type="submit" class="button" value="Renew Items">
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
</form>
<!-- TMPL_ELSE -->
None

5
koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
View File

@ -24,7 +24,7 @@
<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Returned
</th>
<th>
Volume
<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Returned</a></th>
</th>
</tr>
<!-- TMPL_LOOP NAME="loop_reading" -->
@ -46,9 +46,6 @@
<td>
<!-- TMPL_VAR NAME="returndate" -->&nbsp;
</td>
<td>
<!-- TMPL_VAR NAME="volumeddesc" -->&nbsp;
</td>
<!-- /TMPL_LOOP -->
</table>

16
koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
View File

@ -49,6 +49,13 @@
&nbsp;
<!--/TMPL_IF-->
</td>
<td align="center">
<!--TMPL_IF Name="branchcode"-->
<!--TMPL_VAR Name="branchcode"-->
<!--TMPL_ELSE -->
&nbsp;
<!--/TMPL_IF-->
</td>
<td>
<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="Edit" width="32" hspace="0" vspace="0" border="0">
@ -149,7 +156,14 @@
<label>Name</label><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="bookfundname" escape=HTML -->">&nbsp;
</p>
<p>
<label>Branch</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
<label>Branch</label>
<select name="branch">
<option value="">Default</option>
<!-- TMPL_LOOP name="branchloop" -->
<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
<!-- /TMPL_LOOP -->
</select>
<br/> Select one if budget is branch specific, otherwise, leave it blank.
</p>
<p>

4
koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl
View File

@ -164,12 +164,12 @@
<input type="hidden" name="op" value="add_form">
<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
<!-- TMPL_IF NAME="isprevpage" -->
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="nextpage" -->
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
</a>
<!-- /TMPL_IF -->

230
koha-tmpl/intranet-tmpl/default/en/parameters/viewlog.tmpl
View File

@ -1,230 +0,0 @@
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
<div id="mainbloc" >
<!-- TMPL_IF NAME="do_it" -->
<script language="JavaScript" type="text/javascript">
function Dopop(link) {
newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
}
</script>
<h1 class="parameters">Koha : Hisory view for <!-- TMPL_VAR NAME="modulename"--> </h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="name"--> =</label><!-- TMPL_VAR NAME="value"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF NAME="loopfilter"-->
<br>
<table border="1">
<!-- TMPL_IF NAME="catalogue" -->
<tr >
<th class="parameters">Modified on
</th>
<th class="parameters">Title
</th>
<th class="parameters">Librarian
</th>
<th class="parameters">Action
</th>
<th class="parameters">Info
</th>
</tr>
<!-- TMPL_LOOP NAME="looprow" -->
<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="day" --><br/>(<!-- TMPL_VAR NAME="timestamp" -->)
</td>
<td><!-- TMPL_VAR NAME="title" -->, <!-- TMPL_VAR NAME="author" -->
</td>
<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
</td>
<td><!-- TMPL_IF NAME="action" --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="info" --><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="acqui" -->
<tr >
<th class="parameters">Timestamp
</th>
<th class="parameters">Firstname
</th>
<th class="parameters">Surname
</th>
<th class="parameters">Action
</th>
<th class="parameters">Info
</th>
<th class="parameters">Title
</th>
<th class="parameters">Author
</th>
</tr>
<!-- TMPL_LOOP NAME="looprow" -->
<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="rowtitle" --></td>
<!-- TMPL_LOOP NAME="loopcell" -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
</td>
<!-- /TMPL_LOOP -->
</tr>
<!-- /TMPL_LOOP NAME="looprow" -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="members" -->
<tr >
<th class="parameters">Timestamp
</th>
<th class="parameters">Firstname
</th>
<th class="parameters">Surname
</th>
<th class="parameters">Action
</th>
<th class="parameters">Info
</th>
<th class="parameters">Title
</th>
<th class="parameters">Author
</th>
</tr>
<!-- TMPL_LOOP NAME="looprow" -->
<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><!-- TMPL_IF NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP NAME="looprow" -->
<!-- /TMPL_IF -->
</table>
<!-- TMPL_ELSE -->
<h1 class = "parameters">Koha : Display Logs </h1>
<form method="post">
<table>
<thead>
<tr>
<th class="parameters">On Module</th>
<th class="parameters">User/Action Filters</th>
<th class="parameters">Object Filter</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<select name="module">
<option value ="catalogue" checked>Catalogue</option>
<option value ="members">Borrowers</option>
<option value ="acqui">Acquisitions</option>
</select>
</td>
<td>
<p>
Koha User : <input type="text" name="user" value="">
</p>
<p> Action type : <select name="action">
<option value ="">All</option>
<option value ="add">Add</option>
<option value ="del">Delete</option>
<option value ="mod">Modify</option>
</select>
</p>
<p> From <input type="text" readonly="readonly" size="10" id="from" name="from" >
<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
<script language="JavaScript" type="text/javascript">
function validate1(date) {
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var weekDay = date.getDay();
var dayMonth = month + '-' + day;
var dateString = year + '-' + month + '-' + day;
var dateTo = document.getElementById('to').value.split("-");
var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
if (date > limitDate) {
return true;
} else {
return false;
}
}
Calendar.setup(
{
inputField : "from",
ifFormat : "%Y-%m-%d",
button : "openCalendarFrom",
disableFunc : validate1,
dateStatusFunc : validate1
}
);
</script>
To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="to">
<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
<script type="text/javascript">
function validate2(date) {
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var weekDay = date.getDay();
var dayMonth = month + '-' + day;
var dateString = year + '-' + month + '-' + day;
var dateFrom = document.getElementById('from').value.split("-");
var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
if (limitDate > date) {
return true;
} else {
return false;
}
}
Calendar.setup(
{
inputField : "to",
ifFormat : "%Y-%m-%d",
button : "openCalendarTo",
disableFunc : validate2,
dateStatusFunc : validate2
}
);
</script>
</td>
</tr>
</table>
<div id="bloc25">
<h3 class="parameters"> Output </h3>
<input type="radio" checked name="output" value="screen" > To screen into the browser
<br>
<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application
<!-- TMPL_VAR NAME="CGIextChoice" -->
<!-- TMPL_VAR NAME="CGIsepChoice" -->
</p>
</div>
<p>
<input TYPE="submit" value="OK" class="button parameters">
<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
<input type="hidden" name="do_it" value="1">
</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

1
koha-tmpl/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl
View File

@ -255,7 +255,6 @@
<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application
<!-- TMPL_VAR NAME="CGIextChoice" -->
<!-- TMPL_VAR NAME="CGIsepChoice" -->
</p>
</div>
<p>
<input TYPE="submit" value="OK" class="button reports">

10
koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
View File

@ -98,8 +98,14 @@
</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>Branch</td>
<td align="center"><input type="radio" name="Line" value="branchcode"></td>
<td align="center"><input type="radio" name="Column" value="branchcode"></td>
<td ><!-- TMPL_VAR NAME="CGIBranch" --></td>
</tr>
<!-- TMPL_IF name="hassort1" -->
<tr>
<tr class="hilighted" >
<td>Sort1</td>
<td align="center"><input type="radio" name="Line" value="sort1"></td>
<td align="center"><input type="radio" name="Column" value="sort1"></td>
@ -107,7 +113,7 @@
</tr>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="hassort2" -->
<tr class="hilighted" >
<tr>
<td>Sort2</td>
<td align="center"><input type="radio" name="Line" value="sort2"></td>
<td align="center"><input type="radio" name="Column" value="sort2"></td>

3
koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl
View File

@ -206,7 +206,8 @@
<h3 class="reports"> Cell value </h3>
<p><input type="radio" name="Cellvalue" value="1" checked> Count issues </p>
<p><input type="radio" name="Cellvalue" value="2" > Count borrowers </p>
<p><input type="radio" name="Cellvalue" value="3"> Circulation rate </p>
<p><input type="radio" name="Cellvalue" value="3"> Count Items </p>
<p><input type="radio" name="Cellvalue" value="4"> Circulation rate </p>
</div>
<div id="bloc25">
<h3 class="reports"> Output </h3>

6
koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
View File

@ -20,7 +20,11 @@
</tr>
<!-- TMPL_LOOP NAME="result" -->
<tr>
<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_IF NAME="even" -->
<td class="hilighted">
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="MARC_ON" -->
<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
<!-- TMPL_ELSE -->

28
koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
View File

@ -30,9 +30,11 @@
<input type="hidden" name="excluding" value="">
<input type="hidden" name="operator" value="contains">
<input type="text" name="value" id="title" onchange="sql_update()" size="35">
<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
...
</a>
<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
...
</a>
<!-- /TMPL_UNLESS -->
</p>
<p>
<label for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
@ -40,9 +42,11 @@
<input type="hidden" name="excluding" value="">
<input type="hidden" name="operator" value="contains">
<input type="text" name="value" id="author" onchange="sql_update()" size="35">
<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
...
</a>
<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
...
</a>
<!-- /TMPL_UNLESS -->
</p>
<p>
<label for="subject">Subject</label>
@ -51,9 +55,11 @@
<input type="hidden" name="excluding" value="">
<input type="hidden" name="operator" value="contains">
<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
...
</a>
<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
...
</a>
<!-- /TMPL_UNLESS -->
</p>
<p>
<label for="itemtype">Item Type</label>
@ -186,12 +192,12 @@ document.f.sql.value="";
function AddStatement() {
document.forms[0].op.value="AddStatement";
document.forms['f'].op.value="AddStatement";
document.f.submit();
}
function Dopop(link,i) {
var searchstring=document.forms[0].value[i].value;
var searchstring=document.forms['f'].value[i].value;
newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
}

6
koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl
View File

@ -39,9 +39,9 @@
<script language="javascript" type="text/javascript">
function Import(Replaced,ReplaceBy) {
for (i=0 ; i<opener.document.f.value.length ; i++) {
opener.document.forms[0].value[i].value = opener.document.forms[0].value[i].value.replace(Replaced,ReplaceBy);
// if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
// strQuery += "&isbn="+document.forms[0].field_value[i].value;
opener.document.forms['f'].value[i].value = opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
// if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
// strQuery += "&isbn="+document.forms['f'].field_value[i].value;
// }
// opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
self.close();

126
koha-tmpl/intranet-tmpl/default/en/value_builder/labs_theses.tmpl Normal file
View File

@ -0,0 +1,126 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>KOHA: Labs Thesis Selection plugin</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<script language="JavaScript" type="text/javascript">
<!-- Hide from old browsers
function openWindow(targeturl, windowname) {
newwin =
window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
}
function Help() {
newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
// end hiding -->
</script>
<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
<style type="text/css">
.catalogue {
background-color:#ad11ad;
color:#FFFFFF;
background-image:none;
text-decoration: normal;
}
a.catalogue:hover {
background-color: #ad11ad;
color: #FFFFFF;
text-decoration: none;
}
</style>
</head>
<body>
<div id="mainbloc">
<h1 class="catalogue">Laboratory Search</h1>
<form name="f" method="post" action="/cgi-bin/koha/plugin_launcher.pl">
<div class="bloc25">
<h2 class="catalogue">Search on</h2>
<p>
<input type="hidden" name="plugin_name" value="labs_theses.pl">
<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->">
<input type="hidden" name="result" value="unimarc field 328 <!--TMPL_VAR Name="index" -->">
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="cat_auth" value="<!--TMPL_VAR Name="cat_auth" -->" >
<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
<input type="submit" value="Start search" class="button catalogue">
</p>
</div>
</form>
<!-- TMPL_IF Name="resultlist" -->
<div class="bloc25">
<h2 class="catalogue">Laboratory Search results</h2>
<div id="resultnumber">
<p class="resultcount">
<!-- TMPL_IF NAME="total" -->
Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.
<!-- /TMPL_IF -->
</p>
</div>
<div id="resultlist">
<table>
<tr>
<th class="catalogue">Laboratory</th>
<th class="catalogue">Select</th>
</tr>
<!-- TMPL_LOOP NAME="catresult" -->
<!-- TMPL_IF NAME="even" -->
<tr class="hilighted">
<!-- TMPL_ELSE -->
<tr>
<!-- /TMPL_IF -->
<td>
<!-- TMPL_VAR NAME="lib" -->
</td>
<td>
<a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL" -->,0)" class="button catalogue">Select</a>
<a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL" -->,1)" class="button catalogue">Sel&amp;close</a>
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
<div id="resultnumber">
<p><!-- TMPL_IF NAME="displayprev" -->
<a class="resultnumber" href="/cgi-bin/koha/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF NAME="highlight" -->
<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
<!-- TMPL_ELSE -->
<a class="resultnumber" href="/cgi-bin/koha/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="displaynext" -->
<a class="resultnumber" href="/cgi-bin/koha/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
<!-- /TMPL_IF -->
</p>
<p class="resultcount">
<!-- TMPL_IF NAME="total" -->
Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.
<!-- /TMPL_IF -->
</p>
</div>
<script language="JavaScript" type="text/javascript">
function SelectEntry(myentry, mycode, myindex, wclose){
if (opener.document.f.field_value[myindex].value!=""){
opener.document.f.field_value[myindex].value=opener.document.f.field_value[myindex].value+"|"+myentry
} else {
opener.document.f.field_value[myindex].value=myentry
}
if (wclose == 1) {
// alert("closing")
self.close();
}
}
</script>
</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>

27
koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl
View File

@ -160,9 +160,16 @@
<!-- TMPL_IF name="f5m" -->
<option value="m"
SELECTED>fiction ou vulg adulte</option>
<!-- TMPL_ELSE -->
<option value="m">fiction ou vulg adulte</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f5u" -->
<option value="u"
SELECTED>inconnu</option>
<!-- TMPL_ELSE -->
<option value="m">inconnu</option>
<option value="u">inconnu</option>
<!-- /TMPL_IF -->
</select>
</td>
@ -214,9 +221,16 @@
<!-- TMPL_IF name="f6m" -->
<option value="m"
SELECTED>fiction ou vulg adulte</option>
<!-- TMPL_ELSE -->
<option value="m">fiction ou vulg adulte</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f6u" -->
<option value="u"
SELECTED>inconnu</option>
<!-- TMPL_ELSE -->
<option value="m">inconnu</option>
<option value="u">inconnu</option>
<!-- /TMPL_IF -->
</select>
</td>
@ -268,9 +282,16 @@
<!-- TMPL_IF name="f7m" -->
<option value="m"
SELECTED>fiction ou vulg adulte</option>
<!-- TMPL_ELSE -->
<option value="m">fiction ou vulg adulte</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f7u" -->
<option value="u"
SELECTED>inconnu</option>
<!-- TMPL_ELSE -->
<option value="m">inconnu</option>
<option value="u">inconnu</option>
<!-- /TMPL_IF -->
</select>
</td>

6
koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
View File

@ -32,7 +32,7 @@
<div id="resultnumber">
<p>
<!-- TMPL_IF name="displayprev" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<a href="plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
</a>
<!-- /TMPL_IF -->
@ -40,12 +40,12 @@
<!-- TMPL_IF name="highlight" -->
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
<!-- TMPL_ELSE -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<a href="plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<a href="plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=EDITORS&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
<!-- /TMPL_IF -->
</p>

7
members/deletemem.pl
View File

@ -55,32 +55,29 @@ foreach (sort keys %$issues) {
$i++;
}
my ($bor,$flags)=getpatroninformation(\%env, $member,'');
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
unless ($userenv->{flags} == 1){
unless ($userenv->{'branch'} eq $bor->{'branchcode'}){
warn "user ".$userenv->{'branch'} ."borrower :". $bor->{'branchcode'};
# warn "user ".$userenv->{'branch'} ."borrower :". $bor->{'branchcode'};
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
exit 1;
}
}
}
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Select * from borrowers where guarantor=?");
$sth->execute($member);
my $data=$sth->fetchrow_hashref;
$sth->finish;
if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "members/deletemem.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {circulate => 1},
flagsrequired => {borrower => 1},
debug => 1,
});
# print $input->header;

4
members/imemberentry.pl
View File

@ -26,11 +26,11 @@ use strict;
use C4::Auth;
use C4::Output;
use CGI;
use C4::Search;
use C4::Members;
use C4::Interface::CGI::Output;
use C4::Koha;
use HTML::Template;
use C4::Members;
use C4::Search;
use C4::Date;
my $input = new CGI;

22
members/memberentry.pl
View File

@ -111,7 +111,7 @@ if ($op eq 'add' or $op eq 'modify') {
}
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
if ($userenv->{flags} == 1){
if ($userenv->{flags} != 1){
unless ($userenv->{branch} eq $data{'branchcode'}){
push @errors, "ERROR_branch";
$nok=1;
@ -171,7 +171,8 @@ if ($delete){
} else {
$template->param( updtype => 'M');
}
my $cardnumber=C4::Members::fixup_cardnumber($data->{'cardnumber'});
my $cardnumber=$data->{'cardnumber'};
$cardnumber=fixup_cardnumber($data->{'cardnumber'}) if $actionType eq 'Add';
if ($data->{'sex'} eq 'F'){
$template->param(female => 1);
}
@ -241,21 +242,14 @@ if ($delete){
my $branches=getbranches();
my $default;
foreach my $branch (keys %$branches) {
if (C4::Context->preference("IndependantBranches")) {
my $userenv = C4::Context->userenv;
if ($userenv->{flags} == 1){
push @select_branch, $branch;
$select_branches{$branch} = $branches->{$branch}->{'branchname'};
$default = $data->{'branchcode'};
} else {
push @select_branch, $branch if ($branch eq $userenv->{branch});
$select_branches{$branch} = $branches->{$branch}->{'branchname'} if ($branch eq $userenv->{branch});
$default = $userenv->{branch};
}
} else {
if ((not C4::Context->preference("IndependantBranches")) || (C4::Context->userenv->{'flags'} == 1)) {
push @select_branch, $branch;
$select_branches{$branch} = $branches->{$branch}->{'branchname'};
$default = $data->{'branchcode'};
} else {
push @select_branch, $branch if ($branch eq C4::Context->userenv->{'branch'});
$select_branches{$branch} = $branches->{$branch}->{'branchname'} if ($branch eq C4::Context->userenv->{'branch'});
$default = C4::Context->userenv->{'branch'};
}
}

13
members/moremember.pl
View File

@ -128,6 +128,9 @@ if ($data->{'categorycode'} ne 'C'){
}
}
#Independant branches management
my $unvalidlibrarian = ((C4::Context->preference("IndependantBranches")) && (C4::Context->userenv->{flags}!=1) && ($data->{'branchcode'} ne C4::Context->userenv->{branch}));
my %bor;
$bor{'borrowernumber'}=$bornum;
@ -174,8 +177,7 @@ for (my $i=0;$i<$count;$i++){
# return the correct item type either (or a properly-formatted
# charge, for that matter).
my ($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
my $itemtypedef = getitemtypeinfo($itemtype);
$row{'itemtype'}=$itemtypedef->{description};
$row{'itemtype'}=&ItemType($itemtype);
$row{'charge'}= sprintf("%.2f",$charge);
#check item is not reserved
@ -226,10 +228,7 @@ $template->param(
totalprice =>$totalprice,
totaldue =>$total,
issueloop => \@issuedata,
reserveloop => \@reservedata,
alertloop => $alerts);
independantbranches => C4::Context->preference("IndependantBranches"),
samebranch => C4::Context->preference("IndependantBranches"?"":$samebranch,
);
unvalidlibrarian => $unvalidlibrarian,
reserveloop => \@reservedata);
output_html_with_http_headers $input, $cookie, $template->output;

2
opac/opac-ISBDdetail.pl
View File

@ -114,7 +114,7 @@ my $res;
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$2\{$1$tagsubf$2\}/g;
$calculated =~ s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
}
# field builded, store the result
if ($calculated && !$hasputtextbefore) { # put textbefore if not done

2
opac/opac-MARCdetail.pl
View File

@ -168,6 +168,8 @@ foreach my $field (@fields) {
push(@big_array, \%this_row);
}
}
my ($holdingbrtagf,$holdingbrtagsubf) = &MARCfind_marc_from_kohafield($dbh,"items.holdingbranch",$itemtype);
@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
#fill big_row with missing datas
foreach my $subfield_code (keys(%witness)) {
for (my $i=0;$i<=$#big_array;$i++) {

9
opac/opac-basket.pl
View File

@ -33,7 +33,7 @@ foreach my $biblionumber (@bibs) {
$template->param(biblionumber => $biblionumber);
my $dat = &bibdata($biblionumber);
my ($authorcount, $addauthor) = &getaddauthor($biblionumber);
my ($authorcount, $addauthor) = &addauthor($biblionumber);
my @items = &ItemInfo(undef, $biblionumber, 'opac');
$dat->{'additional'}=$addauthor->[0]->{'author'};
@ -46,6 +46,13 @@ foreach my $biblionumber (@bibs) {
$num++;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
if (C4::Context->preference("BiblioDefaultView") eq "normal") {
$dat->{dest} = "opac-detail.pl";
} elsif (C4::Context->preference("BiblioDefaultView") eq "marc") {
$dat->{dest} ="opac-MARCdetail.pl";
} else {
$dat->{dest} = "opac-ISBDdetail.pl";
}
push (@results, $dat);
}

6
opac/opac-main.pl
View File

@ -43,16 +43,20 @@ my @options;
my $counter=0;
foreach my $language (getalllanguages()) {
next if $language eq 'images';
next if $language eq 'CVS';
my $selected='0';
# next if $currently_selected_languages->{$language};
push @options, { language => $language, counter => $counter };
$counter++;
}
my $languages_count = @options;
if($languages_count > 1){
$template->param(languages => \@options);
}
$template->param(CGIitemtype => $CGIitemtype,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
languages => \@options,
textmessaging => $borrower->{textmessaging},
opaclargeimage => C4::Context->preference("opaclargeimage"),
kohaversion => $kohaVersion

26
opac/opac-search.pl
View File

@ -97,8 +97,16 @@ if ($op eq "do_search") {
}
$resultsperpage= $query->param('resultsperpage');
$resultsperpage = 19 if(!defined $resultsperpage);
my $orderby = $query->param('orderby');
my $desc_or_asc = $query->param('desc_or_asc');
my $exactsearch = $query->param('exact');
if ($exactsearch) {
warn "EXACT";
foreach (@operator) {
$_='=';
}
}
# builds tag and subfield arrays
my @tags;
@ -152,14 +160,14 @@ if ($op eq "do_search") {
}
my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
\@excluding, \@operator, \@value,
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring, $extratables);
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
if ($total ==1) {
if (C4::Context->preference("BiblioDefaultView") eq "normal") {
print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
} elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
} elsif (C4::Context->preference("BiblioDefaultView") eq "marc") {
print $query->redirect("/cgi-bin/koha/opac-MARCdetail.pl?bib=".@$results[0]->{biblionumber});
} else {
print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
print $query->redirect("/cgi-bin/koha/opac-ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
}
exit;
}
@ -353,13 +361,6 @@ $template->param( phraseorterm => $phraseorterm );
$defaultview => 1,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
itemtypelist => $itemtypelist,
subcategorylist => $subcategorylist,
brancheslist => $brancheslist,
categorylist => $categorylist,
mediatypelist => $mediatypelist,
itemtypesstring => $itemtypesstring,
avail => $avail,
);
} else {
@ -406,7 +407,8 @@ $template->param( phraseorterm => $phraseorterm );
-multiple => 0 );
$sth->finish;
$template->param(itemtypelist => $itemtypelist,
$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary")) if (C4::Context->preference("Disable_Dictionary"));
$template->param(classlist => $classlist,
CGIitemtype => $CGIitemtype,
CGIbranch => $CGIbranch,
suggestion => C4::Context->preference("suggestion"),

78
opac/opac-sendbasket.pl
View File

@ -5,7 +5,8 @@ use CGI;
use Mail::Sendmail;
use MIME::QuotedPrint;
use MIME::Base64;
use C4::Context;
use C4::Search;
use C4::Biblio;
use C4::Auth;
use C4::Interface::CGI::Output;
@ -51,7 +52,7 @@ if ($email_add) {
$template2->param(biblionumber => $biblionumber);
my $dat = &bibdata($biblionumber);
my ($authorcount, $addauthor) = &getaddauthor($biblionumber);
my ($authorcount, $addauthor) = &addauthor($biblionumber);
my @items = &ItemInfo(undef, $biblionumber, 'opac');
$dat->{'additional'}=$addauthor->[0]->{'author'};
@ -69,8 +70,14 @@ if ($email_add) {
push (@results, $dat);
}
# Getting template result
my $template_res = $template2->output();
my $resultsarray=\@results;
$template2->param(BIBLIO_RESULTS => $resultsarray,
email_sender => $email_sender);
# Getting template result
my $template_res = $template2->output();
my $body;
# Analysing information and getting mail properties
if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
else { $mail{'subject'} = "no subject"; }
@ -81,7 +88,7 @@ if ($email_add) {
my $email_file = "basket.txt";
if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $body = $1; }
my $boundary = "====" . time() . "====";
# $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
@ -93,77 +100,34 @@ if ($email_add) {
# # Writing mail
# $mail{body} =
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
my $message = encode_qp( "" );
# $file = $^X; # This is the perl executable
#
# open (F, $file) or die "Cannot read $file: $!";
# binmode F; undef $/;
$mail{body} = encode_base64($iso2709);
# close F;
$boundary = '--'.$boundary;
$mail{body} = <<END_OF_BODY;
my $isofile = encode_base64($iso2709);
$boundary = '--'.$boundary;
$mail{body} =
<<END_OF_BODY;
$boundary
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
$message
$body
$boundary
Content-Type: application/octet-stream; name="basket"
Content-Type: application/octet-stream; name="basket.iso2709"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="basket"
Content-Disposition: attachment; filename="basket.iso2709"
$mail{body}
$isofile
$boundary--
END_OF_BODY
<<END_OF_BODY;
$boundary
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
$email_header
$mail{'body'}
$boundary--
END_OF_BODY
$mail{attachment} = $iso2709;
# $mail{body} = <<END_OF_BODY;
#$boundary
#Content-Type: text/plain; charset="iso-8859-1"
#Content-Transfer-Encoding: quoted-printable
#
#$email_header
#
#$boundary
#Content-Type: text/plain; name="$email_file"
#Content-Transfer-Encoding: quoted-printable
#Content-Disposition: attachment; filename="$email_file"
#
#$mail{'body'}
#
#$boundary--
#END_OF_BODY
# Sending mail
if (sendmail %mail) {
# do something if it works....
# warn " ".$mail{body};
# warn " ".$mail{PJ};
$template->param(SENT => "1");
$template->param(email_add => $email_add);
} else {
# do something if it doesnt work....
warn "Error sending mail: $Mail::Sendmail::error \n";
}
output_html_with_http_headers $query, $cookie, $template->output;
output_html_with_http_headers $query, $cookie, $template->output;
}
else {
$template->param(bib_list => $bib_list);

4
opac/opac-user.pl
View File

@ -31,6 +31,10 @@ $borr->{'expiry'} = format_date($borr->{'expiry'});
$borr->{'dateofbirth'} = format_date($borr->{'dateofbirth'});
$borr->{'ethnicity'} = fixEthnicity($borr->{'ethnicity'});
if($borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'}){
$borr->{'flagged'} =1;
}
if ($borr->{'amountoutstanding'} > 5) {
$borr->{'amountoverfive'} = 1;
}

418
reports/acquisitions_stats.pl
View File

@ -307,6 +307,79 @@ sub calculate {
$colfilter[0] = @$filters[9] if ($column =~ /sort1/ ) ;
$colfilter[0] = @$filters[10] if ($column =~ /sort2/ ) ;
#warn "filtre col ".$colfilter[0]." ".$colfilter[1];
# 1st, loop rows.
my $linefield;
my $lineorder;
if (($line =~/closedate/) and ($podsp == 1)) {
#Display by day
$linefield .="dayname($line)";
$lineorder .="weekday($line)";
} elsif (($line=~/closedate/) and ($podsp == 2)) {
#Display by Month
$linefield .="monthname($line)";
$lineorder .="month($line)";
} elsif (($line=~/closedate/) and ($podsp == 3)) {
#Display by Year
$linefield .="Year($line)";
$lineorder .=$linefield;
} elsif (($line =~/received/) and ($rodsp == 1)) {
#Display by day
$linefield .="dayname($line)";
$lineorder .="weekday($line)";
} elsif (($line=~/received/) and ($rodsp == 2)) {
#Display by Month
$linefield .="monthname($line)";
$lineorder .="month($line)";
} elsif (($line=~/received/) and ($rodsp == 3)) {
#Display by Year
$linefield .="Year($line)";
$lineorder .=$linefield;
} else {
$linefield .= $line;
$lineorder .=$linefield;
}
my $strsth;
$strsth .= "select distinctrow $linefield from aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) and $line is not null ";
if ( @linefilter ) {
if ($linefilter[1]){
if ($linefilter[0]){
$strsth .= " and $line between ? and ? " ;
} else {
$strsth .= " and $line < ? " ;
}
} elsif (($linefilter[0]) and (($line=~/closedate/) or ($line=~/received/))){
$strsth .= " and $line > ? " ;
} elsif ($linefilter[0]) {
$linefilter[0] =~ s/\*/%/g;
$strsth .= " and $line LIKE ? " ;
}
}
$strsth .=" group by $linefield";
$strsth .=" order by $lineorder";
warn "". $strsth;
my $sth = $dbh->prepare( $strsth );
if (( @linefilter ) and ($linefilter[1])){
$sth->execute("'".$linefilter[0]."'","'".$linefilter[1]."'");
} elsif ($linefilter[0]) {
$sth->execute($linefilter[0]);
} else {
$sth->execute;
}
while ( my ($celvalue) = $sth->fetchrow) {
my %cell;
if ($celvalue) {
$cell{rowtitle} = $celvalue;
# } else {
# $cell{rowtitle} = "";
}
$cell{totalrow} = 0;
push @loopline, \%cell;
}
warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
@ -395,197 +468,176 @@ warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
# 2nd, loop cols.
my $colfield;
if (($column =~/closedate/) and ($podsp == 1)) {
#Display by day
$colfield .="dayname($column)";
} elsif (($column=~/closedate/) and ($podsp == 2)) {
#Display by Month
$colfield .="monthname($column)";
} elsif (($column=~/closedate/) and ($podsp == 3)) {
#Display by Year
$colfield .="Year($column)";
my $colfield;
my $colorder;
if (($column =~/closedate/) and ($podsp == 1)) {
#Display by day
$colfield .="dayname($column)";
$colorder .="weekday($column)";
} elsif (($column=~/closedate/) and ($podsp == 2)) {
#Display by Month
$colfield .="monthname($column)";
$colorder .="month($column)";
} elsif (($column=~/closedate/) and ($podsp == 3)) {
#Display by Year
$colfield .="Year($column)";
$colorder .= $colfield;
} elsif (($column =~/received/) and ($rodsp == 1)) {
#Display by day
$colfield .="dayname($column)";
$colorder .="weekday($column)";
} elsif (($column=~/received/) and ($rodsp == 2)) {
#Display by Month
$colfield .="monthname($column)";
$colorder .="month($column)";
} elsif (($column=~/received/) and ($rodsp == 3)) {
#Display by Year
$colfield .="Year($column)";
$colorder .= $colfield;
} else {
$colfield .= $column;
$colorder .= $colfield;
}
my $strsth2;
$strsth2 .= "select distinctrow $colfield from aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) and $column is not null ";
if ( @colfilter ) {
if ($colfilter[1]){
if ($colfilter[0]){
$strsth2 .= " and $column between ? and ? " ;
} else {
$strsth2 .= " and $column < ? " ;
}
} elsif (($colfilter[0]) and (($column=~/closedate/) or ($column=~/received/))){
$strsth2 .= " and $column > ? " ;
} elsif ($colfilter[0]) {
$colfilter[0] =~ s/\*/%/g;
$strsth2 .= " and $column LIKE ? " ;
}
}
$strsth2 .=" group by $colfield";
$strsth2 .=" order by $colorder";
warn "". $strsth2;
my $sth2 = $dbh->prepare( $strsth2 );
if (( @colfilter ) and ($colfilter[1])){
warn "from : ".$colfilter[0]." To :".$colfilter[1];
$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
} elsif ($colfilter[0]) {
$sth2->execute($colfilter[0]);
} else {
$sth2->execute;
}
} elsif (($column =~/deliverydate/) and ($rodsp == 1)) {
#Display by day
$colfield .="dayname($column)";
} elsif (($column=~/deliverydate/) and ($rodsp == 2)) {
#Display by Month
$colfield .="monthname($column)";
} elsif (($column=~/deliverydate/) and ($rodsp == 3)) {
#Display by Year
$colfield .="Year($column)";
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
if ($celvalue){
# warn "coltitle :".$celvalue;
$cell{coltitle} = $celvalue;
}
push @loopcol, \%cell;
}
# warn "fin des titres colonnes";
} elsif (($column =~/dateaccessioned/) and ($aodsp == 1)) {
#Display by day
$colfield .="dayname($column)";
} elsif (($column=~/dateaccessioned/) and ($aodsp == 2)) {
#Display by Month
$colfield .="monthname($column)";
} elsif (($column=~/dateaccessioned/) and ($aodsp == 3)) {
#Display by Year
$colfield .="Year($column)";
} else {
$colfield .= $column;
}
my $strsth2;
$strsth2 .= "SELECT distinctrow $colfield FROM aqorders, aqbasket,aqorderbreakdown
LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id)
WHERE (aqorders.basketno=aqbasket.basketno) AND (aqorderbreakdown.ordernumber=aqorders.ordernumber)
AND $column IS NOT NULL";
if ( @colfilter ) {
if ($colfilter[1]){
if ($colfilter[0]){
$strsth2 .= " AND $column BETWEEN ? AND ? " ;
} else {
$strsth2 .= " AND $column < ? " ;
}
} elsif (($colfilter[0]) and (($column=~/closedate/) or ($line=~/received/) or ($line=~/acquired/))){
$strsth2 .= " AND $column > ? " ;
} elsif ($colfilter[0]) {
$colfilter[0] =~ s/\*/%/g;
$strsth2 .= " AND $column LIKE ? " ;
}
}
$strsth2 .=" GROUP BY $colfield";
$strsth2 .=" ORDER BY $colfield";
# warn "MASON:. $strsth2";
my $sth2 = $dbh->prepare( $strsth2 );
if (( @colfilter ) and ($colfilter[1])){
# warn "from : ".$colfilter[0]." To :".$colfilter[1];
$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
} elsif ($colfilter[0]) {
$sth2->execute($colfilter[0]);
} else {
$sth2->execute;
}
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
if ($celvalue){
# warn "coltitle :".$celvalue;
$cell{coltitle} = $celvalue;
}
push @loopcol, \%cell;
}
# warn "fin des titres colonnes";
my $i=0;
my @totalcol;
my $hilighted=-1;
#Initialization of cell values.....
my %table;
# warn "init table";
foreach my $row ( @loopline ) {
foreach my $col ( @loopcol ) {
# warn " init table : $row->{rowtitle} / $col->{coltitle} ";
$table{$row->{rowtitle}}->{$col->{coltitle}}=0;
}
$table{$row->{rowtitle}}->{totalrow}=0;
}
my $i=0;
my @totalcol;
my $hilighted=-1;
#Initialization of cell values.....
my %table;
# warn "init table";
foreach my $row ( @loopline ) {
foreach my $col ( @loopcol ) {
# warn " init table : $row->{rowtitle} / $col->{coltitle} ";
$table{$row->{rowtitle}}->{$col->{coltitle}}=0;
}
$table{$row->{rowtitle}}->{totalrow}=0;
}
# preparing calculation
my $strcalc ;
$strcalc .= "SELECT $linefield, $colfield, ";
$strcalc .= "COUNT( aqorders.ordernumber ) " if ($process ==1);
$strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) " if ($process ==2);
$strcalc .= "FROM aqorders, aqbasket,aqorderbreakdown
LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
my $strcalc ;
$strcalc .= "SELECT $linefield, $colfield, ";
$strcalc .= "COUNT( aqorders.ordernumber ) " if ($process ==1);
$strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) " if ($process ==2);
$strcalc .= "FROM aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
@$filters[0]=~ s/\*/%/g if (@$filters[0]);
$strcalc .= " AND aqbasket.closedate > '" . @$filters[0] ."'" if ( @$filters[0] );
@$filters[1]=~ s/\*/%/g if (@$filters[1]);
$strcalc .= " AND aqbasket.closedate < '" . @$filters[1] ."'" if ( @$filters[1] );
@$filters[2]=~ s/\*/%/g if (@$filters[2]);
$strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] ."'" if ( @$filters[2] );
@$filters[3]=~ s/\*/%/g if (@$filters[3]);
$strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] ."'" if ( @$filters[3] );
@$filters[4]=~ s/\*/%/g if (@$filters[4]);
$strcalc .= " AND aqbasket.closedate > '" . @$filters[4] ."'" if ( @$filters[4] );
@$filters[5]=~ s/\*/%/g if (@$filters[5]);
$strcalc .= " AND aqbasket.closedate < '" . @$filters[5] ."'" if ( @$filters[5] );
@$filters[6]=~ s/\*/%/g if (@$filters[6]);
$strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[6] ."'" if ( @$filters[6] );
@$filters[7]=~ s/\*/%/g if (@$filters[7]);
$strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[7] ."'" if ( @$filters[7] );
@$filters[8]=~ s/\*/%/g if (@$filters[8]);
$strcalc .= " AND aqbookfund.bookfundid LIKE '" . @$filters[8] ."'" if ( @$filters[8] );
@$filters[9]=~ s/\*/%/g if (@$filters[9]);
$strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[9] ."'" if ( @$filters[9] );
@$filters[10]=~ s/\*/%/g if (@$filters[10]);
$strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[10] ."'" if ( @$filters[10] );
$strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield";
# warn "/n/n". $strcalc;
my $dbcalc = $dbh->prepare($strcalc);
$dbcalc->execute;
@$filters[0]=~ s/\*/%/g if (@$filters[0]);
$strcalc .= " AND aqbasket.closedate > '" . @$filters[0] ."'" if ( @$filters[0] );
@$filters[1]=~ s/\*/%/g if (@$filters[1]);
$strcalc .= " AND aqbasket.closedate < '" . @$filters[1] ."'" if ( @$filters[1] );
@$filters[2]=~ s/\*/%/g if (@$filters[2]);
$strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] ."'" if ( @$filters[2] );
@$filters[3]=~ s/\*/%/g if (@$filters[3]);
$strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] ."'" if ( @$filters[3] );
@$filters[4]=~ s/\*/%/g if (@$filters[4]);
$strcalc .= " AND aqbooksellers.name like '" . @$filters[4] ."'" if ( @$filters[4] );
@$filters[5]=~ s/\*/%/g if (@$filters[5]);
$strcalc .= " AND aqbookfund.bookfundid like '" . @$filters[5] ."'" if ( @$filters[5] );
@$filters[6]=~ s/\*/%/g if (@$filters[6]);
$strcalc .= " AND aqorders.sort1 like '" . @$filters[6] ."'" if ( @$filters[6] );
@$filters[7]=~ s/\*/%/g if (@$filters[7]);
$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
warn "". $strcalc;
my $dbcalc = $dbh->prepare($strcalc);
$dbcalc->execute;
# warn "filling table";
my $emptycol;
while (my ($row, $col, $value) = $dbcalc->fetchrow) {
# warn "filling table $row / $col / $value ";
$emptycol = 1 if ($col eq undef);
$col = "zzEMPTY" if ($col eq undef);
$row = "zzEMPTY" if ($row eq undef);
# warn "filling table";
my $emptycol;
while (my ($row, $col, $value) = $dbcalc->fetchrow) {
# warn "filling table $row / $col / $value ";
$emptycol = 1 if ($col eq undef);
$col = "zzEMPTY" if ($col eq undef);
$row = "zzEMPTY" if ($row eq undef);
$table{$row}->{$col}+=$value;
$table{$row}->{totalrow}+=$value;
$grantotal += $value;
}
$table{$row}->{$col}+=$value;
$table{$row}->{totalrow}+=$value;
$grantotal += $value;
}
push @loopcol,{coltitle => "NULL"} if ($emptycol);
foreach my $row ( sort keys %table ) {
my @loopcell;
#@loopcol ensures the order for columns is common with column titles
# and the number matches the number of columns
foreach my $col ( @loopcol ) {
my $value =$table{$row}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
push @loopcell, {value => $value } ;
}
push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
'loopcell' => \@loopcell,
'hilighted' => ($hilighted >0),
'totalrow' => $table{$row}->{totalrow}
};
$hilighted = -$hilighted;
}
# warn "footer processing";
foreach my $col ( @loopcol ) {
my $total=0;
foreach my $row ( @looprow ) {
$total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
# warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
}
# warn "summ for column ".$col->{coltitle}." = ".$total;
push @loopfooter, {'totalcol' => $total};
}
push @loopcol,{coltitle => "NULL"} if ($emptycol);
foreach my $row ( sort keys %table ) {
my @loopcell;
#@loopcol ensures the order for columns is common with column titles
# and the number matches the number of columns
foreach my $col ( @loopcol ) {
my $value =$table{$row}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
push @loopcell, {value => $value } ;
}
push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
'loopcell' => \@loopcell,
'hilighted' => ($hilighted >0),
'totalrow' => $table{$row}->{totalrow}
};
$hilighted = -$hilighted;
}
# warn "footer processing";
foreach my $col ( @loopcol ) {
my $total=0;
foreach my $row ( @looprow ) {
$total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
# warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
}
# warn "summ for column ".$col->{coltitle}." = ".$total;
push @loopfooter, {'totalcol' => $total};
}
# the header of the table
# $globalline{loopfilter}=\@loopfilter;
# the core of the table
$globalline{looprow} = \@looprow;
$globalline{loopcol} = \@loopcol;
# # the foot (totals by borrower type)
$globalline{loopfooter} = \@loopfooter;
$globalline{total}= $grantotal;
$globalline{line} = $line;
$globalline{column} = $column;
push @mainloop,\%globalline;
return \@mainloop;
# the header of the table
$globalline{loopfilter}=\@loopfilter;
# the core of the table
$globalline{looprow} = \@looprow;
$globalline{loopcol} = \@loopcol;
# # the foot (totals by borrower type)
$globalline{loopfooter} = \@loopfooter;
$globalline{total}= $grantotal;
$globalline{line} = $line;
$globalline{column} = $column;
push @mainloop,\%globalline;
return \@mainloop;
}
1;

35
reports/borrowers_stats.pl
View File

@ -27,6 +27,7 @@ use HTML::Template;
use C4::Search;
use C4::Output;
use C4::Koha;
use C4::Acquisition;
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2;
@ -121,6 +122,22 @@ if ($do_it) {
-size => 1,
-multiple => 0 );
my @branches;
my @select_branch;
my %select_branches;
my ($count2,@branches)=branches();
push @select_branch,"";
$select_branches{''}='';
for (my $i=0;$i<$count2;$i++){
push @select_branch, $branches[$i]->{'branchcode'};#
$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
}
my $CGIbranch=CGI::scrolling_list( -name => 'pickup',
-values => \@select_branch,
-labels => \%select_branches,
-size => 1,
-multiple => 0 );
$req = $dbh->prepare( "select distinctrow sort1 from borrowers order by sort1");
$req->execute;
my @select_sort1;
@ -180,7 +197,8 @@ if ($do_it) {
CGISort2 => $CGIsort2,
hassort2 => $hassort2,
CGIextChoice => $CGIextChoice,
CGIsepChoice => $CGIsepChoice
CGIsepChoice => $CGIsepChoice,
CGIBranch => $CGIbranch
);
}
@ -209,14 +227,16 @@ sub calculate {
$linefilter = @$filters[0] if ($line =~ /categorycode/ ) ;
$linefilter = @$filters[1] if ($line =~ /zipcode/ ) ;
$linefilter = @$filters[2] if ($line =~ /sort1/ ) ;
$linefilter = @$filters[3] if ($line =~ /sort2/ ) ;
$linefilter = @$filters[2] if ($line =~ /branccode/ ) ;
$linefilter = @$filters[3] if ($line =~ /sort1/ ) ;
$linefilter = @$filters[4] if ($line =~ /sort2/ ) ;
#
my $colfilter = "";
$colfilter = @$filters[0] if ($column =~ /categorycode/);
$colfilter = @$filters[1] if ($column =~ /zipcode/);
$colfilter = @$filters[2] if ($column =~ /sort1/);
$colfilter = @$filters[3] if ($column =~ /sort2/);
$colfilter = @$filters[2] if ($column =~ /branchcode/);
$colfilter = @$filters[3] if ($column =~ /sort1/);
$colfilter = @$filters[4] if ($column =~ /sort2/);
my @loopfilter;
for (my $i=0;$i<=3;$i++) {
@ -225,8 +245,9 @@ sub calculate {
$cell{filter} .= @$filters[$i];
$cell{crit} .="Cat Code " if ($i==0);
$cell{crit} .="Zip Code" if ($i==1);
$cell{crit} .="Sort1" if ($i==2);
$cell{crit} .="Sort2" if ($i==3);
$cell{crit} .="Branchcode" if ($i==2);
$cell{crit} .="Sort1" if ($i==3);
$cell{crit} .="Sort2" if ($i==4);
push @loopfilter, \%cell;
}
}

16
reports/catalogue_stats.pl
View File

@ -220,7 +220,7 @@ if ($do_it) {
$req->execute;
undef @select;
push @select,"";
my $CGIholdingbranch=CGI::scrolling_list( -name => 'Filter',
my $CGIlocation=CGI::scrolling_list( -name => 'Filter',
-id => 'holdingbranch',
-values => \@select,
-size => 1,
@ -332,8 +332,8 @@ sub calculate {
$linefilter[0] = @$filters[7] if ($line =~ /publishercode/ ) ;
$linefilter[0] = @$filters[8] if ($line =~ /publicationyear/ ) ;
$linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
$linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
$linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ;
@linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
@linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ;
#
my @colfilter ;
$colfilter[0] = @$filters[0] if ($column =~ /dewey/ ) ;
@ -346,8 +346,8 @@ sub calculate {
$colfilter[0] = @$filters[7] if ($column =~ /publishercode/ ) ;
$colfilter[0] = @$filters[8] if ($column =~ /publicationyear/ ) ;
$colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
$colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
$colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ;
@colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
@colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ;
# 1st, loop rows.
my $linefield;
@ -506,7 +506,11 @@ sub calculate {
}
if (@$filters[11]){
@$filters[11]=~ s/\*/%/g;
$strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
if ($cond){
$strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
} else {
$strcalc .= " WHERE items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
}
}
$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";

8
reports/issues_by_borrower_category.plugin
View File

@ -100,13 +100,15 @@ sub calculate {
$itemtypes{$itemtype}->{total} = 0;
}
# now, parse each category. Before filling the result array, fill it with 0 to have every itemtype column.
my $sth = $dbh->prepare("SELECT itemtype, count( * )
my $strsth="SELECT itemtype, count( * )
FROM issues, borrowers, biblioitems, items
WHERE issues.borrowernumber = borrowers.borrowernumber
AND items.itemnumber = issues.itemnumber
AND biblioitems.biblionumber = items.biblionumber
AND borrowers.categorycode = ?
GROUP BY biblioitems.itemtype");
AND borrowers.categorycode = ?";
$strsth.= " AND borrowers.branchcode = ".$dbh->quote($branch) if ($branch);
$strsth .= " GROUP BY biblioitems.itemtype";
my $sth = $dbh->prepare($strsth);
my $sthcategories = $dbh->prepare("select categorycode,description from categories");
$sthcategories->execute;
my %borrowertype;

5
reports/issues_stats.pl
View File

@ -453,10 +453,13 @@ sub calculate {
$strcalc .= "(COUNT(DISTINCT borrowers.borrowernumber))" ;
}
if ($process ==3){
$strcalc .= "(COUNT(DISTINCT itemnumber))" ;
}
if ($process ==4){
my $rqbookcount = $dbh->prepare("SELECT count(*) FROM items");
$rqbookcount->execute;
my ($bookcount) = $rqbookcount->fetchrow;
$strcalc .= "100*(COUNT(itemnumber))/ $bookcount " ;
$strcalc .= "100*(COUNT(DISTINCT itemnumber))/ $bookcount " ;
}
$strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) ";

5
search.marc/search.pl
View File

@ -24,7 +24,7 @@ use CGI;
use C4::Auth;
use HTML::Template;
use C4::Context;
use C4::Search;
# use C4::Search;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
@ -92,7 +92,7 @@ sub create_scrolling_list {
my $query=new CGI;
my $type=$query->param('type');
my $op = $query->param('op');
my $op = $query->param('op') || "";
my $dbh = C4::Context->dbh;
my $startfrom=$query->param('startfrom');
@ -364,6 +364,7 @@ else {
$sth->finish;
$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary")) if (C4::Context->preference("Disable_Dictionary"));
$template->param("statements" => \@statements,
"nbstatements" => 3,
CGIitemtype => $CGIitemtype,

128
updater/updatedatabase
View File

@ -155,6 +155,120 @@ my %tabledata = (
explanation => 'If Yes, Returndate on issuing can\'t be after borrower card expiry',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'opacstylesheet',
value => '',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Enter a complete URL to use an alternate stylesheet in OPAC',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'opacsmallimage',
value => '',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'opaclargeimage',
value => '',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'delimiter',
value => ';',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'separator for reports exported to spreadsheet',
type => 'free',
},
{
uniquefieldrequired => 'variable',
variable => 'MIME',
value => 'OPENOFFICE.ORG',
forceupdate => { 'explanation' => 1,
'type' => 1,
'options' => 1},
explanation => 'Define the default application for report exportations into files',
type => 'Choice',
options => 'EXCEL|OPENOFFICE.ORG'
},
{
uniquefieldrequired => 'variable',
variable => 'Delimiter',
value => ';',
forceupdate => { 'explanation' => 1,
'type' => 1,
'options' => 1},
explanation => 'Define the default separator character for report exportations into files',
type => 'Choice',
options => ';|tabulation|,|/|\|#'
},
{
uniquefieldrequired => 'variable',
variable => 'SubscriptionHistory',
value => ';',
forceupdate => { 'explanation' => 1,
'type' => 1,
'options' => 1},
explanation => 'Define the information level for serials history in OPAC',
type => 'Choice',
options => 'simplified|full'
},
{
uniquefieldrequired => 'variable',
variable => 'hidelostitems',
value => 'No',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'show or hide "lost" items in OPAC.',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'IndependantBranches',
value => '0',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Turn Branch independancy management On an Off',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'ReturnBeforeExpiry',
value => '0',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'If Yes, Returndate on issuing can\'t be after borrower card expiry',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'Disable_Dictionary',
value => '0',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'Disables Dictionary buttons if set to yes',
type => 'YesNo',
},
{
uniquefieldrequired => 'variable',
variable => 'hide_marc',
value => '0',
forceupdate => { 'explanation' => 1,
'type' => 1},
explanation => 'hide marc specific datas like subfield code & indicators to library',
type => 'YesNo',
},
],
);
@ -268,6 +382,7 @@ foreach $table ( keys %fielddefinitions ) {
{
$definitions->{$column}->{type} = $type;
$definitions->{$column}->{null} = $null;
$definitions->{$column}->{null} = 'NULL' if $null eq 'YES';
$definitions->{$column}->{key} = $key;
$definitions->{$column}->{default} = $default;
$definitions->{$column}->{extra} = $extra;
@ -280,16 +395,16 @@ foreach $table ( keys %fielddefinitions ) {
# $null = 'YES' if $row->{null} eq 'NULL';
my $key = $row->{key};
my $default = $row->{default};
$default="''" unless $default;
my $null = $row->{null};
# $default="''" unless $default;
my $extra = $row->{extra};
my $def = $definitions->{$field};
unless ( $type eq $def->{type}
&& $null eq $def->{null}
&& $key eq $def->{key}
&& $default eq $def->{default}
&& $extra eq $def->{extra} )
{
if ( $null eq '' ) {
$null = 'NOT NULL';
}
@ -299,6 +414,7 @@ foreach $table ( keys %fielddefinitions ) {
unless ( $extra eq 'auto_increment' ) {
$extra = '';
}
# if it's a new column use "add", if it's an old one, use "change".
my $action;
if ($definitions->{$field}->{type}) {
@ -621,6 +737,12 @@ sub MARCgetitem {
exit;
# $Log$
# Revision 1.123 2005/10/26 09:13:37 tipaul
# big commit, still breaking things...
#
# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
# * code cleaning (cleaning warnings from perl -w) continued
#
# Revision 1.122 2005/09/02 14:18:38 tipaul
# new feature : image for itemtypes.
#

186
value_builder/labs_theses.pl Normal file
View File

@ -0,0 +1,186 @@
#!/usr/bin/perl
# 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 strict;
require Exporter;
use CGI;
use HTML::Template;
use C4::Interface::CGI::Output;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Database;
use C4::Koha;
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}
sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "328".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}
function Blur$function_name(subfield_managed) {
return 1;
}
function Clic$function_name(i) {
defaultvalue=document.f.field_value[i].value;
newin=window.open(\"../plugin_launcher.pl?plugin_name=labs_theses.pl&cat_auth=LABTHE&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 328\",'width=700,height=700,toolbar=false,scrollbars=yes');
}
</script>
";
return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
my %env;
my $dbh=C4::Context->dbh;
my $query = new CGI;
my $op = $query->param('op');
my $cat_auth=$query->param('cat_auth');
my $startfrom=$query->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my ($template, $loggedinuser, $cookie);
my $resultsperpage;
my $search = $query->param('search');
if ($op eq "do_search") {
$resultsperpage= $query->param('resultsperpage');
$resultsperpage = 19 if(!defined $resultsperpage);
# my $upperlimit=$startfrom+$resultsperpage;
# builds tag and subfield arrays
my $strquery = "SELECT authorised_value, lib from authorised_values where category = ? and lib like ?";
# $strquery .= " LIMIT $startfrom,$upperlimit";
warn 'category : '.$cat_auth.' recherche :'.$search;
warn "$strquery";
$search=~s/\*/%/g;
my $sth = $dbh->prepare($strquery);
$sth->execute($cat_auth,$search);
$search=~s/%/\*/g;
my @results;
my $total;
while (my $data = $sth->fetchrow_hashref){
my $libjs=$data->{'lib'};
$libjs=~s#\'#\\\'#g;
my $authjs=$data->{'authorised_value'};
$authjs=~s#\'#\\\'#g;
push @results, {'libjs'=>$libjs,
'lib'=>$data->{'lib'},
'authjs'=>$authjs,
'auth_value'=>$data->{'authorised_value'}}
unless (($total<$startfrom) or ($total>$startfrom+$resultsperpage));
$total++;
}
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "value_builder/labs_theses.tmpl",
query => $query,
type => 'intranet',
authnotrequired => 1,
debug => 1,
});
# multi page display gestion
my $displaynext=0;
my $displayprev=$startfrom;
if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
$displaynext = 1;
}
my @numbers = ();
if ($total>$resultsperpage)
{
for (my $i=1; (($i<$total/$resultsperpage+1) && ($i<16)); $i++)
{
my $highlight=0;
($startfrom==($i-1)) && ($highlight=1);
push @numbers, { number => $i,
highlight => $highlight ,
search=> $search,
startfrom => $resultsperpage*($i-1)};
}
}
my $from = $startfrom+1;
my $to;
if($total < (($startfrom+1)*$resultsperpage))
{
$to = $total;
} else {
$to = (($startfrom+1)*$resultsperpage);
}
$template->param(catresult => \@results,
cat_auth=>$cat_auth,
index => $query->param('index')."",
startfrom=> $startfrom,
displaynext=> $displaynext,
displayprev=> $displayprev,
resultsperpage => $resultsperpage,
startfromnext => $startfrom+$resultsperpage,
startfromprev => $startfrom-$resultsperpage,
search=>$search,
total=>$total,
from=>$from,
to=>$to,
numbers=>\@numbers,
resultlist=>1
);
} else {
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "value_builder/labs_theses.tmpl",
query => $query,
type => "intranet",
authnotrequired => 1,
});
$template->param(
'search'=>$query->param('search'),
);
$template->param(
'index'=>''.$query->param('index')
) if ($query->param('index'));
warn 'index : '.$query->param('index');
$template->param(
'cat_auth'=>$cat_auth
) if ($cat_auth);
}
output_html_with_http_headers $query, $cookie, $template->output ;
}
1;

1
value_builder/unimarc_field_100.pl
View File

@ -79,6 +79,7 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {parameters => 1},
debug => 1,
});
$result=' d u y0frey03 ba' unless $result;
my $f1 = substr($result,0,8);
my $f2 = substr($result,8,1);
my $f3 = substr($result,9,4);

2
value_builder/unimarc_field_210c.pl
View File

@ -107,7 +107,7 @@ function Blur$function_name(subfield_managed) {
function Clic$function_name(subfield_managed) {
defaultvalue=escape(document.forms[0].field_value[subfield_managed].value);
newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=no');
newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
}
</script>
";

11
z3950/z3950-daemon-launch.sh
View File

@ -32,15 +32,20 @@ then
exit 1
fi
#MJR: removed -s option, as we have a #! at the start of z3950-daemon-shell.sh
su -c $KohaZ3950Shell - $RunAsUser &
exit
#--------------
# $Log$
# Revision 1.5 2005/06/20 17:05:17 slef
# Removed -s from su call after Thomas D reports it breaks FreeBSD
# Revision 1.6 2005/10/26 09:13:54 tipaul
# big commit, still breaking things...
#
# * synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
# * code cleaning (cleaning warnings from perl -w) continued
#
# Revision 1.4.4.1 2005/06/27 23:10:55 hdl
# Removing -s from su call after Thomas D reports it breaks FreeBSD
#
# Revision 1.4 2003/11/05 23:33:45 slef
# Now figures out what directory the scripts are in