perltidy lables/label-item-search.pl
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Galen Charlton
parent
d958db03a2
commit
e4cbee8454
1 changed files with 151 additions and 137 deletions
|
|
@ -52,7 +52,7 @@ BEGIN {
|
||||||
# Using more than one scrolling list in a CGI assigns the same default value to all the
|
# Using more than one scrolling list in a CGI assigns the same default value to all the
|
||||||
# scrolling lists on the page !?!? That's why this function was written.
|
# scrolling lists on the page !?!? That's why this function was written.
|
||||||
|
|
||||||
my $query = new CGI;
|
my $query = new CGI;
|
||||||
|
|
||||||
my $type = $query->param('type');
|
my $type = $query->param('type');
|
||||||
my $op = $query->param('op') || '';
|
my $op = $query->param('op') || '';
|
||||||
|
|
@ -63,177 +63,191 @@ my $dbh = C4::Context->dbh;
|
||||||
|
|
||||||
my $startfrom = $query->param('startfrom') || 1;
|
my $startfrom = $query->param('startfrom') || 1;
|
||||||
my ( $template, $loggedinuser, $cookie );
|
my ( $template, $loggedinuser, $cookie );
|
||||||
my ($total_hits, $orderby, $results, $total, $error, $marcresults, $idx, $datefrom, $dateto, $ccl_textbox);
|
my (
|
||||||
|
$total_hits, $orderby, $results, $total, $error,
|
||||||
|
$marcresults, $idx, $datefrom, $dateto, $ccl_textbox
|
||||||
|
);
|
||||||
|
|
||||||
my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
|
my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
|
||||||
|
|
||||||
my $show_results = 0;
|
my $show_results = 0;
|
||||||
|
|
||||||
if ($op eq "do_search") {
|
if ( $op eq "do_search" ) {
|
||||||
$idx = $query->param('idx');
|
$idx = $query->param('idx');
|
||||||
$ccl_textbox = $query->param('ccl_textbox');
|
$ccl_textbox = $query->param('ccl_textbox');
|
||||||
if ($ccl_textbox && $idx) {
|
if ( $ccl_textbox && $idx ) {
|
||||||
$ccl_query = "$idx=$ccl_textbox" ;
|
$ccl_query = "$idx=$ccl_textbox";
|
||||||
}
|
}
|
||||||
|
|
||||||
$datefrom = $query->param('datefrom');
|
$datefrom = $query->param('datefrom');
|
||||||
$dateto = $query->param('dateto');
|
$dateto = $query->param('dateto');
|
||||||
|
|
||||||
if ($datefrom) {
|
if ($datefrom) {
|
||||||
$datefrom = C4::Dates->new($datefrom);
|
$datefrom = C4::Dates->new($datefrom);
|
||||||
$ccl_query .= ' and ' if $ccl_textbox;
|
$ccl_query .= ' and ' if $ccl_textbox;
|
||||||
$ccl_query .= "acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
|
$ccl_query .=
|
||||||
}
|
"acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
|
||||||
|
}
|
||||||
|
|
||||||
if ($dateto) {
|
if ($dateto) {
|
||||||
$dateto = C4::Dates->new($dateto);
|
$dateto = C4::Dates->new($dateto);
|
||||||
$ccl_query .= ' and ' if ($ccl_textbox || $datefrom) ;
|
$ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
|
||||||
$ccl_query .= "acqdate,st-date-normalized,le=". $dateto->output("iso");
|
$ccl_query .= "acqdate,st-date-normalized,le=" . $dateto->output("iso");
|
||||||
}
|
}
|
||||||
|
|
||||||
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
|
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
|
||||||
($error, $marcresults, $total_hits) =
|
( $error, $marcresults, $total_hits ) =
|
||||||
SimpleSearch($ccl_query, $offset, $resultsperpage);
|
SimpleSearch( $ccl_query, $offset, $resultsperpage );
|
||||||
|
|
||||||
if ($marcresults) {
|
if ($marcresults) {
|
||||||
$show_results = scalar @$marcresults;
|
$show_results = scalar @$marcresults;
|
||||||
} else {
|
}
|
||||||
$debug and warn "ERROR label-item-search: no results from SimpleSearch";
|
else {
|
||||||
|
$debug and warn "ERROR label-item-search: no results from SimpleSearch";
|
||||||
|
|
||||||
# leave $show_results undef
|
# leave $show_results undef
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($show_results) {
|
if ($show_results) {
|
||||||
my $hits = $show_results;
|
my $hits = $show_results;
|
||||||
my (@results, @items);
|
my ( @results, @items );
|
||||||
|
|
||||||
# This code needs to be refactored using these subs...
|
# This code needs to be refactored using these subs...
|
||||||
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
|
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
|
||||||
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
|
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
|
||||||
for (my $i = 0 ; $i < $hits ; $i++) {
|
for ( my $i = 0 ; $i < $hits ; $i++ ) {
|
||||||
|
|
||||||
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
|
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
|
||||||
my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
|
my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
|
||||||
|
|
||||||
#DEBUG Notes: Transform it to Koha form...
|
#DEBUG Notes: Transform it to Koha form...
|
||||||
my $biblio = TransformMarcToKoha(C4::Context->dbh, $marcrecord, '');
|
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
|
||||||
|
|
||||||
# Begin building the hash for the template...
|
# Begin building the hash for the template...
|
||||||
# I don't think we need this with the current template design, but I'm leaving it in place. -fbcit
|
# I don't think we need this with the current template design, but I'm leaving it in place. -fbcit
|
||||||
#$biblio->{highlight} = ($i % 2)?(1):(0);
|
#$biblio->{highlight} = ($i % 2)?(1):(0);
|
||||||
#DEBUG Notes: Stuff the bib into @results...
|
#DEBUG Notes: Stuff the bib into @results...
|
||||||
push @results, $biblio;
|
push @results, $biblio;
|
||||||
my $biblionumber = $biblio->{'biblionumber'};
|
my $biblionumber = $biblio->{'biblionumber'};
|
||||||
|
|
||||||
#DEBUG Notes: Grab the item numbers associated with this MARC record...
|
#DEBUG Notes: Grab the item numbers associated with this MARC record...
|
||||||
my $itemnums = get_itemnumbers_of($biblionumber);
|
my $itemnums = get_itemnumbers_of($biblionumber);
|
||||||
|
|
||||||
#DEBUG Notes: Retrieve the item data for each number...
|
#DEBUG Notes: Retrieve the item data for each number...
|
||||||
my $iii = $itemnums->{$biblionumber};
|
my $iii = $itemnums->{$biblionumber};
|
||||||
if ($iii) {
|
if ($iii) {
|
||||||
my $item_results = GetItemInfosOf(@$iii);
|
my $item_results = GetItemInfosOf(@$iii);
|
||||||
foreach my $item (keys %$item_results) {
|
foreach my $item ( keys %$item_results ) {
|
||||||
|
|
||||||
#DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
|
#DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
|
||||||
if ($item_results->{$item}->{'biblionumber'} eq
|
if ( $item_results->{$item}->{'biblionumber'} eq
|
||||||
$results[$i]->{'biblionumber'}) {
|
$results[$i]->{'biblionumber'} )
|
||||||
|
{
|
||||||
|
|
||||||
# NOTE: The order of the elements in this array must be preserved or the table dependent on it will be incorrectly rendered.
|
# NOTE: The order of the elements in this array must be preserved or the table dependent on it will be incorrectly rendered.
|
||||||
# This is a real hack, but I can't think of a better way right now. -fbcit
|
# This is a real hack, but I can't think of a better way right now. -fbcit
|
||||||
# It is conceivable that itemcallnumber and/or barcode fields might be empty so the trinaries cover this possibility.
|
# It is conceivable that itemcallnumber and/or barcode fields might be empty so the trinaries cover this possibility.
|
||||||
push @{ $results[$i]->{'item'} }, { i_itemnumber1 =>
|
push @{ $results[$i]->{'item'} }, { i_itemnumber1 =>
|
||||||
$item_results->{$item}->{'itemnumber'} };
|
$item_results->{$item}->{'itemnumber'} };
|
||||||
push @{ $results[$i]->{'item'} },
|
push @{ $results[$i]->{'item'} },
|
||||||
{ i_itemcallnumber => (
|
{
|
||||||
$item_results->{$item}->{'itemcallnumber'}
|
i_itemcallnumber => (
|
||||||
? $item_results->{$item}->{'itemcallnumber'} : 'NA'
|
$item_results->{$item}->{'itemcallnumber'}
|
||||||
)
|
? $item_results->{$item}->{'itemcallnumber'}
|
||||||
};
|
: 'NA'
|
||||||
push @{ $results[$i]->{'item'} }, { i_dateaccessioned =>
|
)
|
||||||
$item_results->{$item}->{'dateaccessioned'} };
|
};
|
||||||
push @{ $results[$i]->{'item'} },
|
push @{ $results[$i]->{'item'} }, { i_dateaccessioned =>
|
||||||
{ i_barcode => (
|
$item_results->{$item}->{'dateaccessioned'} };
|
||||||
$item_results->{$item}->{'barcode'}
|
push @{ $results[$i]->{'item'} },
|
||||||
? $item_results->{$item}->{'barcode'} : 'NA'
|
{
|
||||||
)
|
i_barcode => (
|
||||||
};
|
$item_results->{$item}->{'barcode'}
|
||||||
push @{ $results[$i]->{'item'} }, { i_itemnumber2 =>
|
? $item_results->{$item}->{'barcode'}
|
||||||
$item_results->{$item}->{'itemnumber'} };
|
: 'NA'
|
||||||
}
|
)
|
||||||
}
|
};
|
||||||
}
|
push @{ $results[$i]->{'item'} }, { i_itemnumber2 =>
|
||||||
}
|
$item_results->{$item}->{'itemnumber'} };
|
||||||
$debug and warn "**********\@results**********\n";
|
}
|
||||||
$debug and warn Dumper(@results);
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$debug and warn "**********\@results**********\n";
|
||||||
|
$debug and warn Dumper(@results);
|
||||||
|
|
||||||
($template, $loggedinuser, $cookie) = get_template_and_user(
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
||||||
{ template_name => "labels/result.tmpl",
|
{
|
||||||
query => $query,
|
template_name => "labels/result.tmpl",
|
||||||
type => "intranet",
|
query => $query,
|
||||||
authnotrequired => 0,
|
type => "intranet",
|
||||||
flagsrequired => { borrowers => 1 },
|
authnotrequired => 0,
|
||||||
flagsrequired => { catalogue => 1 },
|
flagsrequired => { borrowers => 1 },
|
||||||
debug => 1,
|
flagsrequired => { catalogue => 1 },
|
||||||
}
|
debug => 1,
|
||||||
);
|
}
|
||||||
|
);
|
||||||
|
|
||||||
# build page nav stuff.
|
# build page nav stuff.
|
||||||
my (@field_data, @numbers);
|
my ( @field_data, @numbers );
|
||||||
$total = $total_hits;
|
$total = $total_hits;
|
||||||
|
|
||||||
my ($from, $to, $startfromnext, $startfromprev, $displaynext, $displayprev);
|
my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
|
||||||
|
$displayprev );
|
||||||
|
|
||||||
if ($total > $resultsperpage) {
|
if ( $total > $resultsperpage ) {
|
||||||
my $num_of_pages = ceil($total / $resultsperpage + 1);
|
my $num_of_pages = ceil( $total / $resultsperpage + 1 );
|
||||||
for (my $page = 1 ; $page < $num_of_pages ; $page++) {
|
for ( my $page = 1 ; $page < $num_of_pages ; $page++ ) {
|
||||||
my $startfrm = (($page - 1) * $resultsperpage) + 1;
|
my $startfrm = ( ( $page - 1 ) * $resultsperpage ) + 1;
|
||||||
push @numbers,
|
push @numbers,
|
||||||
{ number => $page,
|
{
|
||||||
startfrom => $startfrm
|
number => $page,
|
||||||
};
|
startfrom => $startfrm
|
||||||
}
|
};
|
||||||
|
}
|
||||||
|
|
||||||
$from = $startfrom;
|
$from = $startfrom;
|
||||||
$startfromprev = $startfrom - $resultsperpage;
|
$startfromprev = $startfrom - $resultsperpage;
|
||||||
$startfromnext = $startfrom + $resultsperpage;
|
$startfromnext = $startfrom + $resultsperpage;
|
||||||
|
|
||||||
$to =
|
$to =
|
||||||
$startfrom + $resultsperpage > $total
|
$startfrom + $resultsperpage > $total
|
||||||
? $total
|
? $total
|
||||||
: $startfrom + $resultsperpage - 1;
|
: $startfrom + $resultsperpage - 1;
|
||||||
|
|
||||||
# multi page display
|
# multi page display
|
||||||
$displaynext = 0;
|
$displaynext = 0;
|
||||||
$displayprev = $startfrom > 1 ? $startfrom : 0;
|
$displayprev = $startfrom > 1 ? $startfrom : 0;
|
||||||
|
|
||||||
$displaynext = 1 if $to < $total_hits;
|
$displaynext = 1 if $to < $total_hits;
|
||||||
|
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$displayprev = 0;
|
$displayprev = 0;
|
||||||
$displaynext = 0;
|
$displaynext = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$template->param(
|
$template->param(
|
||||||
total => $total_hits,
|
total => $total_hits,
|
||||||
from => $from,
|
from => $from,
|
||||||
to => $to,
|
to => $to,
|
||||||
startfromnext => $startfromnext,
|
startfromnext => $startfromnext,
|
||||||
startfromprev => $startfromprev,
|
startfromprev => $startfromprev,
|
||||||
startfrom => $startfrom,
|
startfrom => $startfrom,
|
||||||
displaynext => $displaynext,
|
displaynext => $displaynext,
|
||||||
displayprev => $displayprev,
|
displayprev => $displayprev,
|
||||||
resultsperpage => $resultsperpage,
|
resultsperpage => $resultsperpage,
|
||||||
numbers => \@numbers,
|
numbers => \@numbers,
|
||||||
);
|
);
|
||||||
|
|
||||||
$template->param(
|
$template->param(
|
||||||
result => \@results,
|
result => \@results,
|
||||||
batch_id => $batch_id,
|
batch_id => $batch_id,
|
||||||
type => $type,
|
type => $type,
|
||||||
idx => $idx,
|
idx => $idx,
|
||||||
ccl_query => $ccl_query,
|
ccl_query => $ccl_query,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -253,21 +267,21 @@ else {
|
||||||
);
|
);
|
||||||
my $itemtypes = GetItemTypes;
|
my $itemtypes = GetItemTypes;
|
||||||
my @itemtypeloop;
|
my @itemtypeloop;
|
||||||
foreach my $thisitemtype (keys %$itemtypes) {
|
foreach my $thisitemtype ( keys %$itemtypes ) {
|
||||||
my %row =(value => $thisitemtype,
|
my %row = (
|
||||||
description => $itemtypes->{$thisitemtype}->{'description'},
|
value => $thisitemtype,
|
||||||
);
|
description => $itemtypes->{$thisitemtype}->{'description'},
|
||||||
push @itemtypeloop, \%row;
|
);
|
||||||
|
push @itemtypeloop, \%row;
|
||||||
}
|
}
|
||||||
$template->param(
|
$template->param(
|
||||||
itemtypeloop =>\@itemtypeloop,
|
itemtypeloop => \@itemtypeloop,
|
||||||
batch_id => $batch_id,
|
batch_id => $batch_id,
|
||||||
type => $type,
|
type => $type,
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Print the page
|
# Print the page
|
||||||
$template->param(
|
$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), );
|
||||||
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
|
|
||||||
);
|
|
||||||
output_html_with_http_headers $query, $cookie, $template->output;
|
output_html_with_http_headers $query, $cookie, $template->output;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue