[Koha-cvs] koha C4/Search.pm koha-tmpl/opac-tmpl/npl/en/in... [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/25 18:13:46

Modified files:
	C4             : Search.pm 
	koha-tmpl/opac-tmpl/npl/en/includes: doc-head-close.inc 
	opac           : opac-zoomsearch.pl 

Log message:
	adding <span> elements around search terms

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.12&r2=1.99.2.11.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.4&r2=1.1.2.11.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-zoomsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.17&r2=1.1.2.18

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.12
retrieving revision 1.99.2.11.2.13
diff -u -b -r1.99.2.11.2.12 -r1.99.2.11.2.13
--- C4/Search.pm	24 Jul 2006 05:26:19 -0000	1.99.2.11.2.12
+++ C4/Search.pm	25 Jul 2006 18:13:45 -0000	1.99.2.11.2.13
@@ -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.12 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.13 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -4419,14 +4419,14 @@
 
 
 sub searchResults {
-    my ($num,$count, at marcresults)=@_;
+    my ($searchdesc,$num,$count, at marcresults)=@_;
     use C4::Date;
 
     my $dbh= C4::Context->dbh;
     my $toggle;
     my $even=1;
     my @newresults;
-
+	my @span_terms = split (/ /, $searchdesc);
     #Build brancnames hash
     #find branchname
     #get branch information.....
@@ -4459,6 +4459,19 @@
         my $marcrecord;
         $marcrecord = MARC::File::USMARC::decode($marcresults[$i]);
         my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,'');
+		# add spans to search term in results
+		foreach my $term (@span_terms) {
+			$term =~ s/.*=//g;
+			$oldbiblio->{'title'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$oldbiblio->{'subtitle'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$oldbiblio->{'author'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$oldbiblio->{'publishercode'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$oldbiblio->{'place'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$oldbiblio->{'pages'} =~ s/$term/<span class=term>$term<\/span>/gi;
+			$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";
         } else {

Index: koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.11.2.4
retrieving revision 1.1.2.11.2.5
diff -u -b -r1.1.2.11.2.4 -r1.1.2.11.2.5
--- koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc	24 Jul 2006 13:05:33 -0000	1.1.2.11.2.4
+++ koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc	25 Jul 2006 18:13:46 -0000	1.1.2.11.2.5
@@ -16,7 +16,13 @@
     @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
 </style>
     <!-- /TMPL_IF -->
+<style type="text/css">
 
+.term {
+font-weight: bold;
+color: red;
+}
+</style>
 <!-- TMPL_IF NAME="livesearch" -->
 <style type="text/css">
 	@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/livesearch.css);

Index: opac/opac-zoomsearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-zoomsearch.pl,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -b -r1.1.2.17 -r1.1.2.18
--- opac/opac-zoomsearch.pl	24 Jul 2006 13:05:33 -0000	1.1.2.17
+++ opac/opac-zoomsearch.pl	25 Jul 2006 18:13:46 -0000	1.1.2.18
@@ -117,9 +117,7 @@
 	# STEP 1. We're a CGI script,so first thing to do is get the
 	# query into PQF format so we can use the Koha API properly
 	my ($error,$pqf_sort_by, $pqf_prox_ops, $pqf_bool_ops, $nice_query);
-	if ($pqf_query) {
 		($error,$pqf_sort_by, $pqf_prox_ops, $pqf_bool_ops, $pqf_query, $nice_query)= cgi2pqf($query);
-	}
 	my $then_sort_by = $query->param('then_sort_by');
 	# implement a query history
 
@@ -131,7 +129,6 @@
 	push @forminputs, { field => 'pqf_bool_ops' , value => $pqf_bool_ops};
 	push @forminputs, { field => 'pqf_query' , value => $pqf_query };
 	$searchdesc=$cql_query.$ccl_query.$nice_query; # FIXME: this should be a more use-friendly string
-	my @bold_terms = split (/ /, $searchdesc);
 
 	# STEP 2. OK, now we have PQF, so we can pass off the query to
 	# the API
@@ -160,7 +157,7 @@
 			($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);
 		}
 	}
-	@newresults=searchResults( $number_of_results,$count, at results) ;
+	@newresults=searchResults( $searchdesc,$number_of_results,$count, at results) ;
 
 	# How many did we get back?
 	my $num = scalar(@newresults);