koha-cvs
[Top][All Lists]
Advanced

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

[Koha-cvs] koha C4/Biblio.pm C4/Output.pm C4/Search.pm cat...


From: paul poulain
Subject: [Koha-cvs] koha C4/Biblio.pm C4/Output.pm C4/Search.pm cat...
Date: Fri, 15 Jun 2007 13:44:47 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/06/15 13:44:46

Modified files:
        C4             : Biblio.pm Output.pm Search.pm 
        catalogue      : moredetail.pl 
        cataloguing    : addbiblio.pl 
        installer      : install.pl 
        koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl 
                                     opac-authorities-home.tmpl 
        koha-tmpl/opac-tmpl/prog/en/includes: masthead.inc 
                                              navigation.inc opac.css 
        misc/cronjobs  : build_browser_and_cloud.pl 
        misc/migration_tools: rebuild_nozebra.pl 
        reserve        : renewscript.pl 

Log message:
        some fixes (and only fixes)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.211&r2=1.212
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Output.pm?cvsroot=koha&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/moredetail.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/installer/install.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/misc/cronjobs/build_browser_and_cloud.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/rebuild_nozebra.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/renewscript.pl?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- C4/Biblio.pm        15 Jun 2007 09:40:06 -0000      1.211
+++ C4/Biblio.pm        15 Jun 2007 13:44:44 -0000      1.212
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.211 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.212 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -1996,14 +1996,11 @@
     my $xml = MARC::File::XML::header('UTF-8');
     if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
         MARC::File::XML->default_record_format('UNIMARC');
-        use POSIX qw(strftime);
-        my $string = strftime( "%Y%m%d", localtime(time) );
-        $string = sprintf( "%-*s", 35, $string );
-        substr( $string, 22, 6, "frey50" );
-        $xml .= "<datafield tag=\"100\" ind1=\"\" ind2=\"\">\n";
-        $xml .= "<subfield code=\"a\">$string</subfield>\n";
-        $xml .= "</datafield>\n";
     }
+    # in UNIMARC, field 100 contains the encoding
+    # check that there is one, otherwise the 
+    # MARC::Record->new_from_xml will fail (and Koha will die)
+    my $unimarc_and_100_exist=0;
     my $prevvalue;
     my $prevtag = -1;
     my $first   = 1;
@@ -2017,6 +2014,7 @@
         if ( !utf8::is_utf8( @$values[$i] ) ) {
             utf8::decode( @$values[$i] );
         }
+        $unimarc_and_100_exist=1 if C4::Context->preference('marcflavour') eq 
'UNIMARC' and @$tags[$i] eq "100" and @$subfields[$i] eq "a";
         if ( ( @$tags[$i] ne $prevtag ) ) {
             $j++ unless ( @$tags[$i] eq "" );
             if ( !$first ) {
@@ -2087,6 +2085,15 @@
         }
         $prevtag = @$tags[$i];
     }
+    if (C4::Context->preference('marcflavour') and !$unimarc_and_100_exist) {
+        use POSIX qw(strftime);
+        my $string = strftime( "%Y%m%d", localtime(time) );
+        $string = sprintf( "%-*s", 35, $string );
+        substr( $string, 22, 6, "frey50" );
+        $xml .= "<datafield tag=\"100\" ind1=\"\" ind2=\"\">\n";
+        $xml .= "<subfield code=\"a\">$string</subfield>\n";
+        $xml .= "</datafield>\n";
+    } 
     $xml .= MARC::File::XML::footer();
 
     return $xml;
@@ -3934,8 +3941,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.211 2007/06/15 09:40:06 toins Exp $
+# $Id: Biblio.pm,v 1.212 2007/06/15 13:44:44 tipaul Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.212  2007/06/15 13:44:44  tipaul
+# some fixes (and only fixes)
+#
 # Revision 1.211  2007/06/15 09:40:06  toins
 # do not get $3 $4 and $5 on GetMarcSubjects GetMarcAuthors on unimarc flavour.
 #

Index: C4/Output.pm
===================================================================
RCS file: /sources/koha/koha/C4/Output.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- C4/Output.pm        5 Jun 2007 08:53:19 -0000       1.62
+++ C4/Output.pm        15 Jun 2007 13:44:44 -0000      1.63
@@ -21,7 +21,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Output.pm,v 1.62 2007/06/05 08:53:19 tipaul Exp $
+# $Id: Output.pm,v 1.63 2007/06/15 13:44:44 tipaul Exp $
 
 # NOTE: I'm pretty sure this module is deprecated in favor of
 # templates.
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.62 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.63 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -326,7 +326,7 @@
 sub output_html_with_http_headers ($$$) {
     my($query, $cookie, $html) = @_;
     print $query->header(
-       -type   => 'utf-8',
+       -type   => 'text/html; charset=utf-8',
        -cookie => $cookie,
     ), $html;
 }

Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- C4/Search.pm        13 Jun 2007 13:04:24 -0000      1.145
+++ C4/Search.pm        15 Jun 2007 13:44:45 -0000      1.146
@@ -25,7 +25,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.145 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.146 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -1218,6 +1218,7 @@
         # automatic replace for short operators
         $left='title' if $left eq 'ti';
         $left='author' if $left eq 'au';
+        $left='publisher' if $left eq 'pb';
         $left='koha-Auth-Number' if $left eq 'an';
         if ($operator) {
             #do a specific search

Index: catalogue/moredetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/moredetail.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- catalogue/moredetail.pl     24 Apr 2007 13:54:29 -0000      1.13
+++ catalogue/moredetail.pl     15 Jun 2007 13:44:45 -0000      1.14
@@ -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: moredetail.pl,v 1.13 2007/04/24 13:54:29 hdl Exp $
+# $Id: moredetail.pl,v 1.14 2007/06/15 13:44:45 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -66,8 +66,8 @@
 
 my @results;
 
-my (@items)= itemissues($bi);
-my address@hidden;
+my $items= GetItemIssues($bi);
+my address@hidden;
 $data->{'count'}=$count;
 
 my $ordernum = GetOrderNumber($biblionumber,$bi);
@@ -75,7 +75,7 @@
 
 $results[0]=$data;
 
-foreach my $item (@items){
+foreach my $item (@$items){
     $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
     $item->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
     $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
@@ -94,7 +94,7 @@
 }
 
 $template->param(BIBITEM_DATA => address@hidden);
-$template->param(ITEM_DATA => address@hidden);
+$template->param(ITEM_DATA => address@hidden);
 $template->param(loggedinuser => $loggedinuser);
 
 output_html_with_http_headers $query, $cookie, $template->output;

Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- cataloguing/addbiblio.pl    8 Jun 2007 15:20:16 -0000       1.26
+++ cataloguing/addbiblio.pl    15 Jun 2007 13:44:45 -0000      1.27
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 
-# $Id: addbiblio.pl,v 1.26 2007/06/08 15:20:16 toins Exp $
+# $Id: addbiblio.pl,v 1.27 2007/06/15 13:44:45 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -104,25 +104,24 @@
                                my $newisbn = $field->subfield('a');
                                $newisbn =~ s/-//g;
                                $field->update( 'a' => $newisbn );
-                               
-                                               
                        }
-#                      $record->insert_fields_ordered($record->field('010'));
+    #                  $record->insert_fields_ordered($record->field('010'));
                }               
        }
-       
-    if ($record->subfield(100,'a')){
+        warn "AVANT : ".$record->as_formatted;
+        if ($record->subfield(100,'a')) {
        my $f100a=$record->subfield(100,'a');
        my $f100 = $record->field(100);
        my $f100temp = $f100->as_string;
        $record->delete_field($f100);
-       if (length($f100temp)>28){
+            if (length($f100temp)>28) {
        substr($f100temp,26,2,"50");
        $f100->update('a' => $f100temp);
        my $f100 = MARC::Field->new('100','','','a' => $f100temp);
        $record->insert_fields_ordered($f100);
        }
     }
+        warn "APRES: ".$record->as_formatted;
         if (ref($record) eq undef) {
             return -1;
         } else {

Index: installer/install.pl
===================================================================
RCS file: /sources/koha/koha/installer/install.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- installer/install.pl        24 Apr 2007 13:54:29 -0000      1.7
+++ installer/install.pl        15 Jun 2007 13:44:45 -0000      1.8
@@ -118,6 +118,7 @@
   unless (eval {require Digest::MD5})      { push 
@missing,{name=>"Digest::MD5"} };
   unless (eval {require MARC::Record})     { push 
@missing,{name=>"MARC::Record"} };
   unless (eval {require Mail::Sendmail})   { push 
@missing,{name=>"Mail::Sendmail",usagemail=>1} };
+  unless (eval {require List::MoreUtils})              { push 
@missing,{name=>"List::MoreUtils"} };
 # The following modules are not mandatory, depends on how the library want to 
use Koha
   unless (eval {require PDF::API2})   { 
           if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal

Index: koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl     6 Jun 2007 13:07:15 
-0000       1.5
+++ koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl     15 Jun 2007 13:44:45 
-0000      1.6
@@ -442,7 +442,7 @@
 <!-- RANK LIMITS -->
 <!-- SEARCH BUTTONS -->
 <p>
-    <input class="submit" type="submit" accesskey="s" name="do" title="Search" 
value="Search"/>
+    <input class="submit" type="submit" accesskey="s" name="do" title="Search" 
value="OK"/>
     <!-- TMPL_IF NAME="expanded_options" -->
         <a href="/cgi-bin/koha/opac-search.pl">[Fewer Options]</a>
     <!-- TMPL_ELSE -->

Index: koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl      9 Mar 2007 
15:43:15 -0000       1.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl      15 Jun 2007 
13:44:45 -0000      1.3
@@ -60,7 +60,7 @@
             </p>
             <p>(add % at the end of your word if you want to use 
right-truncation : <b>theor%</b> will find theory &amp; theories)</p>
             <p>
-                <input type="submit" value="Start search" class="submit">
+                <input type="submit" value="OK" class="submit">
             </p>
         </div>
     </form>

Index: koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc   6 Jun 2007 13:07:15 
-0000       1.4
+++ koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc   15 Jun 2007 13:44:46 
-0000      1.5
@@ -10,10 +10,10 @@
         <!-- TMPL_VAR NAME="LibraryName" -->
 </div>
 <div id="opac-main-search">
-    <label for="masthead_search">Search</label>
+    Search
     <form name="searchform" method="POST" 
action="/cgi-bin/koha/opac-search.pl" id="searchform">
         <input type="text" name="q" style="width: 30%;"/>
-        <input type="submit" value="Search" class="submit" />
+        <input type="submit" value="OK" class="submit" />
     </form>
     <a href="/cgi-bin/koha/opac-search.pl">more search options</a>
 </div>
\ No newline at end of file

Index: koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc 6 Jun 2007 13:07:15 
-0000       1.4
+++ koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc 15 Jun 2007 13:44:46 
-0000      1.5
@@ -31,7 +31,6 @@
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
         </ul>
-        <br />
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->

Index: koha-tmpl/opac-tmpl/prog/en/includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/opac-tmpl/prog/en/includes/opac.css       6 Jun 2007 13:07:16 
-0000       1.7
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac.css       15 Jun 2007 13:44:46 
-0000      1.8
@@ -47,7 +47,8 @@
     display:block;
     float:left;
     margin-right:0.2em;
-    width:7em;
+    width:10em;
+    font-size:0.8em;
 }
 
 a:link, a:visited, a:active {
@@ -149,16 +150,19 @@
     text-align:left;
     font-size:150%;
     font-weight:bold;
-    margin-bottom:25px;
+    margin-bottom:5px;
 }
 
 /* The image on the top-left (the logo) */
 #masthead-image {
-    position:fixed;
-    padding-left:0px;
-    padding-top:0px;
+    position:absolute;
+    left:10px;
+    top:10px;
+    background-color:white;
 }
+
 #masthead-image img {
+    background-color:white;
 }
 
 /* the itemtype list in advanced search */
@@ -184,14 +188,18 @@
 
 /* the content part of every page */
 #main {
-    margin-left:20%;
+    margin-left:15%;
     margin-bottom:0px;
 }
 
 /* the main menu (home, adv search) */
+
 #menu {
-    position:fixed;
-    padding:0px;
+    position:absolute;
+    padding:10px;
+    left:0px;
+    top:100px;
+    width:12%;
     font-size:0.8em;
     font-weight:bold;
     color:#384b73;
@@ -204,34 +212,42 @@
     text-decoration:none;
     color:#384b73;
     white-space: nowrap;
+    margin:0px;
+    padding:0px;
 }
 #menu ul a:hover {
     display:block;
-    margin:5px 5px 0px 5px;
-    padding :5px 5px 0px 5px;
+    margin:0;
+    padding :0;
     text-decoration:none;
     color:#990033;
     white-space: nowrap;
 }
 #menu ul {
     padding-left:0px;
-    margin-bottom:0px;
-    margin-top:0px;
+    margin:0;
+    padding-bottom:0px;
 }
 #menu li {
     list-style-type:none;
+    margin:0px;
+    padding-bottom:10px;
 }
 
 
+
 /***************/
 /* login block */
 /***************/
 #login {
-    position:fixed;
-    bottom:0px;
+    position:absolute;
+    left:0px;
+    bottom:10px;
     font-size:0.8em;
-    background-color : #cccccc;
+    background-color : #dddddd;
     padding:10px;
+    margin-right:84%;
+    width:12%;
 }
 #login input {
     font-size:0.8em;

Index: misc/cronjobs/build_browser_and_cloud.pl
===================================================================
RCS file: /sources/koha/koha/misc/cronjobs/build_browser_and_cloud.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/cronjobs/build_browser_and_cloud.pl    9 Mar 2007 15:44:20 -0000       
1.2
+++ misc/cronjobs/build_browser_and_cloud.pl    15 Jun 2007 13:44:46 -0000      
1.3
@@ -46,9 +46,11 @@
 #
 ###################################
 
+$max_digits=3 unless $max_digits;
 $field =~ /(\d\d\d)(.?)/;
 my $browser_tag = $1;
 my $browser_subfield = $2;
+warn "browser : $browser_tag / $browser_subfield";
 die "no cloud or browser field/subfield defined : nothing to do !" unless 
$browser_tag or $cloud_tag;
 
 my $dbh = C4::Context->dbh;
@@ -107,13 +109,16 @@
 
 # fills the browser table
 if ($browser_tag) {
+    print "inserting datas in browser table\n";
     # read existing classification table is possible
     my $classification;
-    if (C4::Context->preference('opaclanguages') eq 'en' && $browser_tag eq 
'676' & $browser_subfield eq 'a') {
+    if (C4::Context->preference('opaclanguages') eq 'fr' && $browser_tag eq 
'676' & $browser_subfield eq 'a') {
         $classification = dewey_french();
     }
-    
+    $classification = dewey_french();
     # calculate end node...
+    use Data::Dumper;
+    warn "==>".Dumper(%browser_result);
     foreach (keys %browser_result) {
         my $father = substr($_,0,-1);
         $browser_result{$father}->{notendnode}=1;

Index: misc/migration_tools/rebuild_nozebra.pl
===================================================================
RCS file: /sources/koha/koha/misc/migration_tools/rebuild_nozebra.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- misc/migration_tools/rebuild_nozebra.pl     11 Jun 2007 15:22:59 -0000      
1.6
+++ misc/migration_tools/rebuild_nozebra.pl     15 Jun 2007 13:44:46 -0000      
1.7
@@ -55,7 +55,7 @@
         'biblionumber' =>'0909',
         'itemtype' => '200b',
         'language' => '101a',
-        'publisher' => '210x',
+        'publisher' => '210c',
         'date' => '210d',
         'note' => 
'300a,301a,302a,303a,304a,305a,306az,307a,308a,309a,310a,311a,312a,313a,314a,315a,316a,317a,318a,319a,320a,321a,322a,323a,324a,325a,326a,327a,328a,330a,332a,333a,336a,337a,345a',
         'Koha-Auth-Number' => 
'6009,6019,6029,6039,6049,6059,6069,6109,7009,7019,7029,7109,7119,7129',
@@ -147,15 +147,20 @@
         }
     }
 }
+print "\nInserting records...\n";
+$i=0;
 my $sth = $dbh->prepare("INSERT INTO nozebra 
(server,indexname,value,biblionumbers) VALUES ('biblioserver',?,?,?)");
 foreach my $key (keys %result) {
     foreach my $index (keys %{$result{$key}}) {
         if (length($result{$key}->{$index}) > 1000000) {
             print "very long index (".length($result{$key}->{$index}).")for 
$key / $index. update mySQL config file if you have an error just after this 
warning (max_paquet_size parameter)\n";
         }
+        print "\r$i";
+        $i++;
         $sth->execute($key,$index,$result{$key}->{$index});
     }
 }
+print "\nbiblios done\n";
 
 print "\n***********************************\n";
 print "***** building AUTHORITIES indexes *****\n";
@@ -237,12 +242,17 @@
         }
     }
 }
+print "\nInserting...\n";
+$i=0;
 my $sth = $dbh->prepare("INSERT INTO nozebra 
(server,indexname,value,biblionumbers) VALUES ('authorityserver',?,?,?)");
 foreach my $key (keys %result) {
     foreach my $index (keys %{$result{$key}}) {
         if (length($result{$key}->{$index}) > 1000000) {
             print "very long index (".length($result{$key}->{$index}).")for 
$key / $index. update mySQL config file if you have an error just after this 
warning (max_paquet_size parameter)\n";
         }
+        print "\r$i";
+        $i++;
         $sth->execute($key,$index,$result{$key}->{$index});
     }
 }
+print "\nauthorities done\n";

Index: reserve/renewscript.pl
===================================================================
RCS file: /sources/koha/koha/reserve/renewscript.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- reserve/renewscript.pl      5 Jun 2007 08:54:21 -0000       1.9
+++ reserve/renewscript.pl      15 Jun 2007 13:44:46 -0000      1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: renewscript.pl,v 1.9 2007/06/05 08:54:21 tipaul Exp $
+# $Id: renewscript.pl,v 1.10 2007/06/15 13:44:46 tipaul Exp $
 
 #written 18/1/2000 by address@hidden
 #script to renew items from the web
@@ -55,7 +55,7 @@
 #      warn "renewal added";
 #    }else {
 #      warn "cannot renew";
-#      }
+       }
 }
 
 #




reply via email to

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