Filter on : title: "> @@ -56,6 +56,5 @@ - \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl index 8ea0abf0d0..5c8a419118 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl @@ -3,7 +3,7 @@

Authority search

- + +

/images/prev.gif" onClick="javascript:upSubfield('')"> + " size="1" maxlength="1"> + + "> + * "> - "> "> "> "> @@ -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 ; i0) { - strQuery += "&isbn="+document.forms[0].field_value[i].value; + for (i=0 ; i0) { + 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="+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; +} + diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl index 57259746ce..a820e6498b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl @@ -5,9 +5,11 @@ ">

//images/fileopen.png"> - -

//images/edittrash.png"> - + + +

//images/edittrash.png"> + + ')" class="button authority"> Print @@ -22,9 +24,6 @@

- &operator==&type=intranet&value="> -

//images/filefind.png" height="15"> - diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl index b2a45a8e30..bf73e4ea0a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl @@ -1,7 +1,7 @@

delete	barcode	title	Delete	Barcode	Title	Author
">	">		">	">
- "> + ">	- " class="button catalogue">Modify + " class="button catalogue">Modify

Messages
@@ -97,7 +98,7 @@ onclick="openWindow(this,'Member', 480, 640); return false;">

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl index 6a45b88af8..d1e9f705a6 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl @@ -98,8 +98,14 @@ + + Branch + + + + - + Sort1 @@ -107,7 +113,7 @@ - + Sort2 diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl index 34e1103497..b569e38d8c 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/issues_stats.tmpl @@ -206,7 +206,8 @@

Cell value

Output

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl index df9c75e5c3..ef9e2a9dac 100644 --- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl @@ -20,7 +20,11 @@ - class="hilighted"> + + + + + "> diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl index a1fb3a4a69..e8bd13e4cc 100644 --- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl @@ -30,9 +30,11 @@ - - ... - + + + ... + +

Author @@ -40,9 +42,11 @@ - - ... - + + + ... + +

Subject @@ -51,9 +55,11 @@ - - ... - + + + ... + +

Item Type @@ -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+'&search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes'); } diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl index 7ff4f29a76..ea5be295e8 100644 --- a/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl @@ -39,9 +39,9 @@ + + + + + + +

Laboratory Search

+ + + + +

Laboratory Search results

+ + Results to of No results found. + +

+ + + + + + + + + + + + + + + +

Laboratory	Select
+ +	+ ','',,0)" class="button catalogue">Select + ','',,1)" class="button catalogue">Sel&close +

+ &cat_auth=&search=&resultsperpage=&type=intranet&op=do_search&index="><<Previous + + + + + + &cat_auth=&search=&resultsperpage=&type=intranet&op=do_search&index="> + + + + &cat_auth=&search=&resultsperpage=&type=intranet&op=do_search&index=">Next>> + +

+ + Results to of No results found. + +

+ +

+ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl index 0e030689dc..16dede7bd7 100644 --- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl @@ -160,9 +160,16 @@ + + + + + + - + @@ -214,9 +221,16 @@ + + + + + + - + @@ -268,9 +282,16 @@ + + + + + + - + diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl index 64197eeeb2..7ca1531a8e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl @@ -32,7 +32,7 @@

- &&authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index="> + &&authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index="> @@ -40,12 +40,12 @@ -highlight.gif"> - &authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index="> + &authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index="> .gif" border="0"> - &&authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index="> + &authtypecode=EDITORS&and_or=and&operator=contains&value=&op=do_search&type=intranet&index=">

diff --git a/members/deletemem.pl b/members/deletemem.pl index 2f0e1b33b7..cbda883d76 100755 --- a/members/deletemem.pl +++ b/members/deletemem.pl @@ -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; diff --git a/members/imemberentry.pl b/members/imemberentry.pl index 0e9922919a..c0530c4ef1 100755 --- a/members/imemberentry.pl +++ b/members/imemberentry.pl @@ -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; diff --git a/members/memberentry.pl b/members/memberentry.pl index 7f27125272..234be6b0c6 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -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'}; } } diff --git a/members/moremember.pl b/members/moremember.pl index 5030ff2785..fe0aa0f4a4 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -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; diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl index de47723c1a..51f84b5c9a 100755 --- a/opac/opac-ISBDdetail.pl +++ b/opac/opac-ISBDdetail.pl @@ -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 diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl index ac23ef55c3..49c1baf503 100755 --- a/opac/opac-MARCdetail.pl +++ b/opac/opac-MARCdetail.pl @@ -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++) { diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index 4156dd7d81..128775eae7 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -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); } diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 1f6adbc8f1..5143248aa0 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -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 diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 0145b3c4a2..3aa515dfb0 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -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"), diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index 90835a91d2..9fc65536d0 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -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 =~ /\n(.*)\n/s) { $mail{'subject'} = $1; } else { $mail{'subject'} = "no subject"; } @@ -81,7 +88,7 @@ if ($email_add) { my $email_file = "basket.txt"; if ($template_res =~ /\n(.*)\n/s) { $email_file = $1; } - if ($template_res =~ /\n(.*)\n/s) { $mail{'body'} = $1; } + if ($template_res =~ /\n(.*)\n/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} = <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); diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 0d417b6d64..bc13b39c2c 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -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; } diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index 355a848d3f..961fd1236d 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -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)"; - - } 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)"; - - } 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 $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; + } + + 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; + } # 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) "; - - @$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; - -# 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; - } - - 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; + 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 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); + + $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}; + } + + + # 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; diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl index 1d05600ab0..e7f1294992 100755 --- a/reports/borrowers_stats.pl +++ b/reports/borrowers_stats.pl @@ -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; } } diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index dbbfbf65ca..a40d5c893e 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -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"; diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin index c767bb833e..80cd0a30a2 100644 --- a/reports/issues_by_borrower_category.plugin +++ b/reports/issues_by_borrower_category.plugin @@ -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; diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index c7229e9d64..59edac2371 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -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) "; diff --git a/search.marc/search.pl b/search.marc/search.pl index 6d0d88fba6..ddb75f658e 100755 --- a/search.marc/search.pl +++ b/search.marc/search.pl @@ -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, diff --git a/updater/updatedatabase b/updater/updatedatabase index 3284285a6f..2325c3a050 100755 --- a/updater/updatedatabase +++ b/updater/updatedatabase @@ -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. # diff --git a/value_builder/labs_theses.pl b/value_builder/labs_theses.pl new file mode 100644 index 0000000000..2ed6da98be --- /dev/null +++ b/value_builder/labs_theses.pl @@ -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=" + +"; + +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; diff --git a/value_builder/unimarc_field_100.pl b/value_builder/unimarc_field_100.pl index 4dfe4d2c39..a8fa419f64 100755 --- a/value_builder/unimarc_field_100.pl +++ b/value_builder/unimarc_field_100.pl @@ -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); diff --git a/value_builder/unimarc_field_210c.pl b/value_builder/unimarc_field_210c.pl index d42e498860..4614b5b2e9 100644 --- a/value_builder/unimarc_field_210c.pl +++ b/value_builder/unimarc_field_210c.pl @@ -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'); } "; diff --git a/z3950/z3950-daemon-launch.sh b/z3950/z3950-daemon-launch.sh index 621ba86ae5..cbb4ed0042 100755 --- a/z3950/z3950-daemon-launch.sh +++ b/z3950/z3950-daemon-launch.sh @@ -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 -- 2.39.2

Authority search

Authority search

Select bookshelf

Shelf content

Shelf contents

Add a book by barcode

Select Shelves to Delete

Add Shelf

Modify shelf

Catalogue search

Output

Cell value

Output

Laboratory Search

Search on

Laboratory Search results