[Koha-cvs] koha C4/AuthoritiesMarc.pm catalogue/search.pl ... [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      07/01/09 15:18:10

Modified files:
        C4             : AuthoritiesMarc.pm 
        catalogue      : search.pl 
        koha-tmpl/intranet-tmpl/prog/en/authorities: 
                                                     searchresultlist.tmpl 
        misc/zebra     : ccl.properties 

Log message:
        Adding an to ccl.properties to allow ccl search for authority-numbers.
        Fixing Some problems with the previous modification to allow pqf search 
to work for more than one page.
        Using search for an= for an authority-Number.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.12&r2=1.28.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/ccl.properties?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.2&r2=1.1.4.3

Patches:
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.12
retrieving revision 1.28.2.13
diff -u -b -r1.28.2.12 -r1.28.2.13
--- C4/AuthoritiesMarc.pm       9 Jan 2007 13:51:31 -0000       1.28.2.12
+++ C4/AuthoritiesMarc.pm       9 Jan 2007 15:18:09 -0000       1.28.2.13
@@ -280,18 +280,14 @@
 ### try ZOOM search here
 my $oConnection=C4::Context->Zconn("biblioserver",1);
 my $query;
-$query= "address@hidden 1=Koha-Auth-Number ".$authid;
+$query= "an=".$authid;
 
-my $oResult = $oConnection->search_pqf($query);
+my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query, 
$oConnection ));
 my $result;
 while ((my $i = ZOOM::event([ $oConnection ])) != 0) {
     my $ev = $oConnection->last_event();
-    warn("connection ", $i-1, ": ", ZOOM::event_str($ev), "\n");
     if ($ev == ZOOM::Event::ZEND) {
         $result = $oResult->size();
-        warn "connection ", $i-1, ": $result hits\n";
-        warn $oResult->record(0)->render()
-            if $result > 0;
     }
 }
 return ($result);
@@ -801,8 +797,8 @@
 ### try ZOOM search here
 my $oConnection=C4::Context->Zconn("biblioserver");
 my $query;
-$query= "address@hidden 1=Koha-Auth-Number ".$mergefrom;
-my $oResult = $oConnection->search_pqf($query);
+$query= "an= ".$mergefrom;
+my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query, 
$oConnection ));
 my $count=$oResult->size() if  ($oResult);
 my @reccache;
 my $z=0;
@@ -858,8 +854,13 @@
 
 =cut
 
-# $Id: AuthoritiesMarc.pm,v 1.28.2.12 2007/01/09 13:51:31 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.13 2007/01/09 15:18:09 hdl Exp $
 # $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.13  2007/01/09 15:18:09  hdl
+# Adding an to ccl.properties to allow ccl search for authority-numbers.
+# Fixing Some problems with the previous modification to allow pqf search to 
work for more than one page.
+# Using search for an= for an authority-Number.
+#
 # Revision 1.28.2.12  2007/01/09 13:51:31  hdl
 # Bug Fixing : AUTHcount_usage used *synchronous* connection where biblio used 
****asynchronous**** one.
 # First try to get it work.

Index: catalogue/search.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- catalogue/search.pl 9 Jan 2007 14:16:07 -0000       1.1.2.14
+++ catalogue/search.pl 9 Jan 2007 15:18:09 -0000       1.1.2.15
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /cvsroot/koha/koha/catalogue/Attic/search.pl,v 1.1.2.14 2007/01/09 
14:16:07 hdl Exp $
+# $Header: /cvsroot/koha/koha/catalogue/Attic/search.pl,v 1.1.2.15 2007/01/09 
15:18:09 hdl Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -424,7 +424,7 @@
         $total = $total + $results_hashref->{$server}->{"hits"};
         if ($hits) {
             $template->param(total => $hits);
-            $template->param(searchdesc => "$query_type=$search_desc" );
+            $template->param(searchdesc => 
($query_type?"$query_type=":"")."$search_desc" );
             $template->param(results_per_page =>  $results_per_page);
             $template->param(SEARCH_RESULTS => address@hidden);
 
@@ -474,7 +474,7 @@
 $template->param(
             #classlist => $classlist,
             total => $total,
-            searchdesc => "$query_type=$search_desc",
+            searchdesc => ($query_type?"$query_type=":"")."$search_desc",
             opacfacets => 1,
             facets_loop => $facets,
             suggestion => C4::Context->preference("suggestion"),

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,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/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl   13 Oct 
2006 10:25:55 -0000      1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl   9 Jan 
2007 15:18:10 -0000       1.1.2.3
@@ -32,7 +32,7 @@
       <td><!-- TMPL_VAR NAME="summary" --></td>
   <!-- TMPL_UNLESS name="isEDITORS" -->
       <td>
-        <a 
href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;address@hidden 
1=Koha-Auth-Number <!--TMPL_VAR Name="authid" -->" class="button 
authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
+        <a 
href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR
 Name="authid" -->" class="button authority"><!-- TMPL_VAR NAME="used" --> 
biblio(s)</a>
       </td>
   <!-- /TMPL_UNLESS -->
       <td>

Index: misc/zebra/ccl.properties
===================================================================
RCS file: /cvsroot/koha/koha/misc/zebra/Attic/ccl.properties,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- misc/zebra/ccl.properties   8 Dec 2006 10:16:53 -0000       1.1.4.2
+++ misc/zebra/ccl.properties   9 Jan 2007 15:18:10 -0000       1.1.4.3
@@ -1,5 +1,5 @@
 # CCL field mappings
-# $Id: ccl.properties,v 1.1.4.2 2006/12/08 10:16:53 alaurin Exp $
+# $Id: ccl.properties,v 1.1.4.3 2007/01/09 15:18:10 hdl Exp $
 # There are four types of lines in a CCL profile: 
 #  1. qualifier specification
 #      qualifier-name   [  attributeset   ,]  type   =   val   [  attributeset 
  ,]  type   =   val   ...
@@ -789,6 +789,13 @@
 #                                                           711
 Title-uniform           1=6
 ut Title-uniform
+#Authority-number         Koha-Auth-Number  The Number   
+#                           for an authority to be searched subfield $9 in the
+#                           for cataloging purposes.        following: 
700,701,702,710,
+#                                                           711,712 and some 
6XX fields (Unimarc)
+Authority-number           1=Koha-Auth-Number
+an Authority-number
+
 
 ### 2. BIB1 RELATION ATTRIBUTES
 lt 2=1