[Koha-cvs] koha koha-tmpl/opac-tmpl/npl/en/opac-results.tm... [dev_week]
Kyle Hall
kyle.m.hall at gmail.com
Fri Apr 27 14:26:26 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Kyle Hall <kylemhall> 07/04/27 12:26:26
Modified files:
koha-tmpl/opac-tmpl/npl/en: opac-results.tmpl
opac : search
Log message:
Page links were lacking the "Limit" parameter, fixed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.21&r2=1.1.2.22
http://cvs.savannah.gnu.org/viewcvs/koha/opac/search?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.10&r2=1.1.2.11
Patches:
Index: koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -b -r1.1.2.21 -r1.1.2.22
--- koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 18 Mar 2007 03:47:25 -0000 1.1.2.21
+++ koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 27 Apr 2007 12:26:26 -0000 1.1.2.22
@@ -125,7 +125,7 @@
<!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount" -->)<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="orderedcount" --> On order (<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF --></span>
</p>
- <p><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--TMPL_IF NAME="opacbookbag" --></label><!-- /TMPL_IF --><a href="/search?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="classification" --></a></p>
+ <!-- commented temporarily <p><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> --> <!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--TMPL_IF NAME="opacbookbag" --></label><!-- /TMPL_IF --><a href="/search?q=callnum:<!-- TMPL_VAR NAME="itemcallnumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="itemcallnumber" --></a></p>
</td>
</tr>
<!-- /TMPL_LOOP -->
@@ -135,11 +135,11 @@
<!-- TMPL_IF NAME="PAGE_NUMBERS" --><div class="pages">
<!-- Row of numbers corresponding to search result pages -->
- <!-- TMPL_IF NAME="previous_page_offset" --><a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="previous_page_offset" -->"><< Previous</a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="previous_page_offset" --><a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="previous_page_offset" --><!-- TMPL_IF NAME="limit" -->&limit=<!-- TMPL_VAR NAME="limit" --><!-- /TMPL_IF -->"><< Previous</a><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="PAGE_NUMBERS" --><!-- TMPL_IF NAME="highlight" --><span class="current"><!-- TMPL_VAR NAME="pg" --></span><!-- TMPL_ELSE -->
- <a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
+ <a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit" -->&limit=<!-- TMPL_VAR NAME="limit" --><!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME="next_page_offset" --><a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="next_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Next >></a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="next_page_offset" --><a class="nav" href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="next_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit" -->&limit=<!-- TMPL_VAR NAME="limit" --><!-- /TMPL_IF -->">Next >></a><!-- /TMPL_IF -->
</div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="outer_sup_results_loop" -->
Index: opac/search
===================================================================
RCS file: /sources/koha/koha/opac/Attic/search,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- opac/search 11 Apr 2007 16:07:41 -0000 1.1.2.10
+++ opac/search 27 Apr 2007 12:26:26 -0000 1.1.2.11
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/opac/Attic/search,v 1.1.2.10 2007/04/11 16:07:41 rych Exp $
+# $Header: /sources/koha/koha/opac/Attic/search,v 1.1.2.11 2007/04/27 12:26:26 kylemhall Exp $
#
# Copyright 2006 LibLime
#
@@ -153,6 +153,7 @@
use C4::Koha;
use POSIX qw(ceil floor);
+
# create a new CGI object
# not sure undef_params option is working, need to test
use CGI qw('-no_undef_params');
@@ -180,6 +181,12 @@
authnotrequired => 1,}
);
+# if there was a limit, such as "available" push to template
+my $limit = $cgi->param("limit");
+if ( $limit ) {
+ $template->param( limit => $limit );
+}
+
=head1 BUGS and FIXMEs
There are many, most are documented in the code. The one that
@@ -215,7 +222,7 @@
# load the branches
my $branches = getallbranches();
my @branch_loop;
-push @branch_loop, {value => "", branchname => "All Branches", };
+push @branch_loop, {value => "", branchname => "All Libraries", };
for my $branch_hash (keys %$branches) {
push @branch_loop, {value => "branch: $branch_hash", branchname => $branches->{$branch_hash}->{'branchname'}, };
}
@@ -387,7 +394,6 @@
($error, $results_hashref, $facets) = getRecords($koha_query,$federated_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
};
-
if ($@ || $error) {
$template->param(query_error => $error.$@);
warn "error: ".$error.$@;
@@ -407,8 +413,9 @@
## If there's just one result, redirect to the detail page
if ($total == 1) {
- my $biblionumber=$newresults[0]->{biblionumber};
- print $cgi->redirect("/bib/$biblionumber");
+ my $biblionumber=@newresults[0]->{biblionumber};
+ #print $cgi->redirect("/bib/$biblionumber");
+ print $cgi->redirect ("/cgi-bin/koha/opac-detail.pl?bib=$biblionumber"); #fixed by cm
exit;
}
if ($hits) {
@@ -428,7 +435,6 @@
$current_page_number = ($offset / $results_per_page + 1) if $offset;
my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0);
my $next_page_offset = $offset + $results_per_page;
- my $sort_by = join " ", at sort_by;
# If we're within the first 10 pages, keep it simple
#warn "current page:".$current_page_number;
@@ -446,7 +452,7 @@
# it should only be highlighted if it's the current page
my $highlight = 1 if ($this_page_number == $current_page_number);
# put it in the array
- push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => $sort_by };
+ push @page_numbers, { limit => $limit, offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
}
}
# now, show twenty pages, with the current one smack in the middle
@@ -455,14 +461,13 @@
my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
my $this_page_number = $i-9;
my $highlight = 1 if ($this_page_number == $current_page_number);
- push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => $sort_by };
+ push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
}
}
$template->param(PAGE_NUMBERS => \@page_numbers,
previous_page_offset => $previous_page_offset,
- sort_by => $sort_by,
next_page_offset => $next_page_offset) unless $pages < 2;
}
} # end of the if local
@@ -491,6 +496,9 @@
} #/end of the for loop
#$template->param(FEDERATED_RESULTS => \@results_array);
+if (C4::Context->preference("AmazonContent")==1) {
+ use C4::Amazon;
+ }
$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary")) if (C4::Context->preference("Disable_Dictionary"));
@@ -511,6 +519,7 @@
opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
scan_use => $scan,
search_error => $error,
+ #isbn => C4::Amazon->get_amazon_details("isbn"),
);
## Now let's find out if we have any supplemental data to show the user
@@ -557,5 +566,6 @@
}
}
+
# VI. BUILD THE TEMPLATE
output_html_with_http_headers $cgi, $cookie, $template->output;
More information about the Koha-cvs
mailing list