koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha detail.pl acqui/suggestion-select.pl acqui... [dev_week]


From: Joshua Ferraro
Subject: [Koha-cvs] koha detail.pl acqui/suggestion-select.pl acqui... [dev_week]
Date: Fri, 21 Jul 2006 17:46:49 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/21 17:46:48

Modified files:
        .              : detail.pl 
        acqui          : suggestion-select.pl 
        acqui.simple   : addbiblio.pl isbnsearch.pl 
        barcodes       : label-item-search.pl 
        bull           : subscription-bib-search.pl 
        C4             : SearchMarc.pm 
        koha-tmpl/intranet-tmpl/npl/en/bull: subscription-add.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/members: jmemberentry.tmpl 
                                                moremember.tmpl 
                                                newjmember.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/parameters: admin-home.tmpl 
        misc/release notes: release_notes_240.txt 
        opac           : livesearch.pl opac-addbookbybiblionumber.pl 
                         opac-authorities-home.pl opac-detail.pl 
                         opac-dictionary.pl opac-search.pl opac-user.pl 
        search.marc    : dictionary.pl search.pl suggest.pl 
        value_builder  : unimarc_field_4XX.pl 
        zebraplugin/utils: convert_to_utf8.pl 

Log message:
        Major API cleanup. Now, for searching, we only use Search.pm, 
SearchMarc.pm
        is obsolete.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/detail.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.24.2.9&r2=1.24.2.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/suggestion-select.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.5.2.1&r2=1.3.2.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/acqui.simple/addbiblio.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.52.2.40.2.2&r2=1.52.2.40.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/acqui.simple/isbnsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.5&r2=1.14.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.pl?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/bull/subscription-bib-search.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.4.2.1&r2=1.3.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/SearchMarc.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.36.2.28.2.4&r2=1.36.2.28.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.3.2.1&r2=1.2.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2&r2=1.2.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.10.2.2&r2=1.5.2.10.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.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/intranet-tmpl/npl/en/parameters/admin-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.7&r2=1.2.2.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/release%32notes/release_notes_240.txt?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/opac/livesearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-addbookbybiblionumber.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.19&r2=1.14.2.19.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-dictionary.pl?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/opac/opac-search.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.21.2.17&r2=1.21.2.17.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.9&r2=1.14.2.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/dictionary.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.7&r2=1.6.2.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/search.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.10&r2=1.22.2.10.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/suggest.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.3&r2=1.2.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/value_builder/unimarc_field_4XX.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.4&r2=1.4.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/zebraplugin/utils/convert_to_utf8.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: detail.pl
===================================================================
RCS file: /sources/koha/koha/Attic/detail.pl,v
retrieving revision 1.24.2.9
retrieving revision 1.24.2.9.2.1
diff -u -b -r1.24.2.9 -r1.24.2.9.2.1
--- detail.pl   13 Apr 2006 18:32:32 -0000      1.24.2.9
+++ detail.pl   21 Jul 2006 17:46:47 -0000      1.24.2.9.2.1
@@ -8,7 +8,7 @@
 use C4::Interface::CGI::Output;
 use HTML::Template;
 use C4::Biblio;
-use C4::SearchMarc;
+use C4::Search; 
 
 my $query=new CGI;
 my ($template, $borrowernumber, $cookie) 

Index: acqui/suggestion-select.pl
===================================================================
RCS file: /sources/koha/koha/acqui/suggestion-select.pl,v
retrieving revision 1.3.2.5.2.1
retrieving revision 1.3.2.5.2.2
diff -u -b -r1.3.2.5.2.1 -r1.3.2.5.2.2
--- acqui/suggestion-select.pl  11 Jul 2006 13:45:09 -0000      1.3.2.5.2.1
+++ acqui/suggestion-select.pl  21 Jul 2006 17:46:48 -0000      1.3.2.5.2.2
@@ -8,7 +8,7 @@
 use C4::Interface::CGI::Output;
 use C4::Suggestions;
 use C4::Biblio;
-use C4::SearchMarc;
+use C4::Search;
 
 my $input = new CGI;
 

Index: acqui.simple/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/acqui.simple/Attic/addbiblio.pl,v
retrieving revision 1.52.2.40.2.2
retrieving revision 1.52.2.40.2.3
diff -u -b -r1.52.2.40.2.2 -r1.52.2.40.2.3
--- acqui.simple/addbiblio.pl   11 Jul 2006 13:00:46 -0000      1.52.2.40.2.2
+++ acqui.simple/addbiblio.pl   21 Jul 2006 17:46:48 -0000      1.52.2.40.2.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.52.2.40.2.2 2006/07/11 13:00:46 kados Exp $
+# $Id: addbiblio.pl,v 1.52.2.40.2.3 2006/07/21 17:46:48 kados Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -25,7 +25,6 @@
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Biblio;
-use C4::SearchMarc; # also includes Biblio.pm, SearchMarc is used to 
FindDuplicate
 use C4::Search;
 use C4::Context;
 use C4::Koha; # XXX subfield_is_koha_internal_p

Index: acqui.simple/isbnsearch.pl
===================================================================
RCS file: /sources/koha/koha/acqui.simple/Attic/isbnsearch.pl,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.5.2.1
diff -u -b -r1.14.2.5 -r1.14.2.5.2.1
--- acqui.simple/isbnsearch.pl  31 Jan 2006 10:59:41 -0000      1.14.2.5
+++ acqui.simple/isbnsearch.pl  21 Jul 2006 17:46:48 -0000      1.14.2.5.2.1
@@ -21,9 +21,8 @@
 use CGI;
 use C4::Auth;
 use C4::Biblio;
-# use C4::Search;
+use C4::Search;
 use C4::Breeding;
-use C4::SearchMarc;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use HTML::Template;

Index: barcodes/label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.pl,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
--- barcodes/label-item-search.pl       11 Apr 2006 05:52:09 -0000      1.1.2.1
+++ barcodes/label-item-search.pl       21 Jul 2006 17:46:48 -0000      
1.1.2.1.2.1
@@ -31,7 +31,6 @@
 use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Acquisition;
-use C4::SearchMarc;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 
 # Creates a scrolling list with the associated default value.

Index: bull/subscription-bib-search.pl
===================================================================
RCS file: /sources/koha/koha/bull/Attic/subscription-bib-search.pl,v
retrieving revision 1.3.2.4.2.1
retrieving revision 1.3.2.4.2.2
diff -u -b -r1.3.2.4.2.1 -r1.3.2.4.2.2
--- bull/subscription-bib-search.pl     13 Jul 2006 19:09:44 -0000      
1.3.2.4.2.1
+++ bull/subscription-bib-search.pl     21 Jul 2006 17:46:48 -0000      
1.3.2.4.2.2
@@ -31,7 +31,6 @@
 use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Acquisition;
-use C4::SearchMarc;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 
 

Index: C4/SearchMarc.pm
===================================================================
RCS file: /sources/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.28.2.4
retrieving revision 1.36.2.28.2.5
diff -u -b -r1.36.2.28.2.4 -r1.36.2.28.2.5
--- C4/SearchMarc.pm    21 Jul 2006 17:31:41 -0000      1.36.2.28.2.4
+++ C4/SearchMarc.pm    21 Jul 2006 17:46:48 -0000      1.36.2.28.2.5
@@ -42,7 +42,7 @@
 =cut
 
 @ISA = qw(Exporter);
address@hidden = qw(&catalogsearch &findseealso &findsuggestion); 
#&getMARCnotes &getMARCsubjects);
address@hidden = qw(&findsuggestion); #&getMARCnotes &getMARCsubjects);
 
 =head1 findsuggestion($dbh,$values);
 

Index: koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2.2.3.2.1
retrieving revision 1.2.2.3.2.2
diff -u -b -r1.2.2.3.2.1 -r1.2.2.3.2.2
--- koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl   11 Jul 2006 
14:03:23 -0000      1.2.2.3.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl   21 Jul 2006 
17:46:48 -0000      1.2.2.3.2.2
@@ -171,7 +171,7 @@
                        <tr>
                                <th scope="row"><label for="innerloop">The loop 
is for instance:</label></th>
                                <!-- TMPL_ELSE -->
-                                       <td>Starting period</td>
+                                       <th scope="row"><label 
for="innerloop">Starting period</label></th>
                                <!-- /TMPL_IF -->
                                <td><input type="text" id="innerloop" 
name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
                                <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->"></td>

Index: koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl    13 Apr 2004 
16:59:43 -0000      1.2
+++ koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl    21 Jul 2006 
17:46:48 -0000      1.2.4.1
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 
-<div id="main"><form action="/cgi-bin/koha/newjmember.pl" method="post">
+<div id="main"><form action="/cgi-bin/koha/members/newjmember.pl" 
method="post">
        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="member" -->" />
        <input type="hidden" name="updtype" value="I" />
        <input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" 
/>
@@ -44,8 +44,8 @@
                        <input type="radio" id="sex_child_<!-- TMPL_VAR 
NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
                        <input type="radio" name="sex_child_<!-- TMPL_VAR 
NAME="i" -->" value="M" />M
                </td></tr>
-<!--           <tr><td>School</td><td><input type="text" 
name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
-       </tr> -->
+               <tr><td><label for="school_child_<!-- TMPL_VAR NAME="i" 
-->">School</label></td><td><input type="text" id="school_child_<!-- TMPL_VAR 
NAME="i" -->" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
+       </tr>
        <tr>
                <td><label for="altnotes_child_<!-- TMPL_VAR NAME="i" 
-->">Notes</label></td><td><textarea name="altnotes_child_<!-- TMPL_VAR 
NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" 
rows="3"></textarea></td>
        </tr>

Index: koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl,v
retrieving revision 1.5.2.10.2.2
retrieving revision 1.5.2.10.2.3
diff -u -b -r1.5.2.10.2.2 -r1.5.2.10.2.3
--- koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl      13 Jul 2006 
19:23:17 -0000      1.5.2.10.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl      21 Jul 2006 
17:46:48 -0000      1.5.2.10.2.3
@@ -9,7 +9,7 @@
 <div class="tabitem">
                         <form method="post" 
action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" 
type="hidden" value="<!-- TMPL_VAR name="cardnumber" -->" /><input 
type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input 
type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input 
type="submit" class="submit" value="Issue" /></form>
 
-<!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS 
NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl" 
method="post"> <input type="submit" name="submit" value="Add Child" 
class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" 
/><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
name="borrowernumber" -->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- 
/Hide from NPL -->
+<!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS 
NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl" 
method="post"> <input type="submit" name="submit" value="Add Child" 
class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" 
/><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
name="borrowernumber" -->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
 
 <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form 
action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input 
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" /> 
<input type="submit" name="modify" class="submit" value="Edit" /></form>
 <!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" 
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
name="bornum" -->" /> <input type="submit" class="submit" name="modify" 
value="Edit" /></form>

Index: koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.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/intranet-tmpl/npl/en/members/newjmember.tmpl      20 Jan 2005 
19:36:58 -0000      1.1.2.1
+++ koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl      21 Jul 2006 
17:46:48 -0000      1.1.2.1.2.1
@@ -4,14 +4,21 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
                <div id="main"> 
-<!-- TMPL_IF Name="NOK" -->
-       <div class="details"><h3>Error Completing Form</h3>
-       <p><!-- TMPL_VAR Name="string" --></p></div>
-<!-- TMPL_ELSE -->
+       <!-- TMPL_IF Name="NOK" -->
+       <div class="error">
+       <h3>The following fields were entered incorrectly.  Please go back and 
correct them.</h3>
+       <ul>
+               <!-- TMPL_IF NAME="cardnumber_missing" --><li>Please enter a 
library card number.</li><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="firstname_missing" --><li>Please enter the 
patron's first name.</li><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="surname_missing" --><li>Please enter the 
patron's last name.</li><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="dob_missing" --><li>Please enter the 
patron's date of birth.</li><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="gender_missing" --><li>Please enter the 
patron's gender.</li><!-- /TMPL_IF -->
+       </ul></div>
+       <!-- TMPL_ELSE -->
        
        <!-- TMPL_LOOP Name="identsloop" -->
                <!-- TMPL_IF Name="cardchild" -->
-<div class="form">
+<div class="data">
                                <table>
                                <caption>Confirm Details for <!-- TMPL_VAR 
Name="name" --></caption>
                                <tr>
@@ -23,7 +30,7 @@
                                </tr>
                                <tr>
                                        <th>Barcode Number</th>
-                                       <td><!-- TMPL_VAR NAME="cardnumber" 
--></td>
+                                       <td><!-- TMPL_VAR NAME="cardchild" 
--></td>
                                </tr>
                                <tr>
                                        <th>Date Of Birth</th>
@@ -33,10 +40,10 @@
                                        <th>Sex</th>
                                        <td><!-- TMPL_VAR Name="sex" --></td>
                                </tr>
-<!--                           <tr>
+                               <tr>
                                        <th>School</td>
                                        <td><!-- TMPL_VAR Name="school" --></td>
-                               </tr> -->
+                               </tr>
 <!-- TMPL_IF NAME="notes" -->
                                <tr>
                                        <th>General Notes</th>
@@ -47,7 +54,7 @@
                </table></div>
                <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
-<form action="/cgi-bin/koha/insertjdata.pl" method="post">
+<form action="/cgi-bin/koha/members/insertjdata.pl" method="post">
                <p><!-- TMPL_LOOP NAME="inputsloop" -->
                        <input type="hidden" name="<!-- TMPL_VAR NAME="key" 
-->" value="<!-- TMPL_VAR NAME="value" -->" />
                <!-- /TMPL_LOOP -->

Index: koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.7.2.1
diff -u -b -r1.2.2.7 -r1.2.2.7.2.1
--- koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl   13 Apr 2006 
20:06:24 -0000      1.2.2.7
+++ koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl   21 Jul 2006 
17:46:48 -0000      1.2.2.7.2.1
@@ -15,7 +15,6 @@
 </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="CAN_user_management" -->
 <div class="menu">
 <h2>System parameters</h2>
 <div class="help"><p>For best results, configure these parameters in the order 
they appear</p></div>
@@ -58,7 +57,6 @@
 <!-- /TMPL_IF -->
 </dl>
 </div>
-<!-- /TMPL_IF -->
 
 <div class="menu">
 <h3>Various parameters</h3>

Index: misc/release notes/release_notes_240.txt
===================================================================
RCS file: /sources/koha/koha/misc/release notes/Attic/release_notes_240.txt,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
--- misc/release notes/release_notes_240.txt    4 Apr 2006 15:16:08 -0000       
1.1.2.2
+++ misc/release notes/release_notes_240.txt    21 Jul 2006 17:46:48 -0000      
1.1.2.2.2.1
@@ -1,72 +1,62 @@
 RELEASE NOTES
 =============
 
-Koha is the first Open-Source Integrated Library System.
-Released in New Zealand, in January 2000, it is maintained by a team of 
volunteers from around the globe. The Koha system is a full catalogue, opac, 
circulation and acquisitions system.
+Koha is the first Open-Source Integrated Library System. Developed initially 
in New Zealand by Katipo Communications Ltd and first deployed in January of 
2000 for Horowhenua Library Trust, it is currently maintained by a team of 
software providers and library technology staff from around the globe.
 
-Koha 2.4 is more than 247 000 lines of code, developed by more than 30 
differents developers (and even more translators).
+Koha 2.4 is more than 247,000 lines of code, developed by more than 30 
different developers (and even more translators).
 
-With the 2.4 version, Koha is now a mature product, with a lot of nice 
features. It's used in more than 100 libraries, of all kinds (public, schools, 
religious...), of different sizes (from 1 to 8 branches, from 1000 to 300 000 
items).
+The Koha 2.4 version is the first release of Koha to include the Zebra plugin. 
Zebra
 
+It's used in more than hundreds of libraries of all kinds (public, schools, 
religious...), of different sizes (from 1 to 8 branches, from 1,000 to 
2,000,000 items).
 
 ========
 WARNINGS
 ========
-* The librarian interface is tested only with Mozilla/Firefox. Should work 
(partially) with IE. OPAC should work fine with any browser.
-* In this release, french & english are uptodate. Other language po files are 
provided in the package. If you update/complete one of them, please send it at 
paul.poulain @ free.fr, it will be included in a 2.2.4b release !
-* NEW PACKAGES REQUIRED : MARC::File::xml (0.82), MARC::Charset (0.95), 
Class::Accessor (0.22), LWP::Simple and XML::Simple
-
+* The librarian interface is tested only with Mozilla/Firefox. Should work 
(partially) with IE. The OPAC should work fine with any browser.
+* In this release, French & English are uptodate. Other language po files are 
provided in the package. If you update/complete one of them, please send it at 
jmf @ liblime.com, it will be included in a 2.4.x release.
+* NEW PACKAGES REQUIRED : Zebra, Net::Z3950::ZOOM
 
 KNOWN BUGS
 **********
 Critical/blocking : none
-see bugs.koha.org for more information. Please report any problem in 
bugs.koha.org
+See bugs.koha.org for more information. Please report any problem in 
bugs.koha.org
 
 Apple users : it seems there is an annoying bug in Firefox, that you can have 
in librarian biblio search: only the first MARC field list is available and the 
others can't be opened. The problem is described and fixed at 
http://www.macfixit.com/article.php?story=20051226091140372
 
 =======
 CHANGES
 =======
-Changes 2.2.4 => 2.2.5
+Changes 2.2.6 => 2.4.0
 **********************
 
 DB CHANGES
 **********
 
-DB structure : none
+DB structure : 
+  * new phrase_log table
+  * changes to biblio, biblioitems, items
+  * removal of marc_biblio, marc_subfield_table and marc_word
+  * conversion of table defs to UTF-8
+
 DB content : none
-Koha opac stylesheets : none
+Koha search pages: completely rewritten for new ZOOM search
+Heavy changes to Biblio.pm and Context.pm to support Zebra using the rel_2_2 
API
 
 BUGFIXES
        === ACQUISITION ===
-       
        === CATALOGUE ===
        === CATALOGUING ===
-       * result page display was incorrect when searching a biblio before 
adding a new one.
-       * no more saving of an empty field in the DB
-       * Fix for splitting up fixed fields containing | in them causing
-       incorrect storage of fixed fields in Koha DB.
-       * An item that is on loan can't be deleted anymore.
        === AUTHORITIES ===
-
        === SERIALS ===
-       
        === CIRCULATION ===
-       * minor bugfix : Adding 0 before days and months in order to make date 
comparison work.
-       
        === MEMBERS ===
-       
        === PARAMETERS ===
-       * adding page facility in book funds.
-       
        === REPORTS ===
-       
        === ALL ===
-       
        === OPAC ===
        
 IMPROVEMENTS
-This version has been labelled 2.4.0 as there are many many improvements. 
Almost nothing has changed in the DB, so the stability should be good. But you 
are warned that some/few bugs may occur.
+This version differs from 2.2.6 in only one major way: it supports the use of 
the Zebra indexing and retrieval engine. has been labelled 2.4.0 as there are 
many many improvements. Almost nothing has changed in the DB, so the stability 
should be good. But you are warned that some/few bugs may occur.
 Please READ the release notes. Everything is compatible with previous 
versions, so, if you just install Koha, you should have the same behaviour as 
previously, but you will miss many interesting features!
 
        === ACQUISITION ===

Index: opac/livesearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/livesearch.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- opac/livesearch.pl  10 Jun 2006 15:49:50 -0000      1.1.2.1
+++ opac/livesearch.pl  21 Jul 2006 17:46:48 -0000      1.1.2.2
@@ -14,7 +14,7 @@
 #my $dbh=DBI->connect("DBI:mysql:demosuggest:localhost","sugg","Free2cirC");
 #my $dbh = C4::Context->dbh;
 
-my $word = $cgi->param('value');
+my $word = $cgi->param('ccl_query');
 
 
 if ($word) {
@@ -29,9 +29,10 @@
        if ($query =~ / /) {
                $query = "address@hidden 6=2 $query";
        }
-       warn "$query";
+       #warn "$query";
        my $result;
        eval {
+               #my $zoom_query_obj = new ZOOM::Query::CCL2RPN($query,$zconn);
                my $zoom_query_obj = new ZOOM::Query::PQF($query);
                $result = $zconn->scan($zoom_query_obj);
        };
@@ -47,7 +48,7 @@
                my $length=length($suggest);
                $query=$suggest;
 #              $query =~ 
s/(\'s|&|\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/|)//g;
-               $outstring.="<li class=\"LSRow\" 
onmouseover=\"liveSearchHover(this)\" onclick=\"liveSearchClicked(this)\"><a 
href="."\"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;cql_query=&quot;$query&quot;\">\n$suggest";
+               $outstring.="<li class=\"LSRow\" 
onmouseover=\"liveSearchHover(this)\" onclick=\"liveSearchClicked(this)\"><a 
href="."\"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=&quot;$query&quot;\">\n$suggest";
 
 
                $outstring.="\n</a>\n<span class=\"LSResRight\">$count 
results</span></li>";

Index: opac/opac-addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -b -r1.1.2.6 -r1.1.2.6.2.1
--- opac/opac-addbookbybiblionumber.pl  27 Apr 2006 16:23:34 -0000      1.1.2.6
+++ opac/opac-addbookbybiblionumber.pl  21 Jul 2006 17:46:48 -0000      
1.1.2.6.2.1
@@ -2,7 +2,7 @@
 #script to provide bookshelf management
 # WARNING: This file uses 4-character tabs!
 #
-# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1.2.6 
2006/04/27 16:23:34 oleonard Exp $
+# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1.2.6.2.1 
2006/07/21 17:46:48 kados Exp $
 #
 # Copyright 2000-2002 Katipo Communications
 #
@@ -71,6 +71,7 @@
                                -values   => address@hidden,
                                -labels   => \%shelvesloop,
                                -size     => 1,
+                               -tabindex=>'',
                                -multiple => 0 );
         }
 
@@ -91,6 +92,13 @@
        output_html_with_http_headers $query, $cookie, $template->output;
 }
 # $Log: opac-addbookbybiblionumber.pl,v $
+# Revision 1.1.2.6.2.1  2006/07/21 17:46:48  kados
+# Major API cleanup. Now, for searching, we only use Search.pm, SearchMarc.pm
+# is obsolete.
+#
+# Revision 1.1.2.7  2006/06/20 16:21:43  oleonard
+# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. 
See Bug 1098
+#
 # Revision 1.1.2.6  2006/04/27 16:23:34  oleonard
 # Hiding option to add to existing virtual shelves if there are no existing 
virtual shelves (thanks Chris!)
 #

Index: opac/opac-authorities-home.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authorities-home.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -b -r1.1.2.6 -r1.1.2.6.2.1
--- opac/opac-authorities-home.pl       10 Apr 2006 20:08:43 -0000      1.1.2.6
+++ opac/opac-authorities-home.pl       21 Jul 2006 17:46:48 -0000      
1.1.2.6.2.1
@@ -29,7 +29,6 @@
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::AuthoritiesMarc;
-use C4::SearchMarc;
 use C4::Acquisition;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 

Index: opac/opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.19
retrieving revision 1.14.2.19.2.1
diff -u -b -r1.14.2.19 -r1.14.2.19.2.1
--- opac/opac-detail.pl 8 Mar 2006 13:46:55 -0000       1.14.2.19
+++ opac/opac-detail.pl 21 Jul 2006 17:46:48 -0000      1.14.2.19.2.1
@@ -8,7 +8,6 @@
 use C4::Interface::CGI::Output;
 use HTML::Template;
 use C4::Biblio;
-use C4::SearchMarc;
 
 my $query=new CGI;
 my ($template, $borrowernumber, $cookie) 

Index: opac/opac-dictionary.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-dictionary.pl,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
--- opac/opac-dictionary.pl     7 Mar 2006 22:28:23 -0000       1.1.2.3
+++ opac/opac-dictionary.pl     21 Jul 2006 17:46:48 -0000      1.1.2.3.2.1
@@ -24,7 +24,6 @@
 use C4::Auth;
 use CGI;
 use C4::Search;
-use C4::SearchMarc;
 use C4::AuthoritiesMarc;
 use C4::Context;
 use C4::Biblio;

Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.21.2.17
retrieving revision 1.21.2.17.2.1
diff -u -b -r1.21.2.17 -r1.21.2.17.2.1
--- opac/opac-search.pl 3 Apr 2006 10:29:23 -0000       1.21.2.17
+++ opac/opac-search.pl 21 Jul 2006 17:46:48 -0000      1.21.2.17.2.1
@@ -8,7 +8,7 @@
 use CGI;
 use C4::Database;
 use HTML::Template;
-use C4::SearchMarc;
+use C4::Search;
 use C4::Acquisition;
 use C4::Biblio;
 use C4::Koha;

Index: opac/opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.9
retrieving revision 1.14.2.9.2.1
diff -u -b -r1.14.2.9 -r1.14.2.9.2.1
--- opac/opac-user.pl   8 Mar 2006 13:46:55 -0000       1.14.2.9
+++ opac/opac-user.pl   21 Jul 2006 17:46:48 -0000      1.14.2.9.2.1
@@ -142,6 +142,16 @@
 $template->param(waiting_count => $wcount,
                                textmessaging => $borr->{textmessaging},
                                OpacPasswordChange => 
C4::Context->preference("OpacPasswordChange"),
+                               opaclargeimage => 
C4::Context->preference("opaclargeimage"),
+                LibraryName => C4::Context->preference("LibraryName"),
+                OpacNav => C4::Context->preference("OpacNav"),
+                opaccredits => C4::Context->preference("opaccredits"),
+                opacreadinghistory => 
C4::Context->preference("opacreadinghistory"),
+                opacsmallimage => C4::Context->preference("opacsmallimage"),
+                opaclayoutstylesheet => 
C4::Context->preference("opaclayoutstylesheet"),
+                opaccolorstylesheet => 
C4::Context->preference("opaccolorstylesheet"),
+                opaclanguagesdisplay => 
C4::Context->preference("opaclanguagesdisplay"),
+
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;

Index: search.marc/dictionary.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.7.2.1
diff -u -b -r1.6.2.7 -r1.6.2.7.2.1
--- search.marc/dictionary.pl   5 Feb 2006 21:59:21 -0000       1.6.2.7
+++ search.marc/dictionary.pl   21 Jul 2006 17:46:48 -0000      1.6.2.7.2.1
@@ -24,7 +24,6 @@
 use C4::Auth;
 use CGI;
 use C4::Search;
-use C4::SearchMarc;
 use C4::AuthoritiesMarc;
 use C4::Context;
 use C4::Biblio;

Index: search.marc/search.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/search.pl,v
retrieving revision 1.22.2.10
retrieving revision 1.22.2.10.2.1
diff -u -b -r1.22.2.10 -r1.22.2.10.2.1
--- search.marc/search.pl       20 Apr 2006 21:26:53 -0000      1.22.2.10
+++ search.marc/search.pl       21 Jul 2006 17:46:48 -0000      1.22.2.10.2.1
@@ -29,7 +29,7 @@
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Biblio;
-use C4::SearchMarc;
+use C4::Search;
 use C4::Acquisition;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 

Index: search.marc/suggest.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/suggest.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.3.2.1
diff -u -b -r1.2.2.3 -r1.2.2.3.2.1
--- search.marc/suggest.pl      5 Feb 2006 21:59:21 -0000       1.2.2.3
+++ search.marc/suggest.pl      21 Jul 2006 17:46:48 -0000      1.2.2.3.2.1
@@ -29,7 +29,6 @@
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Biblio;
-use C4::SearchMarc;
 use C4::Acquisition;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 

Index: value_builder/unimarc_field_4XX.pl
===================================================================
RCS file: /sources/koha/koha/value_builder/unimarc_field_4XX.pl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.4.2.1
diff -u -b -r1.4.2.4 -r1.4.2.4.2.1
--- value_builder/unimarc_field_4XX.pl  8 Dec 2005 09:35:50 -0000       1.4.2.4
+++ value_builder/unimarc_field_4XX.pl  21 Jul 2006 17:46:48 -0000      
1.4.2.4.2.1
@@ -28,8 +28,6 @@
 use C4::Output;
 use C4::Database;
 use C4::Biblio;
-#use C4::SimpleMarc;
-use C4::SearchMarc;
 use C4::Acquisition;
 use C4::Koha;
 use MARC::Record;

Index: zebraplugin/utils/convert_to_utf8.pl
===================================================================
RCS file: /sources/koha/koha/zebraplugin/utils/Attic/convert_to_utf8.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- zebraplugin/utils/convert_to_utf8.pl        3 Jul 2006 21:56:45 -0000       
1.1.2.1
+++ zebraplugin/utils/convert_to_utf8.pl        21 Jul 2006 17:46:48 -0000      
1.1.2.2
@@ -13,7 +13,7 @@
 $sth->execute();
 while (my @table=$sth->fetchrow_array()){
     print "Altering table $table[0]\n";
-    my $alter_query="ALTER TABLE $table[0] CHARACTER SET UTF8 collate 
utf8_general_ci";
+    my $alter_query="ALTER TABLE $table[0] convert to CHARACTER SET UTF8 
collate utf8_general_ci";
     my $sth2=$dbh->prepare($alter_query);
     $sth2->execute();
     $sth2->finish();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]