From paul at koha-fr.org Wed Nov 1 21:14:20 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 20:14:20 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/admin admi... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 20:14:20 Modified files: koha-tmpl/intranet-tmpl/prog/en/admin: admin-home.tmpl Log message: removing stop word link, they are useless with zebra CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2 Patches: Index: admin-home.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -b -r1.4.2.1 -r1.4.2.2 --- admin-home.tmpl 10 Oct 2006 12:49:22 -0000 1.4.2.1 +++ admin-home.tmpl 1 Nov 2006 20:14:20 -0000 1.4.2.2 @@ -85,10 +85,6 @@ Printers (UNIX paths). - Stop words - Words deleted during searches. - - Z39.50 Servers Servers to query for MARC data. From paul at koha-fr.org Wed Nov 1 21:15:01 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 20:15:01 +0000 Subject: [Koha-cvs] koha admin/auth_subfields_structure.pl admin/au... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 20:15:01 Modified files: admin : auth_subfields_structure.pl auth_tag_structure.pl checkmarc.pl koha-tmpl/intranet-tmpl/prog/en/admin: auth_subfields_structure.tmpl auth_tag_structure.tmpl biblio_framework.tmpl checkmarc.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl Log message: many html fixes (coding rules & some spelling errors) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.1&r2=1.7.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_tag_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6&r2=1.6.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/admin/checkmarc.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9&r2=1.9.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1 Patches: Index: admin/auth_subfields_structure.pl =================================================================== RCS file: /sources/koha/koha/admin/auth_subfields_structure.pl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -b -r1.7.2.1 -r1.7.2.2 --- admin/auth_subfields_structure.pl 1 Sep 2006 13:13:33 -0000 1.7.2.1 +++ admin/auth_subfields_structure.pl 1 Nov 2006 20:15:01 -0000 1.7.2.2 @@ -176,7 +176,7 @@ -labels => {'0'=>'Show','1'=>'Show Collapsed', '2' =>'Hide', }, - -default=>substr($data->{'hidden'},2,1), + -default=>substr($data->{'hidden'}." ",2,1), -size=>1, -multiple=>0, ); Index: admin/auth_tag_structure.pl =================================================================== RCS file: /sources/koha/koha/admin/auth_tag_structure.pl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -b -r1.6 -r1.6.2.1 --- admin/auth_tag_structure.pl 4 Jul 2006 14:36:51 -0000 1.6 +++ admin/auth_tag_structure.pl 1 Nov 2006 20:15:01 -0000 1.6.2.1 @@ -135,8 +135,8 @@ $template->param('use-heading-flags-p' => 1); $template->param(liblibrarian => $data->{'liblibrarian'}, libopac => $data->{'libopac'}, - repeatable => CGI::checkbox('repeatable',$data->{'repeatable'}?'checked':'',1,''), - mandatory => CGI::checkbox('mandatory',$data->{'mandatory'}?'checked':'',1,''), + repeatable => "".$data->{'repeatable'}, + mandatory => "".$data->{'mandatory'}, authorised_value => $authorised_value, authtypecode => $authtypecode, ); Index: admin/checkmarc.pl =================================================================== RCS file: /sources/koha/koha/admin/checkmarc.pl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -b -r1.9 -r1.9.2.1 --- admin/checkmarc.pl 4 Jul 2006 14:36:51 -0000 1.9 +++ admin/checkmarc.pl 1 Nov 2006 20:15:01 -0000 1.9.2.1 @@ -60,7 +60,7 @@ $sth = $dbh->prepare("select tagfield,tab from marc_subfield_structure where kohafield=\"biblioitems.biblioitemnumber\""); $sth->execute; my ($res2,$tab2) = $sth->fetchrow; -if ($res && $res2 && ($res eq $res2) && $tab==-1 && $tab2==-1) { +if ($res && $res2) { $template->param(biblionumber => 0); } else { $template->param(biblionumber => 1); Index: koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -b -r1.2 -r1.2.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl 19 May 2006 17:30:07 -0000 1.2 +++ koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl 1 Nov 2006 20:15:01 -0000 1.2.2.1 @@ -4,42 +4,33 @@ -!-- TMPL_IF NAME="add_form" --> + -

+ Edit MARC subfields constraints

" name="Aform" method="post"> " /> -
">

Tag , Subfield

- - - - - - -
MARC constraints
" name="seealso" value="" size="20" /> (example for 200a: '200c','200d','200e'...)
- - - - - - - - - - - - -
Editor constaints
" type="text" name="liblibrarian" value="" size="40" maxlength="80" />
" name="libopac" value="" size="40" maxlength="80" />
(ignore means that the subfield is NOT managed by Koha)
Opac: Intranet: Editor: (see online help)
(if checked, it means that the subfield is an URL and can be clicked
(if checked, it means that the subfield is used for linking authorities
-
    -
  • Authorized Value:
    • -
  • Thesaurus:
    • -
  • Plugin:
    • -
-
+
"> +

Tag , Subfield

+

 

+

 

+

" name="seealso" value="" size="20" /> (example for 200a: '200c','200d','200e'...)

+

" type="text" name="liblibrarian" value="" size="40" maxlength="80" />

+

" name="libopac" value="" size="40" maxlength="80" />

+

(ignore means that the subfield is NOT managed by Koha)

+

Opac: Intranet: Editor: (see online help)

+

(if checked, it means that the subfield is an URL and can be clicked)

+

(if checked, it means that the subfield is used for linking authorities)

+

(choose one)

+
    +
  • Authorized Value
    • +
  • Thesaurus
    • +
  • Plugin
    • +
+

@@ -60,7 +51,7 @@ Subfield - Description +

Description

" method="post"> " /> @@ -120,7 +111,10 @@ -" method="get">" />" />
" />" />
+ //images/1leftarrow.png" title="previous" alt="previous" border="0" > Index: koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -b -r1.2 -r1.2.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl 19 May 2006 17:35:53 -0000 1.2 +++ koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl 1 Nov 2006 20:15:01 -0000 1.2.2.1 @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNotNull(f,noalert) { if (f.value.length ==0) { - return false; +return false; } return true; } @@ -59,20 +59,34 @@ -

+

Modify tag Add tag -

+
" name="Aform" method="post"> " /> -

-

" size="80" maxlength="100" />

-

" size="80" maxlength="100" />

-

-

+

+

" size="40" maxlength="100" />

+

" size="40" maxlength="100" />

+

+ + + + + +   +

+

+ + + + + +   +

(if you select a value here, the indicators will be limited to the authorised value list)

Index: koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/biblio_framework.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 24 Feb 2006 11:18:17 -0000 1.1 +++ koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 1 Nov 2006 20:15:01 -0000 1.1.2.1 @@ -60,22 +60,17 @@ +

Modify framework textAdd framework

" name="Aform" method="post"> - - - - +

" />

- +

- - - -
Modify framework textAdd framework
" />
- " />
+

+ " />

Index: koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl 24 Feb 2006 11:18:17 -0000 1.1 +++ koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl 1 Nov 2006 20:15:01 -0000 1.1.2.1 @@ -5,7 +5,7 @@ -

MARC Checks

+

MARC Checking

@@ -47,7 +47,7 @@ - + @@ -96,10 +96,7 @@ - + @@ -119,7 +116,7 @@ - + @@ -132,7 +129,7 @@
Test
OKOnly 1 MARC tag mapped to itemsOnly 1 MARC tag mapped to items
biblio and biblionumberThe biblio.biblionumber and biblioitems.biblioitemnumber fields MUST : -
  • be mapped to a MARC subfield,
    • -
  • be in the SAME tag (for example : 090$a and 090$b)
    • -
  • be in tab -1
The biblio.biblionumber and biblioitems.biblioitemnumber fields be mapped to a MARC subfield,
OKno NULL value in frameworkcodeno NULL value in frameworkcode
-

Configuration OK, you don't have errors in your MARC parameters table

+

Configuration OK, you don't have errors in your MARC parameters table

Index: koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/marc_subfields_structure.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 24 Feb 2006 11:18:17 -0000 1.1 +++ koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 1 Nov 2006 20:15:01 -0000 1.1.2.1 @@ -7,47 +7,38 @@ - -

+

+ Edit MARC subfields constraints -

+ + + +
" name="Aform" method="post"> " /> -
">

Tag , Subfield

- - - - - - -
MARC constraints
" name="seealso" value="" size="20" /> (example for 200a: '200c','200d','200e'...)
- - - - - - - - -
Editor constaints
" type="text" name="liblibrarian" value="" size="40" maxlength="80" />
" name="libopac" value="" size="40" maxlength="80" />
(ignore means that the subfield is NOT managed by Koha)
(subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)
(if checked, it means that the subfield is an URL and can be clicked
-
    -
  • Authorized Value:
    • -
  • Thesaurus:
    • -
  • Plugin:
    • -
  • Link: " size="10" maxlength="5" /> (exemple:200b)
    • -
-
- +
"> +

Tag , Subfield

+

MARC constraints

+

 

+

 

+

" name="seealso" value="" size="20" /> (example for 200a: '200c','200d','200e'...)

+

+

Editor constaints

+

" type="text" name="liblibrarian" value="" size="40" maxlength="80" />

+

" name="libopac" value="" size="40" maxlength="80" />

+

(ignore means that the subfield is NOT managed by Koha)

+

(subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)

+

(if checked, it means that the subfield is an URL and can be clicked

+

" size="10" maxlength="5" /> (exemple:200b)

+

(choose one)

+

+

+

+

-

Note: in the last column, you can choose: -

  • An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.
    • -
  • A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.
    • -
  • A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.
    • -
-

@@ -59,7 +50,7 @@ Subfield - Description +

Description

" method="post"> " /> Index: koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/marctagstructure.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 24 Feb 2006 11:18:17 -0000 1.1 +++ koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 1 Nov 2006 20:15:01 -0000 1.1.2.1 @@ -14,7 +14,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNotNull(f,noalert) { if (f.value.length ==0) { - return false; +return false; } return true; } @@ -66,17 +66,17 @@ " name="Aform" method="post"> "> - - - - - - - - -
Modify tagAdd tag
" size="80" maxlength="100">
" size="80" maxlength="100">
(if you select a value here, the indicators will be limited to the authorised value list)
-

-

?frameworkcode='; return false;" />

+

Modify tagAdd tag

+

 

+

" size="40" maxlength="100">

+

" size="40" maxlength="100">

+

 

+

 

+

(if you select a value here, the indicators will be limited to the authorised value list)

+

+ + ?frameworkcode='; return false;" /> +

@@ -85,8 +85,8 @@ - - +

Tag:

+

Description:

Confirm Deletion of Tag ?
Tag:
Description:
" method="post">">">
" method="post">
@@ -118,18 +118,25 @@
" method="post"> - +

- +

+

+ "> +

- checked="checked" onchange="this.form.submit();" /> + + + + +

NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.

@@ -178,7 +185,7 @@ YesNo YesNo - ">Edit Subfields + ">Subfields ">Edit ">Delete From paul at koha-fr.org Wed Nov 1 21:15:30 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 20:15:30 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes s... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 20:15:29 Modified files: koha-tmpl/intranet-tmpl/prog/en/includes: san-op.css Log message: updating san-op css CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/san-op.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4 Patches: Index: san-op.css =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/Attic/san-op.css,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- san-op.css 31 Oct 2006 16:42:16 -0000 1.1.2.3 +++ san-op.css 1 Nov 2006 20:15:29 -0000 1.1.2.4 @@ -2,6 +2,7 @@ font-family : Verdana, Geneva, Arial, sans-serif; font-size : 1.0em; background-color : #eeeeee; + text-align: left; } h1 { @@ -13,18 +14,29 @@ display:block; } -h2,h3 { +h2 { color : #384b73; - text-align: center; + text-align: left; padding-bottom : 6px; - display:inline; + display:block; font-size:110%; } +h3 { + color : #384b73; + text-align: left; + padding-bottom : 6px; + display:inline; + font-size:100%; + font-weight:normal; +} label { - vertical-align:top; + + display:block; float:left; + text-align:right; width:8em; + margin-right:0.2em; } p { @@ -272,6 +284,7 @@ #submenu { margin-left:0%; font-weight : normal; + display:left; } #submenu a { From paul at koha-fr.org Wed Nov 1 21:18:28 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 20:18:28 +0000 Subject: [Koha-cvs] koha admin/stopwords.pl koha-tmpl/intranet-tmpl... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 20:18:28 Removed files: admin : stopwords.pl koha-tmpl/intranet-tmpl/prog/en/admin: stopwords.tmpl Log message: no stopwords with zebra, removing the scripts CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/admin/stopwords.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16&r2=0 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=0 Patches: Index: admin/stopwords.pl =================================================================== RCS file: admin/stopwords.pl diff -N admin/stopwords.pl --- admin/stopwords.pl 7 Apr 2006 08:24:36 -0000 1.16 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,171 +0,0 @@ -#!/usr/bin/perl - -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### -# -# script to administer the stopwords table -# -# - written on 2002/02/20 by paul.poulain at free.fr -# -# - experimentaly rewrittten on 2006/04/06 by Pierrick LE GALL (INEO media -# system) -# - -use strict; -use CGI; -use List::Util qw/min/; - -use C4::Koha; -use C4::Context; -use C4::Output; -use C4::Search; -use HTML::Template; -use C4::Auth; -use C4::Interface::CGI::Output; - -sub StringSearch { - my ($searchstring) = @_; - - my $dbh = C4::Context->dbh; - $searchstring =~ s/\'/\\\'/g; - my @tokens = split(' ',$searchstring); - - my $query = ' -SELECT word - FROM stopwords - WHERE (word like ?) - ORDER BY word -'; - my $sth = $dbh->prepare($query); - $sth->execute($tokens[0].'%'); - my @results; - while (my $row = $sth->fetchrow_hashref) { - push(@results, $row->{word}); - } - $sth->finish; - - return @results; -} - -my $dbh = C4::Context->dbh; -my $sth; -my $query; -my $input = new CGI; -my $searchfield = $input->param('searchfield'); -my $script_name="/cgi-bin/koha/admin/stopwords.pl"; - -my $pagesize = 40; -my $op = $input->param('op'); -$searchfield=~ s/\,//g; - -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "admin/stopwords.tmpl", - query => $input, - type => "intranet", - flagsrequired => {parameters => 1, management => 1}, - authnotrequired => 0, - debug => 1, - }); - -$template->param(script_name => $script_name, - searchfield => $searchfield); - -if ($input->param('add')) { - if ($input->param('word')) { - my @words = split / |,/, $input->param('word'); - - $query = ' -DELETE - FROM stopwords - WHERE word IN (?'.(',?' x scalar @words - 1).') -'; - $sth = $dbh->prepare($query); - $sth->execute(@words); - $sth->finish; - - $query = ' -INSERT - INTO stopwords - (word) - VALUES - (?)'.(',(?)' x scalar @words - 1).' -'; - $sth = $dbh->prepare($query); - $sth->execute(@words); - $sth->finish; - - $template->param(stopword_added => 1); - } -} -elsif ($input->param('deleteSelected')) { - if ($input->param('stopwords[]')) { - my @stopwords_loop = (); - - foreach my $word ($input->param('stopwords[]')) { - push @stopwords_loop, {word => $word}; - } - - $template->param( - delete_confirm => 1, - stopwords_to_delete => \@stopwords_loop, - ); - } -} -elsif ($input->param('confirmDeletion')) { - my @words = $input->param('confirmed_stopwords[]'); - - $query = ' -DELETE - FROM stopwords - WHERE word IN (?'.(',?' x scalar @words - 1).') -'; - $sth = $dbh->prepare($query); - $sth->execute(@words); - $sth->finish; - - $template->param(delete_confirmed => 1); -} - -my $page = $input->param('page') || 1; - -my @results = StringSearch($searchfield); -my @loop; - -my $first = ($page - 1) * $pagesize; - -# if we are on the last page, the number of the last word to display must -# not exceed the length of the results array -my $last = min( - $first + $pagesize - 1, - scalar(@results) - 1, -); - -foreach my $word (@results[$first .. $last]) { - push @loop, {word => $word}; -} - -$template->param( - loop => \@loop, - pagination_bar => pagination_bar( - $script_name, - getnbpages(scalar @results, $pagesize), - $page, - 'page' - ) -); - -output_html_with_http_headers $input, $cookie, $template->output; Index: koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl =================================================================== RCS file: koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl diff -N koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl --- koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl 6 Apr 2006 11:00:08 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,97 +0,0 @@ - -Koha -- System Administration: Stop Words Administration - - - - - - - -

Stop Words Administration

- -
    - -
  • Stop Words Added
    • - - - -
  • Stop Words Deleted
    • - -
- -
- - -
- Confirm - -

Confirm Deletion of the following Stop Words:

-
    - -
  • - - " /> -
    • - -
- -

- - -

-
- - -
- Add Stop Words - - - - - - -
Stop Words - -
- -

- - -

-
- -
- Stop Words selection - -

- " /> - -

- -
    - -
  • - -
    • - -
- -
- -

- - -

-
-
- - From paul at koha-fr.org Wed Nov 1 22:20:03 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 21:20:03 +0000 Subject: [Koha-cvs] koha/acqui booksellers.pl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 21:20:03 Modified files: acqui : booksellers.pl Log message: minor reindenting CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/booksellers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2 Patches: Index: booksellers.pl =================================================================== RCS file: /sources/koha/koha/acqui/booksellers.pl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -b -r1.2.2.1 -r1.2.2.2 --- booksellers.pl 28 Aug 2006 16:51:06 -0000 1.2.2.1 +++ booksellers.pl 1 Nov 2006 21:20:03 -0000 1.2.2.2 @@ -20,7 +20,7 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA -# $Id: booksellers.pl,v 1.2.2.1 2006/08/28 16:51:06 toins Exp $ +# $Id: booksellers.pl,v 1.2.2.2 2006/11/01 21:20:03 tipaul Exp $ =head1 NAME @@ -96,13 +96,11 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { my $orders = GetPendingOrders( $suppliers[$i]->{'id'} ); my $ordcount = scalar @$orders; - my %line; if ( $toggle == 0 ) { $line{even} = 1; $toggle = 1; - } - else { + } else { $line{even} = 0; $toggle = 0; } @@ -117,8 +115,7 @@ $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'}; $inner_line{surname} = $orders->[$i2]{'firstname'}; $inner_line{firstname} = $orders->[$i2]{'surname'}; - $inner_line{creationdate} = - format_date( $orders->[$i2]{'creationdate'} ); + $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} ); $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} ); push @loop_basket, \%inner_line; } From paul at koha-fr.org Wed Nov 1 22:20:32 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 21:20:32 +0000 Subject: [Koha-cvs] koha/acqui supplier.pl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 21:20:32 Modified files: acqui : supplier.pl Log message: reindenting & filling supplier only if there is a supplierid CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/supplier.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.13.2.1&r2=1.13.2.2 Patches: Index: supplier.pl =================================================================== RCS file: /sources/koha/koha/acqui/supplier.pl,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -u -b -r1.13.2.1 -r1.13.2.2 --- supplier.pl 30 Oct 2006 09:45:20 -0000 1.13.2.1 +++ supplier.pl 1 Nov 2006 21:20:32 -0000 1.13.2.2 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: supplier.pl,v 1.13.2.1 2006/10/30 09:45:20 tipaul Exp $ +# $Id: supplier.pl,v 1.13.2.2 2006/11/01 21:20:32 tipaul Exp $ #script to show display basket of orders #written by chris at katipo.co.nz 24/2/2000 @@ -55,7 +55,7 @@ my $query=new CGI; my $id=$query->param('supplierid'); -my @booksellers = GetBookSeller($id); +my @booksellers = GetBookSeller($id) if $id; my $count = scalar @booksellers; my $op=$query->param('op') || "display"; From paul at koha-fr.org Wed Nov 1 22:21:18 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 21:21:18 +0000 Subject: [Koha-cvs] koha/admin systempreferences.pl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 21:21:18 Modified files: admin : systempreferences.pl Log message: escaping > correctly CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.34.2.5&r2=1.34.2.6 Patches: Index: systempreferences.pl =================================================================== RCS file: /sources/koha/koha/admin/systempreferences.pl,v retrieving revision 1.34.2.5 retrieving revision 1.34.2.6 diff -u -b -r1.34.2.5 -r1.34.2.6 --- systempreferences.pl 30 Oct 2006 09:46:42 -0000 1.34.2.5 +++ systempreferences.pl 1 Nov 2006 21:21:18 -0000 1.34.2.6 @@ -164,7 +164,7 @@ $sth->execute($syspref); while (my $data=$sth->fetchrow_hashref){ $data->{value} =~ s/{value} =~ s/>/</g; + $data->{value} =~ s/>/>/g; $data->{value}=substr($data->{value},0,100)."..." if length($data->{value}) >100; push(@results,$data); $cnt++; From paul at koha-fr.org Wed Nov 1 22:21:31 2006 From: paul at koha-fr.org (paul poulain) Date: Wed, 01 Nov 2006 21:21:31 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui acqu... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/01 21:21:31 Modified files: koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl booksellers.tmpl supplier.tmpl Log message: fixing links & some html improvements CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.1&r2=1.5.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2 Patches: Index: acqui-home.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -b -r1.5.2.1 -r1.5.2.2 --- acqui-home.tmpl 31 Aug 2006 16:46:59 -0000 1.5.2.1 +++ acqui-home.tmpl 1 Nov 2006 21:21:31 -0000 1.5.2.2 @@ -9,7 +9,7 @@

Start, recieve, or modify any order

-

+

Index: booksellers.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- booksellers.tmpl 1 Aug 2006 15:28:55 -0000 1.1 +++ booksellers.tmpl 1 Nov 2006 21:21:31 -0000 1.1.2.1 @@ -63,10 +63,7 @@
-
-
- - -
+ Index: supplier.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -b -r1.2.2.1 -r1.2.2.2 --- supplier.tmpl 30 Oct 2006 09:54:21 -0000 1.2.2.1 +++ supplier.tmpl 1 Nov 2006 21:21:31 -0000 1.2.2.2 @@ -24,7 +24,7 @@

- +

@@ -40,7 +40,7 @@

- CONTACT DETAILS + Contact details

"> @@ -83,8 +83,8 @@

- - + +

@@ -108,14 +108,14 @@ checked>No

- - checked>Yes - checked>No + + checked>include GST + checked>don't include GST

- - checked>Yes - checked>No + + checked>include GST + checked>don't include GST

@@ -126,7 +126,7 @@

- +

Information for :

From antoine at koha-fr.org Thu Nov 2 10:26:26 2006 From: antoine at koha-fr.org (Antoine Farnault) Date: Thu, 02 Nov 2006 09:26:26 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes i... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Antoine Farnault 06/11/02 09:26:26 Modified files: koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css Log message: fix a cvs conflit. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.9&r2=1.7.2.10 Patches: Index: intranet.css =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v retrieving revision 1.7.2.9 retrieving revision 1.7.2.10 diff -u -b -r1.7.2.9 -r1.7.2.10 --- intranet.css 31 Oct 2006 16:42:16 -0000 1.7.2.9 +++ intranet.css 2 Nov 2006 09:26:26 -0000 1.7.2.10 @@ -267,7 +267,7 @@ #onlinehelp { float:right; -}======= +} /* the design of the INactives tab buttons (all other tabs) */ .tab_inactive { From antoine at koha-fr.org Thu Nov 2 10:27:30 2006 From: antoine at koha-fr.org (Antoine Farnault) Date: Thu, 02 Nov 2006 09:27:30 +0000 Subject: [Koha-cvs] koha/updater updatedatabase [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Antoine Farnault 06/11/02 09:27:30 Modified files: updater : updatedatabase Log message: issue.branchcode must be varchar(10). CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.15&r2=1.157.2.16 Patches: Index: updatedatabase =================================================================== RCS file: /sources/koha/koha/updater/updatedatabase,v retrieving revision 1.157.2.15 retrieving revision 1.157.2.16 diff -u -b -r1.157.2.15 -r1.157.2.16 --- updatedatabase 31 Oct 2006 17:41:51 -0000 1.157.2.15 +++ updatedatabase 2 Nov 2006 09:27:30 -0000 1.157.2.16 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: updatedatabase,v 1.157.2.15 2006/10/31 17:41:51 toins Exp $ +# $Id: updatedatabase,v 1.157.2.16 2006/11/02 09:27:30 toins Exp $ # Database Updater # This script checks for required updates to the database. @@ -652,6 +652,14 @@ default => '', extra => '', }, + { + field => 'branchcode', + type => 'varchar(10)', + null => 'NULL', + key => '', + default => '', + extra => '', + }, ], items => [ @@ -1620,8 +1628,8 @@ while ( ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow ){ $marcdone=1 if ($type eq 'longtext' && $column eq 'marcxml') ; } -unless ($marcdone) { -#unless (1) { # to disable this block just to test. +#unless ($marcdone) { +unless (1) { # to disable this block just to test. print "moving MARC record to biblioitems table\n"; # changing marc field type $dbh->do('ALTER TABLE `biblioitems` CHANGE `marc` `marc` BLOB NULL DEFAULT NULL '); @@ -1867,6 +1875,9 @@ exit; # $Log: updatedatabase,v $ +# Revision 1.157.2.16 2006/11/02 09:27:30 toins +# issue.branchcode must be varchar(10). +# # Revision 1.157.2.15 2006/10/31 17:41:51 toins # items.holdingbranch must be varchar(10) # From antoine at koha-fr.org Thu Nov 2 11:12:09 2006 From: antoine at koha-fr.org (Antoine Farnault) Date: Thu, 02 Nov 2006 10:12:09 +0000 Subject: [Koha-cvs] koha/C4 Koha.pm [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Antoine Farnault 06/11/02 10:12:09 Modified files: C4 : Koha.pm Log message: reintroduce the good GetBranches function. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.18&r2=1.40.2.19 Patches: Index: Koha.pm =================================================================== RCS file: /sources/koha/koha/C4/Koha.pm,v retrieving revision 1.40.2.18 retrieving revision 1.40.2.19 diff -u -b -r1.40.2.18 -r1.40.2.19 --- Koha.pm 31 Oct 2006 17:21:58 -0000 1.40.2.18 +++ Koha.pm 2 Nov 2006 10:12:09 -0000 1.40.2.19 @@ -17,7 +17,7 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA -# $Id: Koha.pm,v 1.40.2.18 2006/10/31 17:21:58 toins Exp $ +# $Id: Koha.pm,v 1.40.2.19 2006/11/02 10:12:09 toins Exp $ use strict; require Exporter; @@ -25,7 +25,7 @@ use C4::Output; use vars qw($VERSION @ISA @EXPORT); -$VERSION = do { my @v = '$Revision: 1.40.2.18 $' =~ /\d+/g; shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); }; +$VERSION = do { my @v = '$Revision: 1.40.2.19 $' =~ /\d+/g; shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); }; =head1 NAME @@ -139,16 +139,15 @@ =head2 GetBranches $branches = &GetBranches(); - returns informations about branches. + returns informations about ALL branches. Create a branch selector with the following code - Is branchIndependant sensitive - When IndependantBranches is set AND user is not superlibrarian, displays only user's branch + IndependantBranches Insensitive... =head3 in PERL SCRIPT my $branches = GetBranches; my @branchloop; -foreach my $thisbranch (sort keys %$branches) { +foreach my $thisbranch (keys %$branches) { my $selected = 1 if $thisbranch eq $branch; my %row =(value => $thisbranch, selected => $selected, @@ -168,30 +167,17 @@ =cut + sub GetBranches { -# returns a reference to a hash of references to branches... - my ($type) = @_; +# returns a reference to a hash of references to ALL branches... my %branches; - my $branch; my $dbh = C4::Context->dbh; my $sth; - if (C4::Context->preference("IndependantBranches") && (C4::Context->userenv->{flags}!=1)){ - my $strsth ="Select * from branches "; - $strsth.= " WHERE branchcode = ".$dbh->quote(C4::Context->userenv->{branch}); - $strsth.= " order by branchname"; - $sth=$dbh->prepare($strsth); - } else { $sth = $dbh->prepare("Select * from branches order by branchname"); - } $sth->execute; - while ($branch=$sth->fetchrow_hashref) { + while (my $branch=$sth->fetchrow_hashref) { my $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ?"); - if ($type){ - $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ? and categorycode = ?"); - $nsth->execute($branch->{'branchcode'},$type); - } else { $nsth->execute($branch->{'branchcode'}); - } while (my ($cat) = $nsth->fetchrow_array) { # FIXME - This seems wrong. It ought to be # $branch->{categorycodes}{$cat} = 1; @@ -204,14 +190,8 @@ # that aren't fields in the "branches" table. $branch->{$cat} = 1; } - if ($type) { $branches{$branch->{'branchcode'}}=$branch; } - } - if (!$type){ - $branches{$branch->{'branchcode'}}=$branch; - } - return (\%branches); } From paul at koha-fr.org Thu Nov 2 11:38:38 2006 From: paul at koha-fr.org (paul poulain) Date: Thu, 02 Nov 2006 10:38:38 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes m... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/02 10:38:38 Modified files: koha-tmpl/intranet-tmpl/prog/en/includes: menu-serials.inc Log message: reintroducing claims.pl CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3 Patches: Index: menu-serials.inc =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -b -r1.3.2.2 -r1.3.2.3 --- menu-serials.inc 30 Oct 2006 13:56:02 -0000 1.3.2.2 +++ menu-serials.inc 2 Nov 2006 10:38:38 -0000 1.3.2.3 @@ -2,6 +2,7 @@ home Serials issues Late issue + Claims Add a subscription
From paul at koha-fr.org Thu Nov 2 11:39:13 2006 From: paul at koha-fr.org (paul poulain) Date: Thu, 02 Nov 2006 10:39:13 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/catalogue ... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 06/11/02 10:39:13 Modified files: koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl Log message: minor html changes CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.6&r2=1.1.2.7 Patches: Index: advsearch.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -b -r1.1.2.6 -r1.1.2.7 --- advsearch.tmpl 30 Oct 2006 13:31:21 -0000 1.1.2.6 +++ advsearch.tmpl 2 Nov 2006 10:39:13 -0000 1.1.2.7 @@ -5,9 +5,9 @@