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

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/28 14:22:27

Modified files:
        C4             : Search.pm 
        koha-tmpl/opac-tmpl/npl/en: opac-detail.tmpl 

Log message:
        fix a bug in search when term contains ( or )

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.14&r2=1.99.2.11.2.15
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.4&r2=1.1.2.19.2.5

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.14
retrieving revision 1.99.2.11.2.15
diff -u -b -r1.99.2.11.2.14 -r1.99.2.11.2.15
--- C4/Search.pm        28 Jul 2006 01:45:34 -0000      1.99.2.11.2.14
+++ C4/Search.pm        28 Jul 2006 14:22:27 -0000      1.99.2.11.2.15
@@ -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.14 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.15 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -4105,6 +4105,7 @@
 
        # prepare the query depending on the type
     if ($type eq 'ccl') {
+               $query =~ s/(\(|\))//g;
         eval {
                $zoom_query_obj = new ZOOM::Query::CCL2RPN($query,$zconn);
                };

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.4
retrieving revision 1.1.2.19.2.5
diff -u -b -r1.1.2.19.2.4 -r1.1.2.19.2.5
--- koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl 25 Jul 2006 15:06:27 -0000      
1.1.2.19.2.4
+++ koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl 28 Jul 2006 14:22:27 -0000      
1.1.2.19.2.5
@@ -120,7 +120,7 @@
 <!--INFORMATION ROWS-->
 <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" 
-->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
+<td><!-- TMPL_VAR NAME="dewey" --></td>
                                <td>
                                        <!-- TMPL_VAR NAME="branchname" --> 
<!-- TMPL_VAR NAME="location" --> 
                                        <!-- TMPL_IF name="itemcallnumber" -->