[Koha-cvs] koha C4/Search.pm koha-tmpl/opac-tmpl/npl/en/op... [dev_week]
Joshua Ferraro
jmf at kados.org
Fri Jul 28 03:45:34 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/28 01:45:34
Modified files:
C4 : Search.pm
koha-tmpl/opac-tmpl/npl/en: opac-results.tmpl
koha-tmpl/opac-tmpl/npl/en/includes: navigation.inc
opac-facets.inc
Log message:
Reverting to a simpler subject facets until we can all
agree on a more complex one. The current one just uses
a single subfield from the record to display each facet.
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.13&r2=1.99.2.11.2.14
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.8&r2=1.1.2.9
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.8&r2=1.2.2.4.2.9
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.3&r2=1.1.2.4
Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.13
retrieving revision 1.99.2.11.2.14
diff -u -b -r1.99.2.11.2.13 -r1.99.2.11.2.14
--- C4/Search.pm 25 Jul 2006 18:13:45 -0000 1.99.2.11.2.13
+++ C4/Search.pm 28 Jul 2006 01:45:34 -0000 1.99.2.11.2.14
@@ -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.13 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.14 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -4184,51 +4184,16 @@
##### BUILD FACETS ####
my $facet_record = MARC::Record->new_from_usmarc($rec->raw());
- # Define Subject Facets
+ # Define Series Facets
my @subject_fields = $facet_record->field('650');
- my $subject_added_entry;
+ my $subject_term;
foreach my $subjectfield (@subject_fields) {
my @fields = $subjectfield->subfields();
foreach my $subfield (@fields) {
my ($code,$data) = @$subfield;
if ($code eq 'a') {
$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();
- if ($fieldstring eq $subject_added_entry) {
- } else {
- $subject_facets_counter_subs{$subject_added_entry} = $fieldstring;
}
}
@@ -4267,77 +4232,38 @@
my $count = $subject_facets_counter{$value};
$linkvalue =~ s/\'/\\\'/g;
$captionvalue =~ s/\'/'/g;
+ }
+
+ # Build subject facets
+ my $number_of_subject_facets;
+ my $end_bracket;
+ foreach my $value (sort { $subject_facets_counter{$b} <=> $subject_facets_counter{$a} } keys %subject_facets_counter) {
+ $number_of_subject_facets++;
+ 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 .= "
+ $subject_facets .="
[";
- } else {
+ }
+ 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"\']";
+ \' $captionvalue ( $count )\','/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&ccl_query=subject="$linkvalue"'";
+ if ($number_of_subject_facets==5) {
+ $subject_facets.="], ['See More...',null";
+ $end_bracket = 1;
}
+ else {
+ $subject_facets.="]";
}
}
- $subject_facets .= "]";
+ if ($end_bracket) {
+ $subject_facets.="]";
}
# Build series facets
@@ -4461,6 +4387,7 @@
my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,'');
# add spans to search term in results
foreach my $term (@span_terms) {
+ if (length($term) > 3) {
$term =~ s/.*=//g;
$oldbiblio->{'title'} =~ s/$term/<span class=term>$term<\/span>/gi;
$oldbiblio->{'subtitle'} =~ s/$term/<span class=term>$term<\/span>/gi;
@@ -4471,6 +4398,7 @@
$oldbiblio->{'notes'} =~ s/$term/<span class=term>$term<\/span>/gi;
$oldbiblio->{'size'} =~ s/$term/<span class=term>$term<\/span>/gi;
}
+ }
if ($i % 2) {
$toggle="#ffffcc";
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.8
retrieving revision 1.1.2.9
diff -u -b -r1.1.2.8 -r1.1.2.9
--- koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 24 Jul 2006 04:57:52 -0000 1.1.2.8
+++ koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl 28 Jul 2006 01:45:34 -0000 1.1.2.9
@@ -104,7 +104,7 @@
<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="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>
+ <th nowrap="nowrap">Availablity</th>
</tr>
<!-- Actual Search Results -->
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.8
retrieving revision 1.2.2.4.2.9
diff -u -b -r1.2.2.4.2.8 -r1.2.2.4.2.9
--- koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc 25 Jul 2006 15:12:02 -0000 1.2.2.4.2.8
+++ koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc 28 Jul 2006 01:45:34 -0000 1.2.2.4.2.9
@@ -25,7 +25,6 @@
<script type="text/javascript" language="javascript">
<!--
new tree (DEFAULT_TREE, default_tpl);
- new tree (EXPANDS_TREE, expands_tpl);
new tree (LIMITS_TREE, limits_tpl);
new tree (SUBJECT_TREE, subject_tpl);
new tree (SERIES_TREE, series_tpl);
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.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/opac-facets.inc 24 Jul 2006 13:05:33 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-facets.inc 28 Jul 2006 01:45:34 -0000 1.1.2.4
@@ -23,12 +23,6 @@
<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/tigra/tree_tpl.js"></script>
<script type="text/javascript" language="javascript">
-var EXPANDS_TREE = <!-- TMPL_IF NAME=searchdesc -->[
- ['Remove search',null,
- ['<!-- TMPL_VAR NAME=searchdesc -->','/cgi-bin/koha/opac-zoomsearch.pl'],
- ]
-];<!-- TMPL_ELSE -->'';<!-- /TMPL_IF -->
-
<!-- TMPL_IF NAME="total" -->
var LIMITS_TREE = [
More information about the Koha-cvs
mailing list