[Koha-cvs] koha C4/Search.pm koha-tmpl/opac-tmpl/npl/en/op... [dev_week]
Joshua Ferraro
jmf at kados.org
Sun Jul 23 20:02:10 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/23 18:02:09
Modified files:
C4 : Search.pm
koha-tmpl/opac-tmpl/npl/en: opac-detail.tmpl opac-passwd.tmpl
opac-readingrecord.tmpl
opac-results.tmpl opac-user.tmpl
opac-userdetails.tmpl
opac-zoomsearch.tmpl
koha-tmpl/opac-tmpl/npl/en/includes: doc-head-close-cat-zoom.inc
masthead.inc navigation.inc
opac-bottom.inc
opac-colors.npl.css
opac-layout.css
opac : opac-zoomsearch.pl
Log message:
This is an important commit.
It includes the following:
* adding koha_spsuggest support for adding/retrieving suggestions to prompt user in case of failed queries
* some template cleanups in NPL templates
* many many improvements to faceted results including a new javascript-based hierarchy based on the free Tigra toolkit
I'm still working on the design of the facets, currently lots of stuff
is hardcoded in Search.pm. I plan to make it very extensible and have
some ideas on how to do that but wanted to commit what I have so others
could try it out and give some feedback, etc.
If you want to try out a system that is using stock dev-week, please
visit http://zoomopac.liblime.com
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.7&r2=1.99.2.11.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.19.2.2&r2=1.1.2.19.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
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.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.1&r2=1.1.2.11.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-zoomsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-cat-zoom.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.3
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.2&r2=1.1.2.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.2&r2=1.2.2.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-bottom.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.2&r2=1.1.2.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.3&r2=1.1.2.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-zoomsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11&r2=1.1.2.12
Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.7
retrieving revision 1.99.2.11.2.8
diff -u -b -r1.99.2.11.2.7 -r1.99.2.11.2.8
--- C4/Search.pm 21 Jul 2006 17:31:41 -0000 1.99.2.11.2.7
+++ C4/Search.pm 23 Jul 2006 18:02:09 -0000 1.99.2.11.2.8
@@ -35,7 +35,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.7 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.8 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -4092,20 +4092,26 @@
sub searchZOOM {
- use C4::Biblio;
my ($search_or_scan,$type,$query,$num,$startfrom,$then_sort_by) = @_;
+ # establish database connections
my $dbh = C4::Context->dbh;
my $zconn=C4::Context->Zconn("biblioserver");
- #warn ($type,$query,$num,$startfrom) ;
+ # make sure all is well with the connection
if ($zconn eq "error") {
return("error with connection",undef); #FIXME: better error handling
}
my $zoom_query_obj;
+ # prepare the query depending on the type
if ($type eq 'ccl') {
+ eval {
$zoom_query_obj = new ZOOM::Query::CCL2RPN($query,$zconn);
+ };
+ if ($@) {
+ return ("error: Sorry, there was a problem with your query: $@",undef); #FIXME: better error handling
+ }
} elsif ($type eq 'cql') {
eval {
$zoom_query_obj = new ZOOM::Query::CQL2RPN($query,$zconn);
@@ -4122,7 +4128,7 @@
}
}
- # PERFORM THE SEARCH
+ # PERFORM THE SEARCH OR SCAN
my $result;
my @results;
my $numresults;
@@ -4142,15 +4148,23 @@
}
}
- # RESORT RESULT SET
+ #### RESORT RESULT SET
if ($then_sort_by) {
$result->sort("yaz", "$then_sort_by")
}
- # build our results and faceted searching
- my @facets; my %facets_counter; my %facets_counter_subs; my @facets_counter_subs_array;
+ #### INITIALIZE SOME VARS USED CREATE THE FACETED RESULTS
+ my $facets = "";
+ my ($subject_facets, $series_facets, $author_facets);
+ my %subject_facets_counter; my %subject_facets_counter_subs;
+ my %subject_subdivision; my %subject_sub_subdivision;
+ my %series_facets_counter;
+ my %author_facets_counter;
+
+ #### LOOP THROUGH THE RESULTS
$numresults = 0 | $result->size() if ($result);
for ( my $i=$startfrom; $i<(($startfrom+$num<=$numresults) ? ($startfrom+$num):$numresults) ; $i++){
- if ($search_or_scan =~ /scan/) { # this is an index scan
+ ## This is just an index scan
+ if ($search_or_scan =~ /scan/) {
my ($term,$occ) = $result->term($i);
# here we create a minimal MARC record and hand it off to the
# template just like a normal result ... perhaps not ideal, but
@@ -4163,63 +4177,235 @@
b => $occ);
$tmprecord->append_fields($tmptitle);
push @results, $tmprecord->as_usmarc();
- } else { # this is a real search
+ ## This is a real search
+ } else {
my $rec = $result->record($i);
push(@results,$rec->raw()) if $rec; #FIXME: sometimes this fails
- ##### build facets ####
- my $tmprecord = MARC::Record->new_from_usmarc($rec->raw());
- my @subfields = $tmprecord->field('650'); #subject facets
- my @authfields = $tmprecord->field('100'); #author facets
- my @serfields = $tmprecord->field('440'); #series facets
+ ##### BUILD FACETS ####
+ my $facet_record = MARC::Record->new_from_usmarc($rec->raw());
+
+ # Define Subject Facets
+ my @subject_fields = $facet_record->field('650');
my $subject_added_entry;
- foreach my $subjectfield (@subfields) {
+ foreach my $subjectfield (@subject_fields) {
my @fields = $subjectfield->subfields();
foreach my $subfield (@fields) {
my ($code,$data) = @$subfield;
if ($code eq 'a') {
- $facets_counter{$data}++;
+ $subject_facets_counter{$data}++;
$subject_added_entry = $data;
}
+ elsif ($code eq 'x') {
+ #parent is $a
+ $subject_subdivision{$subject_added_entry}{'x'} = $data;
+ }
+
+ elsif ($code eq 'v') {
+ #check for $x (parent)
+ if ($subject_subdivision{$subject_added_entry}{'x'}) {
+ $subject_sub_subdivision{$subject_subdivision{$subject_added_entry}{'x'}}{'v'} = $data;
+ } else {
+ $subject_subdivision{$subject_added_entry}{'v'} = $data;
+ }
+ }
+ elsif ($code eq 'z') {
+ #check for $x (parent)
+ if ($subject_subdivision{$subject_added_entry}{'x'}) {
+ $subject_sub_subdivision{$subject_subdivision{$subject_added_entry}{'x'}}{'z'} = $data;
+ } else {
+ $subject_subdivision{$subject_added_entry}{'z'} = $data;
+ }
+ }
+ elsif ($code eq 'y') {
+ #check for $x (parent)
+ if ($subject_subdivision{$subject_added_entry}{'x'}) {
+ $subject_sub_subdivision{$subject_subdivision{$subject_added_entry}{'x'}}{'y'} = $data;
+ } else {
+ $subject_subdivision{$subject_added_entry}{'y'} = $data;
+ }
+ }
}
my $fieldstring = $subjectfield->as_string();
- $facets_counter_subs{$subject_added_entry} = $fieldstring;
+ if ($fieldstring eq $subject_added_entry) {
+ } else {
+ $subject_facets_counter_subs{$subject_added_entry} = $fieldstring;
+ }
}
+ # Define Series Facets
+ my @series_fields = $facet_record->field('440');
+ push @series_fields, $facet_record->field('490');
+ my $series_title;
+ foreach my $seriesfield (@series_fields) {
+ my @fields = $seriesfield->subfields();
+ foreach my $subfield (@fields) {
+ my ($code,$data) = @$subfield;
+ if ($code eq 'a') {
+ $series_facets_counter{$data}++;
+ }
+ }
+ }
+ # Define Author Facets
+ my @author_fields = $facet_record->field('100');
+ push @author_fields, $facet_record->field('700');
+ my $author;
+ foreach my $authorfield (@author_fields) {
+ my @fields = $authorfield->subfields();
+ foreach my $subfield (@fields) {
+ my ($code,$data) = @$subfield;
+ if ($code eq 'a') {
+ $author_facets_counter{$data}++;
+ }
+ }
}
}
- #foreach my $value (keys %facets_counter_subs) {
- # my %facets_row = (
- # 'facetsubjectsub' => $value,
- # );
- # push @facets_counter_subs_array, \%facets_row; #facets_counter_subs{$subject_added_entry};
- #}#
- foreach my $value (sort { $facets_counter{$b} <=> $facets_counter{$a} } keys %facets_counter) {
-
- #foreach my $subvalue (keys %facets_counter_subs) {
- # my %facets_row = (
- # 'facetsubjectsub' => $facets_counter_subs{$subvalue}, #$subvalue{$value},
- # );
- # push @facets_counter_subs_array, \%facets_row;
- #}#
-
-
- my %facets_row = (
- 'facetsubject' => $value,
- 'facetcount' => $facets_counter{$value},
- 'facetcountersubs' => \@facets_counter_subs_array, #%facets_counter_subs->{$value},
- );
- push @facets,\%facets_row;
-
}
- #while( my ($k, $v) = each %$facets_counter ) {
- # my %facets_row = (
- # 'facetsubject' => $k,
- # 'facetcount' => $v,
- # );
- # push @facets,\%facets_row;
- #}#
- return(undef,$numresults,\@facets, at results);
+ # BUILD FACETS
+ foreach my $value (sort { $subject_facets_counter{$b} <=> $subject_facets_counter{$a} } keys %subject_facets_counter) {
+ my $linkvalue = $value;
+ my $captionvalue = $value;
+ my $count = $subject_facets_counter{$value};
+ $linkvalue =~ s/\'/\\\'/g;
+ $captionvalue =~ s/\'/'/g;
+ if (!$subject_facets) { # the first one shouldn't have the comma
+ $subject_facets .= "
+ [";
+ } else {
+ $subject_facets .="
+ ,[";
+ }
+
+ $subject_facets.="
+ \' $captionvalue ( $count )\','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue"'";
+
+ for my $key (keys %subject_subdivision) {
+ if ($key eq $value) {
+ if ($subject_subdivision{$value}{'x'}) {
+ my $subdivision_linkvalue = $subject_subdivision{$value}{'x'};
+ my $subdivision_captionvalue = $subject_subdivision{$value}{'x'};
+ $subdivision_linkvalue=~ s/\'/\\\'/g;
+ $subdivision_captionvalue=~ s/\'/'/g;
+
+ $subject_facets .= ",[\' $subdivision_captionvalue\',\'/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue" and su="$subdivision_linkvalue"\'";
+
+ # Most of the time, $x is a parent for $v, $z, $y
+ for my $key (keys %subject_sub_subdivision) {
+ if ($key eq $subject_subdivision{$value}{'x'}) {
+ my $sub_subdivision_linkvalue;
+ my $sub_subdivision_captionvalue;
+ if ($subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'v'}) {
+ $sub_subdivision_linkvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'v'};
+ $sub_subdivision_captionvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'v'};
+ }
+ elsif ($subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'z'}) {
+ $sub_subdivision_linkvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'z'};
+ $sub_subdivision_captionvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'z'};
+ }
+ elsif ($subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'y'}) {
+ $sub_subdivision_linkvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'y'};
+ $sub_subdivision_captionvalue = $subject_sub_subdivision{$subject_subdivision{$value}{'x'}}{'y'};
+ }
+
+ $sub_subdivision_linkvalue=~ s/\'/\\\'/g;
+ $sub_subdivision_captionvalue=~ s/\'/'/g;
+ $subject_facets .= ",[\' $sub_subdivision_captionvalue \',\'/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue" and su="$subdivision_linkvalue" and su="$sub_subdivision_linkvalue"\']";
+ }
+ }
+ $subject_facets .= "]";
+ }
+ # Other times, $a is the parent for $v $z $y
+ if ($subject_subdivision{$value}{'v'}) {
+ my $subdivision_linkvalue = $subject_subdivision{$value}{'v'};
+ my $subdivision_captionvalue = $subject_subdivision{$value}{'v'};
+ $subdivision_linkvalue=~ s/\'/\\\'/g;
+ $subdivision_captionvalue=~ s/\'/'/g;
+ $subject_facets .= ",[\' $subdivision_captionvalue\',\'/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue" and su="$subdivision_linkvalue"\']";
+ }
+ if ($subject_subdivision{$value}{'z'}) {
+ my $subdivision_linkvalue = $subject_subdivision{$value}{'z'};
+ my $subdivision_captionvalue = $subject_subdivision{$value}{'z'};
+ $subdivision_linkvalue=~ s/\'/\\\'/g;
+ $subdivision_captionvalue=~ s/\'/'/g;
+ $subject_facets .= ",[\' $subdivision_captionvalue\',\'/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue" and su="$subdivision_linkvalue"\']";
+ }
+ if ($subject_subdivision{$value}{'y'}) {
+ my $subdivision_linkvalue = $subject_subdivision{$value}{'y'};
+ my $subdivision_captionvalue = $subject_subdivision{$value}{'y'};
+ $subdivision_linkvalue=~ s/\'/\\\'/g;
+ $subdivision_captionvalue=~ s/\'/'/g;
+ $subject_facets .= ",[\' $subdivision_captionvalue\',\'/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=su="$linkvalue" and su="$subdivision_linkvalue"\']";
+ }
+ }
+ }
+ $subject_facets .= "]";
+ }
+
+ # Build series facets
+ foreach my $value (sort { $series_facets_counter{$b} <=> $series_facets_counter{$a} } keys %series_facets_counter) {
+ my $linkvalue = $value;
+ my $captionvalue = $value;
+ my $count = $series_facets_counter{$value};
+ $linkvalue =~ s/\'/\\\'/g;
+ $captionvalue =~ s/\'/'/g;
+ if (!$series_facets) { # the first one shouldn't have the comma
+ $series_facets .="
+ [";
+ } else {
+ $series_facets .="
+ ,[";
+ }
+ $series_facets.="
+ \' $captionvalue ( $count )\','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=series="$linkvalue"'";
+ $series_facets.="]";
+ }
+ # Build author facets
+ foreach my $value (sort { $author_facets_counter{$b} <=> $author_facets_counter{$a} } keys %author_facets_counter) {
+ my $linkvalue = $value;
+ my $captionvalue = $value;
+ my $count = $author_facets_counter{$value};
+ $linkvalue =~ s/\'/\\\'/g;
+ $captionvalue =~ s/\'/'/g;
+ if (!$author_facets) { # the first one shouldn't have the comma
+ $author_facets .="
+ [";
+ } else {
+ $author_facets .="
+ ,[";
+ }
+ $author_facets.="
+ \' $captionvalue ( $count )\','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=au="$linkvalue"'";
+ $author_facets.="]";
+ }
+
+ # POPULATE SUBJECT FACETS
+ if ($subject_facets) {
+ $facets.="var SUBJECT_TREE = [
+ ['Subjects', 0,
+ $subject_facets
+ ]];\n";
+ }
+ else { $facets.="var SUBJECT_TREE = '';\n"; }
+
+ # POPULATE SERIES FACETS
+ if ($series_facets) {
+ $facets.="var SERIES_TREE = [
+ ['Series', 0,
+ $series_facets
+ ]];\n";
+ }
+ else { $facets.="var SERIES_TREE = '';\n"; }
+
+ # POPULATE AUTHOR FACETS
+ if ($author_facets) {
+ $facets.="var AUTHOR_TREE = [
+ ['Authors', 0,
+ $author_facets
+ ]];\n";
+ }
+ else { $facets.="var AUTHOR_TREE = '';\n"; }
+ #$facets.="];";
+ return(undef,$numresults,$facets, at results);
}
END { } # module clean-up code here (global destructor)
Index: koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.19.2.2
retrieving revision 1.1.2.19.2.3
diff -u -b -r1.1.2.19.2.2 -r1.1.2.19.2.3
--- koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl 21 Jul 2006 21:10:36 -0000 1.1.2.19.2.2
+++ koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.19.2.3
@@ -196,7 +196,7 @@
<h4>
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
<!-- TMPL_IF NAME="amazonisbn" -->
- <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="amazonisbn" -->&store=books">Add your own review</a></h4>
+ <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="amazonisbn" -->&store=books">Add your own review</a></h4>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP --><br/>
Index: koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-passwd.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl 4 Feb 2006 16:52:01 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.3.2.1
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- CONTENT -->
Index: koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl 4 Feb 2006 16:52:01 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/npl/en/opac-readingrecord.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.3.2.1
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
<div id="main">
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.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 21 Jul 2006 21:49:38 -0000 1.1.2.6
+++ koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.7
@@ -1,51 +1,18 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF NAME="searchdesc" -->Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'<!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close-cat-zoom.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
-<!-- Facets -->
-<div id="nav">
-<ul>
-<li>Relevant Subjects</li>
-<!-- TMPL_LOOP NAME="FACETS" -->
- <li><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&pqf_query=@attr 1=21 "<!-- TMPL_VAR NAME="facetsubject" -->""><!-- TMPL_VAR NAME="facetsubject" --></a> (<!-- TMPL_VAR NAME="facetcount" -->)<ul>
- <!-- TMPL_LOOP NAME="facetcountersubs" -->
- <!-- TMPL_VAR NAME="facetsubjectsub" -->
- <!-- /TMPL_LOOP -->
- </ul>
- </li>
-<!-- /TMPL_LOOP -->
-</ul>
-</div>
-
+<!-- TMPL_INCLUDE NAME="navigation.inc" -->
<div id="main">
-
+<!-- TMPL_IF NAME="koha_spsuggest" --><div style="font-size: 12px;">Did you mean: <ul style="list-style: none;"><!-- TMPL_LOOP NAME="SPELL_SUGGEST" --> <li><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=<!-- TMPL_VAR NAME="spsuggestion" -->"><!-- TMPL_VAR NAME="spsuggestion" --></a></li><!-- /TMPL_LOOP --></ul></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="total" -->
+<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="searchdesc" -->
-
-<h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span></h3>
- <!-- <h4><!-- TMPL_VAR NAME="total" --> Records Found</h4> -->
-
- <!-- <div class="pages">
- <!-- Row of numbers corresponding to search result pages -->
- <!-- TMPL_LOOP NAME="numbers" -->
- <!-- TMPL_IF NAME="highlight" -->
- <span class="current"><!-- TMPL_VAR NAME="number" --></span> <!-- TMPL_ELSE --><a class="nav" href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&pg=<!-- TMPL_VAR NAME="pg" -->&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->"><!-- TMPL_VAR NAME=number --></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
-</div> -->
- <div id="results"><!-- TMPL_IF name=total -->
- Results <b><!-- TMPL_VAR NAME="starting" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="total" --></b> records.
- <!-- TMPL_ELSE -->
- <p>
- No results match your search for "<!-- TMPL_VAR NAME="searchdesc" -->" in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
- </p>
- <p>
- <!-- TMPL_VAR NAME="search_error" -->
- </p>
- <!-- /TMPL_IF --></div>
-
+No results match your search for <span style="font-weight: bold;">“<!-- TMPL_VAR NAME="searchdesc" -->”</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
<!-- TMPL_ELSE -->
- <h3>You did not specify any search criteria</h3>
+You did not specify any search criteria.
<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
<!-- Search Results Table -->
<!-- TMPL_IF NAME="total" -->
@@ -100,7 +67,7 @@
</table>
</form>
<!-- TMPL_ELSE -->
-<div id="sort"><form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
+<form style="float:right;" action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
<input type="hidden" name="op" value="get_results" />
<input type="hidden" name="pqf_query" value="<!-- TMPL_VAR NAME="pqf_query" escape="html" -->" />
<input type="hidden" name="ccl_query" value="<!-- TMPL_VAR NAME="ccl_query" escape="html" -->" />
@@ -115,11 +82,10 @@
</select>
<input type="submit" value="Sort" class="submit" />
</form>
-</div>
-<!-- TMPL_IF NAME="opacbookbag" -->
-<form action="opac-searchresults.pl" method="get" name="myform">
+<!-- TMPL_IF NAME="opacbookbag" --><form action="opac-searchresults.pl" method="get" name="myform">
<input type="submit" class="icon addchecked" value="Add Checked Items to Book Bag" onclick="addMultiple(); return false;"/> <input type="reset" value="Clear All" class="icon clearall"/><!-- /TMPL_IF -->
+
<table>
<tr>
<th><!--TMPL_IF NAME="opacbookbag" --><a href="#" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a><!-- TMPL_ELSE --> <!-- /TMPL_IF --></th>
@@ -130,7 +96,7 @@
<!-- /TMPL_IF -->
<th><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Author<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=1003 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
- <th nowrap><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=12 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Call Num<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=12 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
+ <th nowrap="nowrap"><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=12 <i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↓</a>Call Num<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&then_sort_by=1=12 >i&ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">↑</a></th>
<th>Availablity</th>
</tr>
<!-- Actual Search Results -->
@@ -139,7 +105,7 @@
<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
<td><!--TMPL_IF NAME="opacbookbag" --><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="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /><!--TMPL_IF NAME="opacbookbag" --></label><br /><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_IF --></td>
<!-- TMPL_IF NAME="AmazonContent" -->
-<td><div class="menu"> <a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="Book Cover Image" class="thumbnail" /></a></div></td>
+<td><div class="menu"> <a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="image" class="thumbnail" /></a></div></td>
<!-- /TMPL_IF -->
<td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
Index: koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.11.2.1
retrieving revision 1.1.2.11.2.2
diff -u -b -r1.1.2.11.2.1 -r1.1.2.11.2.2
--- koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl 11 Jul 2006 14:06:57 -0000 1.1.2.11.2.1
+++ koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.11.2.2
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- CONTENT -->
Index: koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl 17 Mar 2005 22:39:57 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/npl/en/opac-userdetails.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.1.2.1
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
Index: koha-tmpl/opac-tmpl/npl/en/opac-zoomsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-zoomsearch.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- koha-tmpl/opac-tmpl/npl/en/opac-zoomsearch.tmpl 21 Jul 2006 16:53:03 -0000 1.1.2.7
+++ koha-tmpl/opac-tmpl/npl/en/opac-zoomsearch.tmpl 23 Jul 2006 18:02:09 -0000 1.1.2.8
@@ -30,16 +30,6 @@
</form></div>
<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!--<h2>CQL Search</h2> -->
-
-<!-- <form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
- <input type="hidden" name="query_form" value="cql" />
- <input type="hidden" name="op" value="get_results" />
- <p><input size="55" type="text" name="cql_query" />
- <a href="#" class="help" onclick="window.open('http://www.loc.gov/standards/sru/cql/#sample','CQL Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return false;">[ ? ]</a></p>
-
-<p style="text-align:center;"><input type="submit" value="Catalog Search" class="submit" /></p>
-</form> -->
<form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="simple_search_form">
<input type="hidden" name="query_form" value="ccl" />
<input type="hidden" name="op" value="get_results" />
Index: koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-cat-zoom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/doc-head-close-cat-zoom.inc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-cat-zoom.inc 10 Jun 2006 15:51:31 -0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-cat-zoom.inc 23 Jul 2006 18:02:09 -0000 1.1.2.3
@@ -16,7 +16,34 @@
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
</style>
<!-- /TMPL_IF -->
-<script language="JavaScript" type="text/javascript">
+<!-- Tigra Menus -->
+<style type="text/css">
+.intd td {
+ padding: 0;
+}
+i_txt0_0 {
+ color: #000000;
+ font-size: 14px;
+}
+td .intd {
+ width: 100px;
+}
+.intd table {
+ border-collapse: separate;
+ margin : 0;
+ padding : 0;
+}
+.ctrl {
+ padding:0;
+}
+</style>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/tigra/tree.js"></script>
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/tigra/tree_tpl.js"></script>
+<script type="text/javascript" language="javascript">
+<!-- TMPL_VAR NAME="facets" -->
+</script>
+<!-- /Tigra -->
+<script language="javascript" type="text/javascript">
function Help() {
newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
@@ -54,13 +81,18 @@
if ((dict == 'all') || (dict == 'publicationyear')) {
alert("The selected field is not correct to search on dictionary.");
} else {
- var dict_window = window.open('/cgi-bin/koha/dictionary.pl?dictionary=' + dict + '&search=' + search + '&target=' + target,'_blanck','height=325,width=550,status=no,toolbar=no,menubar=no,location=no,resizable=no,top=100,left=100');
+ var dict_window = window.open('/cgi-bin/koha/dictionary.pl?dictionary=' + dict + '&search=' + search + '&target=' + target,'_blanck','height=325,width=550,status=no,toolbar=no,menubar=no,location=no,resizable=no,top=100,left=100');
dict_window.focus();
}
}
</script>
<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/catsearch.js"></script>
+<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/main.js"></script>
+<!-- TMPL_IF NAME="AmazonContent" -->
+<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/amazonimages.js"></script>
+<!-- /TMPL_IF -->
+<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>
<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/basket.js"></script>
<script type="text/javascript" language="javascript">
var MSG_BASKET_EMPTY = "You book bag is currently empty";
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.2
retrieving revision 1.1.2.8.2.3
diff -u -b -r1.1.2.8.2.2 -r1.1.2.8.2.3
--- koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc 21 Jul 2006 16:26:24 -0000 1.1.2.8.2.2
+++ koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc 23 Jul 2006 18:02:09 -0000 1.1.2.8.2.3
@@ -1,23 +1,37 @@
<div id="masthead">
-<h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!-- /TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
-<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></p> <p><label for="quick_ccl_query">Search the Catalog</label><input type="hidden" name="op" value="get_results" />
-<input name="ccl_query" id="quick_ccl_query" type="text" />
+
+<h4><a style="text-decoration:none; border:0; " href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_IF NAME="opacsmallimage" --><img style="border:0;" alt="<!-- TMPL_VAR NAME="LibraryName" -->" title= "<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /></a><!-- /TMPL_IF --></h4>
+<div class="menu">
+
+<form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
+<p>
+<input type="hidden" name="query_form" value="advanced" />
+
+<label for="quick_ccl_query">Search</label>
+<input type="hidden" name="op" value="get_results" />
+<select name="search_point1" id="search_point1">
+ <option selected="selected" value="@attr 4=6 @attr 1=1016">Keyword</option>
+ <option value="@attr 1=4 @attr 4=1 @attr 5=1">Title</option>
+ <option value="@attr 4=1 @attr 6=3 @attr 1=4">Exact Title</option>
+ <option value="@attr 1=1003 @attr 4=1 @attr 5=1">Author</option>
+ <option value="@attr 1=21">Subject</option>
+ <option value="@attr 1=5">Series</option>
+ <option value="@attr 1=1018">Publisher</option>
+ <option value="@attr 1=8001">Acquisition Date</option>
+ <option value="@attr 1=12">Call Number</option>
+</select>
+ <input type="text" name="query1" style="width: 320px;"/>
<input type="submit" value="Search" class="submit" /></p>
</form></div>
-<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+<div id="members">
<ul>
- <li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
+ <!-- TMPL_IF NAME="loggedinusername" --><li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li><!-- TMPL_ELSE --><li style="list-style:none;"><a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a></li><!-- /TMPL_IF -->
<!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
- <li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
+ <!-- TMPL_IF NAME="opacbookbag" --> <li><a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A "shopping cart" for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></li><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="loggedinusername" --><li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- /TMPL_IF -->
</ul>
</div>
-<!-- TMPL_ELSE -->
- <div id="members">
- <a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
- </div>
-<!-- /TMPL_IF -->
-<br class="clear" /><!-- /TMPL_IF -->
+<br class="clear" />
</div>
Index: koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4.2.2
retrieving revision 1.2.2.4.2.3
diff -u -b -r1.2.2.4.2.2 -r1.2.2.4.2.3
--- koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc 17 Jul 2006 08:04:19 -0000 1.2.2.4.2.2
+++ koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc 23 Jul 2006 18:02:09 -0000 1.2.2.4.2.3
@@ -1,2 +1,33 @@
-<div id="nav">
+<div id="mesg">
+<ul style="list-style:none; margin : 0 0% 0% 1%; padding: 0 0 2px 0 ; font-family : Arial, Geneva, Helvetica, sans-serif; font-size : .75em; " >
+<li>
+<!-- TMPL_IF NAME="searchdesc" -->
+
+<!-- TMPL_IF name=total -->
+<span style="color:#FEEDDB; font-weight: bold;">“<!-- TMPL_VAR NAME="searchdesc" -->”</span> returned <span><!-- TMPL_VAR NAME="total" --></span> results<!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->.</li>
+<!-- TMPL_ELSE -->
+<span style="color:#FEEDDB; font-weight: bold;">“<!-- TMPL_VAR NAME="searchdesc" -->”</span>
+<!-- TMPL_VAR NAME="search_error" -->
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</li>
+</ul>
+</div>
+
+<div style="overflow: auto;" id="nav">
+<!-- TMPL_VAR NAME="OpacNav" -->
+<!-- TMPL_IF NAME="facets" -->
+ <!-- Sample -->
+ <table style="width:18%; padding : 0; margin : 0;">
+ <tr><td class="intd">
+ <script type="text/javascript" language="javascript">
+ <!--
+ new tree (SUBJECT_TREE, subject_tpl);
+ new tree (SERIES_TREE, series_tpl);
+ new tree (AUTHOR_TREE, author_tpl);
+ //-->
+ </script>
+ </td></tr>
+ </table>
+<!-- /TMPL_IF -->
</div>
Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-bottom.inc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-bottom.inc 7 Feb 2006 22:50:11 -0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-bottom.inc 23 Jul 2006 18:02:09 -0000 1.1.2.2.2.1
@@ -1,3 +1,4 @@
+
<!-- TMPL_IF NAME="opaccredits" --><div id="footer"><!-- TMPL_VAR NAME="opaccredits" --></div><!-- /TMPL_IF -->
</body>
</html>
Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.npl.css,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -b -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css 11 Jul 2006 14:06:57 -0000 1.1.2.1.2.2
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css 23 Jul 2006 18:02:09 -0000 1.1.2.1.2.3
@@ -406,6 +406,10 @@
color : #D8DEB8;
}
+#itemReviews {
+ background-color: #FFFFCC;
+}
+
#itemReviews dt {
border-bottom: 1px solid #ddd;
}
Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.css,v
retrieving revision 1.1.2.4.2.3
retrieving revision 1.1.2.4.2.4
diff -u -b -r1.1.2.4.2.3 -r1.1.2.4.2.4
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css 21 Jul 2006 16:26:24 -0000 1.1.2.4.2.3
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css 23 Jul 2006 18:02:09 -0000 1.1.2.4.2.4
@@ -787,16 +787,27 @@
clear : both;
line-height : .1em;
}
+
+#itemReviews {
+ font-size : .9em;
+ margin : 0 auto;
+ padding : 5px;
+ width : 95%;
+}
+
#itemReviews h4 {
display: inline;
margin-right: 15px;
}
+
#itemReviews p {
text-align: left;
}
+
#itemReviews dl {
display: block ;
}
+
#itemReviews dt {
width: 8em;
}
Index: opac/opac-zoomsearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-zoomsearch.pl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- opac/opac-zoomsearch.pl 21 Jul 2006 17:19:39 -0000 1.1.2.11
+++ opac/opac-zoomsearch.pl 23 Jul 2006 18:02:09 -0000 1.1.2.12
@@ -76,34 +76,36 @@
# STEP 2. OK, now we have PQF, so we can pass off the query to
# the API
- my ($count, @results, $facets);
+ my ($count, @results,$facets);
# queries are handled differently, so alert our API and pass in the variables
if ($query->param('ccl_query')) { # CCL
if ($query->param('scan')) {
- ($error,$count,$facets, @results) = searchZOOM('scan','ccl',$ccl_query,$number_of_results,$startfrom,$then_sort_by);
+ ($error,$count, $facets, at results) = searchZOOM('scan','ccl',$ccl_query,$number_of_results,$startfrom,$then_sort_by);
$template->param(scan => 1);
} else {
($error,$count,$facets, at results) = searchZOOM('search','ccl',$ccl_query,$number_of_results,$startfrom,$then_sort_by);
}
} elsif ($query->param('cql_query')) { # CQL
if ($query->param('scan')) {
- ($error,$count,$facets, @results) = searchZOOM('scan','cql',$cql_query,$number_of_results,$startfrom,$then_sort_by);
+ ($error,$count,$facets, at results) = searchZOOM('scan','cql',$cql_query,$number_of_results,$startfrom,$then_sort_by);
$template->param(scan => 1);
} else {
- ($error,$count,$facets, @results) = searchZOOM('search','cql',$cql_query,$number_of_results,$startfrom,$then_sort_by);
+ ($error,$count,$facets, at results) = searchZOOM('search','cql',$cql_query,$number_of_results,$startfrom,$then_sort_by);
}
} else { # we're in PQF territory now
if ($query->param('scan')) {
$template->param(scan => 1);
- ($error,$count,$facets, @results) = searchZOOM('scan','pqf',"$pqf_sort_by $pqf_prox_ops $pqf_bool_ops $pqf_query",$number_of_results,$startfrom,$then_sort_by);
+ ($error,$count,$facets, at results) = searchZOOM('scan','pqf',"$pqf_sort_by $pqf_prox_ops $pqf_bool_ops $pqf_query",$number_of_results,$startfrom,$then_sort_by);
} else {
- ($error,$count,$facets, @results) = searchZOOM('search','pqf',"$pqf_sort_by $pqf_prox_ops $pqf_bool_ops $pqf_query",$number_of_results,$startfrom,$then_sort_by);
+ ($error,$count,$facets, at results) = searchZOOM('search','pqf',"$pqf_sort_by $pqf_prox_ops $pqf_bool_ops $pqf_query",$number_of_results,$startfrom,$then_sort_by);
}
}
- $template->param(FACETS => $facets) if $facets;
@newresults=searchResults( $number_of_results,$count, at results) ;
+
+ # How many did we get back?
my $num = scalar(@newresults);
+
# sorting out which results to display.
# the result number to start to show
$template->param(starting => $startfrom+1);
@@ -118,6 +120,7 @@
$template->param(searchdesc => $searchdesc );
$template->param(results_per_page => $number_of_results );
$template->param(SEARCH_RESULTS => \@newresults);
+ $template->param(facets => $facets);
#this is to show the page numbers to navigate among the results, whether it has to show the number highlighted or not
my $numbers;
@@ -161,13 +164,15 @@
for (my $i =$from; $i <= $to ; $i++) {
if ($i == $pg) {
if ($count > $number_of_results) {
- push @$numbers, { number => $i,
+ push @$numbers, {
+ number => $i,
highlight => 1 ,
startfrom => ($i-1)*$number_of_results ,
pg => $i };
}
} else {
- push @$numbers, { number => $i,
+ push @$numbers, {
+ number => $i,
highlight => 0 ,
startfrom => ($i-1)*$number_of_results ,
pg => $i };
@@ -175,12 +180,14 @@
}
if ($pg < $pages) {
$url = $pg + 1;
- push @$numbers, { number => ">",
+ push @$numbers, {
+ number => ">",
highlight => 0 ,
startfrom => ($url-1)*$number_of_results,
pg => $url };
- push @$numbers, { number => ">>",
+ push @$numbers, {
+ number => ">>",
highlight => 0 ,
startfrom => ($total_pages-1)*$number_of_results,
pg => $total_pages};
@@ -207,6 +214,49 @@
scan_use => $scan_use,
search_error => $error,
);
+
+ ## Now let's find out if we have any supplemental data to show the user
+ # and in the meantime, save the current query for statistical purposes, etc.
+ my $koha_spsuggest; # a flag to tell if we've got suggestions coming from Koha
+ my @koha_spsuggest; # place we store the suggestions to be returned to the template as LOOP
+ my $phrases = $searchdesc;
+ my $ipaddress;
+
+ if ( C4::Context->preference("kohaspsuggest") ) {
+ my $koha_spsuggest_dbh;
+ eval {
+ $koha_spsuggest_dbh=DBI->connect("DBI:mysql:suggest:66.213.78.76","auth","Free2cirC");
+ };
+ if ($@) { warn "can't connect to spsuggest db";
+ }
+ else {
+ my $koha_spsuggest_insert = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";
+ my $koha_spsuggest_query = "SELECT display FROM distincts WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";
+ my $koha_spsuggest_sth = $koha_spsuggest_dbh->prepare($koha_spsuggest_query);
+ $koha_spsuggest_sth->execute($phrases);
+ while (my $spsuggestion = $koha_spsuggest_sth->fetchrow_array) {
+ $spsuggestion =~ s/(:|\/)//g;
+ my %line;
+ $line{spsuggestion} = $spsuggestion;
+ push @koha_spsuggest,\%line;
+ $koha_spsuggest = 1;
+ }
+
+ # 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->finish;
+
+ $template->param( koha_spsuggest => $koha_spsuggest ) unless $num;
+ $template->param( SPELL_SUGGEST => \@koha_spsuggest );
+ }
+ }
+
+ ## Spellchecking using Google API
+ ## Did you mean? Suggestions using spsuggest table
+ #
+ # Related Searches
+ #
## OK, we're not searching, load the search template
} else {
More information about the Koha-cvs
mailing list