[Koha-cvs] koha koha-tmpl/opac-tmpl/npl/en/includes/masthe... [dev_week]
Joshua Ferraro
jmf at kados.org
Mon Jul 24 09:30:27 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/24 07:30:27
Modified files:
koha-tmpl/opac-tmpl/npl/en/includes: masthead.inc
opac-facets.inc
koha-tmpl/opac-tmpl/npl/en/includes/tigra: tree_tpl.js
opac : opac-zoomsearch.pl
Log message:
fix a minor bug in ccl_query handling
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.5&r2=1.1.2.8.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-zoomsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.15&r2=1.1.2.16
Patches:
Index: koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.5
retrieving revision 1.1.2.8.2.6
diff -u -b -r1.1.2.8.2.5 -r1.1.2.8.2.6
--- koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc 24 Jul 2006 04:57:52 -0000 1.1.2.8.2.5
+++ koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc 24 Jul 2006 07:30:26 -0000 1.1.2.8.2.6
@@ -7,8 +7,9 @@
<p>
<label for="masthead_search">Search</label>
<input type="hidden" name="op" value="get_results" />
+<input type="hidden" name="search_type" value="cql" />
<select name="ccl_query" id="masthead_search">
- <option selected="selected" value="kw=">Keyword</option>
+ <option selected="selected" value="">Library Catalog</option>
<option value="ti=">Title</option>
<option value="te=">Exact Title</option>
<option value="au=">Author</option>
@@ -18,8 +19,8 @@
<option value="acqdate=">Acquisition Date</option>
<option value="callnum=">Call Number</option>
</select>
- <input type="text" name="ccl_query" style="width: 320px;"/>
-<input type="submit" value="Search" class="submit" /></p>
+<input type="text" name="ccl_query" style="width: 320px;"/>
+<input type="submit" value="Go" class="submit" /></p>
</form></div>
<div id="members">
Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-facets.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc 24 Jul 2006 05:44:30 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc 24 Jul 2006 07:30:26 -0000 1.1.2.2
@@ -63,10 +63,10 @@
['Adult','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME=searchdesc --> and audience=e' ],
],
['Content', 'null',
- ['Fiction',''],
- ['Non-Fiction',''],
- ['Biography',''],
- ['Mystery',''],
+ ['Fiction','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME=searchdesc --> and fiction=1'],
+ ['Non-Fiction','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME=searchdesc --> and fiction=0'],
+ ['Biography','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME=searchdesc --> and biography=b'],
+ ['Mystery','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME=searchdesc --> and mystery='],
['Thesis/Dissertation',''],
['Musical Recording',''],
['non-Musical Recording',''],
Index: koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/tigra/Attic/tree_tpl.js,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js 24 Jul 2006 04:57:52 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js 24 Jul 2006 07:30:26 -0000 1.1.2.4
@@ -42,13 +42,13 @@
'icon_e' : '/opac-tmpl/npl/en/includes/tigra/icons/empty.gif', // empty image
'icon_l' : '/opac-tmpl/npl/en/includes/tigra/icons/line.gif', // vertical line
- 'icon_32' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root leaf icon normal
- 'icon_36' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root leaf icon selected
+ 'icon_32' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root leaf icon normal
+ 'icon_36' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root leaf icon selected
- 'icon_48' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root icon normal
- 'icon_52' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root icon selected
- 'icon_56' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root icon opened
- 'icon_60' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png', // root icon selected
+ 'icon_48' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root icon normal
+ 'icon_52' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root icon selected
+ 'icon_56' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root icon opened
+ 'icon_60' : '/opac-tmpl/npl/en/includes/tigra/icons/sitemap.png', // root icon selected
// 'icon_16' : '/opac-tmpl/npl/en/includes/tigra/icons/application_go.png', // node icon normal
// 'icon_20' : '/opac-tmpl/npl/en/includes/tigra/icons/application_side_expand.png', // node icon selected
Index: opac/opac-zoomsearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-zoomsearch.pl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -b -r1.1.2.15 -r1.1.2.16
--- opac/opac-zoomsearch.pl 24 Jul 2006 05:26:19 -0000 1.1.2.15
+++ opac/opac-zoomsearch.pl 24 Jul 2006 07:30:27 -0000 1.1.2.16
@@ -43,7 +43,7 @@
my @ccl_query = $query->param('ccl_query');
my $ccl_query;
foreach my $ccl (@ccl_query) {
- $ccl_query.=" $ccl";
+ $ccl_query.="$ccl " if $ccl;;
}
my $flush_search_history = $query->param('flush_search_history');
if ($flush_search_history) {
@@ -136,7 +136,7 @@
my ($count, @results,$facets);
# queries are handled differently, so alert our API and pass in the variables
- if ($query->param('ccl_query')) { # CCL
+ if ($ccl_query) { # CCL
if ($query->param('scan')) {
($error,$count, $facets, at results) = searchZOOM('scan','ccl',$ccl_query,$number_of_results,$startfrom,$then_sort_by);
$template->param(scan => 1);
@@ -283,6 +283,7 @@
my $ipaddress;
if ( C4::Context->preference("kohaspsuggest") ) {
+ eval {
my $koha_spsuggest_dbh;
eval {
$koha_spsuggest_dbh=DBI->connect("DBI:mysql:suggest:66.213.78.76","auth","Free2cirC");
@@ -304,7 +305,7 @@
# Now save the current query
$koha_spsuggest_sth=$koha_spsuggest_dbh->prepare($koha_spsuggest_insert);
- $koha_spsuggest_sth->execute($phrases,$count,$ipaddress);
+ #$koha_spsuggest_sth->execute($phrases,$count,$ipaddress);
$koha_spsuggest_sth->finish;
$template->param( koha_spsuggest => $koha_spsuggest ) unless $num;
@@ -313,6 +314,10 @@
itemtypeloop=>\@itemtypeloop,
);
}
+ };
+ if ($@) {
+ warn "Kohaspsuggest failure:".$@;
+ }
}
## Spellchecking using Google API
More information about the Koha-cvs
mailing list