The current searching in labels is a bit minimal, and current only does keyword searching.
there is some old 2.2 code for more complete labels-searching, thats been commented out ive logged a 'bug' for this - 2777 http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=2777 this fix... - enables the index-searching functionality - adds date-ranges - uses the numSearchResults syspref, not a hardcoded '20' - rewrote old 2.2 page-num code, (didnt work for 3.x) - some indent and whitepages tidys. - unused 2.2 search-code removed. Mason Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Mason James
Chris Cormack
parent
c6ba59ce9e
commit
f6cc28fa99
|
|
@ -79,6 +79,9 @@ function add_item3(i_itemnumber){
|
|||
<div id="breadcrumbs"><a href="/cgi-bin/koha/labels/label-item-search.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Search for Items for Batch <!-- TMPL_VAR NAME="batch_id" --></a> › Search results</div>
|
||||
<form name="resultform" class="checkboxed" action=""><div style="float: right; margin-top: .5em;"><input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->,'<!-- TMPL_VAR NAME="type" -->'); return false" /> <input type="button" class="close" value="Done" /></div><div style="line-height: 2em; margin-left: .7em;"><a id="CheckAll" href="/cgi-bin/koha/labels/label-item-search.pl">Select All</a><span class="clearall"><a id="CheckNone" href="/cgi-bin/koha/labels/label-item-search.pl">Clear All</a></span></div>
|
||||
|
||||
<input type="hidden" name="ccl_query" value="<!-- TMPL_VAR name="ccl_query" -->" />
|
||||
|
||||
|
||||
<input type="hidden" name="ccl_query" value="<!-- TMPL_VAR name="ccl_query" -->" />
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,52 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
|
|||
|
||||
<fieldset class="rows">
|
||||
<ol><li>
|
||||
<select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
|
||||
<option value="kw" selected="selected">Keyword</option>
|
||||
</select>
|
||||
<input type="text" size="30" id="marclist" name="marclist" class="focus" title="Enter search terms" value=""/>
|
||||
<select name="idx" > <!-- FIXME: script does keyword search regardless -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="kw" selected="selected">Keyword</option>
|
||||
<!-- TMPL_ELSE --><option value="kw">Keyword</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="au" selected="selected">Author</option>
|
||||
<!-- TMPL_ELSE --><option value="au">Author</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="yr" selected="selected">Publication Date</option>
|
||||
<!-- TMPL_ELSE --><option value="yr">Publication Date</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="sn" selected="selected">Standard Number</option>
|
||||
<!-- TMPL_ELSE --><option value="sn">Standard Number</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="nb" selected="selected">ISBN</option>
|
||||
<!-- TMPL_ELSE --><option value="nb">ISBN</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="ns" selected="selected">ISSN</option>
|
||||
<!-- TMPL_ELSE --><option value="ns">ISSN</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="lcn,phr" selected="selected">Call Number</option>
|
||||
<!-- TMPL_ELSE --><option value="lcn,phr">Call Number</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="su" selected="selected">Subject</option>
|
||||
<!-- TMPL_ELSE --><option value="su">Subject</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" -->
|
||||
<option value="ti" selected="selected">Title</option>
|
||||
<!-- TMPL_ELSE -->
|
||||
<option value="ti" selected="selected">Title</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="ti,phr" selected="selected">Title Phrase</option>
|
||||
<!-- TMPL_ELSE --><option value="ti,phr">Title Phrase</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="se" selected="selected">Series Title</option>
|
||||
<!-- TMPL_ELSE --><option value="se">Series Title</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="bc" selected="selected">Barcode</option>
|
||||
<!-- TMPL_ELSE --><option value="bc">Barcode</option><!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="selected" --><option value="acqdate" selected="selected">Acquisition Date</option>
|
||||
<!-- TMPL_ELSE --><option value="acqdate">Acquisition Date</option><!-- /TMPL_IF -->
|
||||
</select>
|
||||
|
||||
<input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/>
|
||||
|
||||
</li><!-- FIXME: script does keyword search regardless<li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
|
@ -51,7 +93,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
|
|||
</th>
|
||||
<td>
|
||||
<input type="text" size="10" id="datefrom" name="datefrom" value="" />
|
||||
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" alt="Show Calendar" />
|
||||
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
|
||||
|
||||
<script type="text/javascript">
|
||||
Calendar.setup({
|
||||
|
|
@ -75,7 +117,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
|
|||
</th>
|
||||
<td>
|
||||
<input type="text" size="10" id="dateto" name="dateto" value="" />
|
||||
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" alt="Show Calendar" />
|
||||
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" valign="top" />
|
||||
|
||||
<script type="text/javascript">
|
||||
Calendar.setup({
|
||||
|
|
@ -86,6 +128,21 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
|
|||
});
|
||||
</script>
|
||||
|
||||
<!-- FIXME: script returns ALL type regardless
|
||||
<tr><th scope="row">Document Type</th>
|
||||
<td colspan="2">
|
||||
<select name="Filter" disabled="disabled">
|
||||
<option value="">All Item Types</option>
|
||||
<!-- TMPL_ELSE --><!-- /TMPL_IF -->
|
||||
<!-- TMPL_LOOP name="itemtypeloop" -->
|
||||
<!-- TMPL_IF name="selected" -->
|
||||
<option value="<!-- TMPL_VAR name="value" -->" selected="selected" >
|
||||
<!-- TMPL_ELSE -->
|
||||
<option value="<!-- TMPL_VAR name="value" -->">
|
||||
<!-- /TMPL_IF --><!-- TMPL_VAR name="description" --></option>
|
||||
<!-- TMPL_ELSE --><!-- /TMPL_IF -->
|
||||
<!-- /TMPL_LOOP -->
|
||||
</select>
|
||||
</td>
|
||||
</tr></table>
|
||||
|
||||
|
|
@ -93,6 +150,10 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -72,182 +72,169 @@ my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
|
|||
|
||||
my $show_results = 0;
|
||||
|
||||
if ( $op eq "do_search" ) {
|
||||
$idx = $query->param('idx');
|
||||
$ccl_textbox = $query->param('ccl_textbox');
|
||||
if ( $ccl_textbox && $idx ) {
|
||||
$ccl_query = "$idx=$ccl_textbox";
|
||||
if ($op eq "do_search") {
|
||||
$idx = $query->param('idx');
|
||||
$ccl_textbox = $query->param('ccl_textbox');
|
||||
if ($ccl_textbox && $idx) {
|
||||
$ccl_query = "$idx=$ccl_textbox" ;
|
||||
}
|
||||
|
||||
$datefrom = $query->param('datefrom');
|
||||
$dateto = $query->param('dateto');
|
||||
$datefrom = $query->param('datefrom');
|
||||
$dateto = $query->param('dateto');
|
||||
|
||||
if ($datefrom) {
|
||||
$datefrom = C4::Dates->new($datefrom);
|
||||
if ($datefrom) {
|
||||
$datefrom = C4::Dates->new($datefrom);
|
||||
$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) {
|
||||
$dateto = C4::Dates->new($dateto);
|
||||
$ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
|
||||
$ccl_query .= "acqdate,st-date-normalized,le=" . $dateto->output("iso");
|
||||
}
|
||||
if ($dateto) {
|
||||
$dateto = C4::Dates->new($dateto);
|
||||
$ccl_query .= ' and ' if ($ccl_textbox || $datefrom) ;
|
||||
$ccl_query .= "acqdate,st-date-normalized,le=". $dateto->output("iso");
|
||||
}
|
||||
|
||||
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
|
||||
( $error, $marcresults, $total_hits ) =
|
||||
SimpleSearch( $ccl_query, $offset, $resultsperpage );
|
||||
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
|
||||
($error, $marcresults, $total_hits) =
|
||||
SimpleSearch($ccl_query, $offset, $resultsperpage);
|
||||
|
||||
if ($marcresults) {
|
||||
$show_results = scalar @$marcresults;
|
||||
}
|
||||
else {
|
||||
$debug and warn "ERROR label-item-search: no results from SimpleSearch";
|
||||
if ($marcresults) {
|
||||
$show_results = scalar @$marcresults;
|
||||
} else {
|
||||
warn "ERROR label-item-search: no results from SimpleSearch";
|
||||
|
||||
# leave $show_results undef
|
||||
}
|
||||
# leave $show_results undef
|
||||
}
|
||||
}
|
||||
|
||||
if ($show_results) {
|
||||
my $hits = $show_results;
|
||||
my ( @results, @items );
|
||||
my $hits = $show_results;
|
||||
my (@results, @items);
|
||||
|
||||
# This code needs to be refactored using these subs...
|
||||
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
|
||||
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
|
||||
for ( my $i = 0 ; $i < $hits ; $i++ ) {
|
||||
# This code needs to be refactored using these subs...
|
||||
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
|
||||
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
|
||||
for (my $i = 0 ; $i < $hits ; $i++) {
|
||||
|
||||
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
|
||||
my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
|
||||
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
|
||||
my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
|
||||
|
||||
#DEBUG Notes: Transform it to Koha form...
|
||||
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
|
||||
#DEBUG Notes: Transform it to Koha form...
|
||||
my $biblio = TransformMarcToKoha(C4::Context->dbh, $marcrecord, '');
|
||||
|
||||
# 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
|
||||
#$biblio->{highlight} = ($i % 2)?(1):(0);
|
||||
#DEBUG Notes: Stuff the bib into @results...
|
||||
push @results, $biblio;
|
||||
my $biblionumber = $biblio->{'biblionumber'};
|
||||
push @results, $biblio;
|
||||
my $biblionumber = $biblio->{'biblionumber'};
|
||||
|
||||
#DEBUG Notes: Grab the item numbers associated with this MARC record...
|
||||
my $itemnums = get_itemnumbers_of($biblionumber);
|
||||
#DEBUG Notes: Grab the item numbers associated with this MARC record...
|
||||
my $itemnums = get_itemnumbers_of($biblionumber);
|
||||
|
||||
#DEBUG Notes: Retrieve the item data for each number...
|
||||
my $iii = $itemnums->{$biblionumber};
|
||||
if ($iii) {
|
||||
my $item_results = GetItemInfosOf(@$iii);
|
||||
foreach my $item ( keys %$item_results ) {
|
||||
#DEBUG Notes: Retrieve the item data for each number...
|
||||
my $iii = $itemnums->{$biblionumber};
|
||||
if ($iii) {
|
||||
my $item_results = GetItemInfosOf(@$iii);
|
||||
foreach my $item (keys %$item_results) {
|
||||
|
||||
#DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
|
||||
if ( $item_results->{$item}->{'biblionumber'} eq
|
||||
$results[$i]->{'biblionumber'} )
|
||||
{
|
||||
if ($item_results->{$item}->{'biblionumber'} eq
|
||||
$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.
|
||||
# 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.
|
||||
push @{ $results[$i]->{'item'} }, { i_itemnumber1 =>
|
||||
$item_results->{$item}->{'itemnumber'} };
|
||||
push @{ $results[$i]->{'item'} },
|
||||
{
|
||||
i_itemcallnumber => (
|
||||
$item_results->{$item}->{'itemcallnumber'}
|
||||
? $item_results->{$item}->{'itemcallnumber'}
|
||||
: 'NA'
|
||||
)
|
||||
};
|
||||
push @{ $results[$i]->{'item'} }, { i_dateaccessioned =>
|
||||
$item_results->{$item}->{'dateaccessioned'} };
|
||||
push @{ $results[$i]->{'item'} },
|
||||
{
|
||||
i_barcode => (
|
||||
$item_results->{$item}->{'barcode'}
|
||||
? $item_results->{$item}->{'barcode'}
|
||||
: 'NA'
|
||||
)
|
||||
};
|
||||
push @{ $results[$i]->{'item'} }, { i_itemnumber2 =>
|
||||
$item_results->{$item}->{'itemnumber'} };
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$debug and warn "**********\@results**********\n";
|
||||
$debug and warn Dumper(@results);
|
||||
push @{ $results[$i]->{'item'} }, { i_itemnumber1 =>
|
||||
$item_results->{$item}->{'itemnumber'} };
|
||||
push @{ $results[$i]->{'item'} },
|
||||
{ i_itemcallnumber => (
|
||||
$item_results->{$item}->{'itemcallnumber'}
|
||||
? $item_results->{$item}->{'itemcallnumber'} : 'NA'
|
||||
)
|
||||
};
|
||||
push @{ $results[$i]->{'item'} }, { i_dateaccessioned =>
|
||||
$item_results->{$item}->{'dateaccessioned'} };
|
||||
push @{ $results[$i]->{'item'} },
|
||||
{ i_barcode => (
|
||||
$item_results->{$item}->{'barcode'}
|
||||
? $item_results->{$item}->{'barcode'} : 'NA'
|
||||
)
|
||||
};
|
||||
push @{ $results[$i]->{'item'} }, { i_itemnumber2 =>
|
||||
$item_results->{$item}->{'itemnumber'} };
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$debug and warn "**********\@results**********\n";
|
||||
$debug and warn Dumper(@results);
|
||||
|
||||
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
||||
{
|
||||
template_name => "labels/result.tmpl",
|
||||
query => $query,
|
||||
type => "intranet",
|
||||
authnotrequired => 0,
|
||||
flagsrequired => { borrowers => 1 },
|
||||
flagsrequired => { catalogue => 1 },
|
||||
debug => 1,
|
||||
}
|
||||
);
|
||||
($template, $loggedinuser, $cookie) = get_template_and_user(
|
||||
{ template_name => "labels/result.tmpl",
|
||||
query => $query,
|
||||
type => "intranet",
|
||||
authnotrequired => 0,
|
||||
flagsrequired => { borrowers => 1 },
|
||||
flagsrequired => { catalogue => 1 },
|
||||
debug => 1,
|
||||
}
|
||||
);
|
||||
|
||||
# build page nav stuff.
|
||||
my ( @field_data, @numbers );
|
||||
$total = $total_hits;
|
||||
# build page nav stuff.
|
||||
my (@field_data, @numbers);
|
||||
$total = $total_hits;
|
||||
|
||||
my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
|
||||
$displayprev );
|
||||
my ($from, $to, $startfromnext, $startfromprev, $displaynext, $displayprev);
|
||||
|
||||
if ( $total > $resultsperpage ) {
|
||||
my $num_of_pages = ceil( $total / $resultsperpage + 1 );
|
||||
for ( my $page = 1 ; $page < $num_of_pages ; $page++ ) {
|
||||
my $startfrm = ( ( $page - 1 ) * $resultsperpage ) + 1;
|
||||
push @numbers,
|
||||
{
|
||||
number => $page,
|
||||
startfrom => $startfrm
|
||||
};
|
||||
}
|
||||
if ($total > $resultsperpage) {
|
||||
my $num_of_pages = ceil($total / $resultsperpage + 1);
|
||||
for (my $page = 1 ; $page < $num_of_pages ; $page++) {
|
||||
my $startfrm = (($page - 1) * $resultsperpage) + 1;
|
||||
push @numbers,
|
||||
{ number => $page,
|
||||
startfrom => $startfrm
|
||||
};
|
||||
}
|
||||
|
||||
$from = $startfrom;
|
||||
$startfromprev = $startfrom - $resultsperpage;
|
||||
$startfromnext = $startfrom + $resultsperpage;
|
||||
$from = $startfrom;
|
||||
$startfromprev = $startfrom - $resultsperpage;
|
||||
$startfromnext = $startfrom + $resultsperpage;
|
||||
|
||||
$to =
|
||||
$startfrom + $resultsperpage > $total
|
||||
? $total
|
||||
: $startfrom + $resultsperpage - 1;
|
||||
$to =
|
||||
$startfrom + $resultsperpage > $total
|
||||
? $total
|
||||
: $startfrom + $resultsperpage - 1;
|
||||
|
||||
# multi page display
|
||||
$displaynext = 0;
|
||||
$displayprev = $startfrom > 1 ? $startfrom : 0;
|
||||
# multi page display
|
||||
my $displaynext = 0;
|
||||
my $displayprev = $startfrom;
|
||||
|
||||
$displaynext = 1 if $to < $total_hits;
|
||||
$displaynext = 1 if (scalar @results == $resultsperpage);
|
||||
|
||||
}
|
||||
else {
|
||||
$displayprev = 0;
|
||||
$displaynext = 0;
|
||||
}
|
||||
$template->param(
|
||||
|
||||
$template->param(
|
||||
total => $total_hits,
|
||||
from => $from,
|
||||
to => $to,
|
||||
startfromnext => $startfromnext,
|
||||
startfromprev => $startfromprev,
|
||||
startfrom => $startfrom,
|
||||
displaynext => $displaynext,
|
||||
displayprev => $displayprev,
|
||||
resultsperpage => $resultsperpage,
|
||||
numbers => \@numbers,
|
||||
);
|
||||
total => $total_hits,
|
||||
from => $from,
|
||||
to => $to,
|
||||
startfromnext => $startfromnext,
|
||||
startfromprev => $startfromprev,
|
||||
startfrom => $startfrom,
|
||||
displaynext => $displaynext,
|
||||
displayprev => $displayprev,
|
||||
resultsperpage => $resultsperpage,
|
||||
numbers => \@numbers,
|
||||
|
||||
$template->param(
|
||||
result => \@results,
|
||||
batch_id => $batch_id,
|
||||
type => $type,
|
||||
idx => $idx,
|
||||
ccl_query => $ccl_query,
|
||||
);
|
||||
);
|
||||
}
|
||||
|
||||
$template->param(
|
||||
result => \@results,
|
||||
batch_id => $batch_id,
|
||||
type => $type,
|
||||
idx => $idx,
|
||||
ccl_query => $ccl_query,
|
||||
);
|
||||
}
|
||||
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue