koha-cvs
[Top][All Lists]
Advanced

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

[Koha-cvs] CVS: koha detailprint.pl,1.1,1.2 catalogue-home.pl,1.9,1.10 d


From: Paul POULAIN
Subject: [Koha-cvs] CVS: koha detailprint.pl,1.1,1.2 catalogue-home.pl,1.9,1.10 detail.pl,1.22,1.23 insertidata.pl,1.5,1.6 memberentry.pl,1.38,1.39 newmember.pl,1.18,1.19 search.pl,1.33,1.34 shelves.pl,1.12,1.13 thesaurus_popup.pl,1.14,1.15 release_notes_191.txt,1.1,NONE release_notes_192.txt,1.1,NONE release_notes_193.txt,1.1,NONE release_notes_200pre1.txt,1.2,NONE release_notes_200pre2.txt,1.2,NONE release_notes_200pre3.txt,1.1,NONE release_notes_200pre4.txt,1.1,NONE release_notes_200pre5.txt,1.1,NONE release_notes_200RC1.txt,1.4,NONE
Date: Wed, 11 Feb 2004 00:35:34 -0800

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22477

Modified Files:
        catalogue-home.pl detail.pl insertidata.pl memberentry.pl 
        newmember.pl search.pl shelves.pl thesaurus_popup.pl 
Added Files:
        detailprint.pl 
Removed Files:
        release_notes_191.txt release_notes_192.txt 
        release_notes_193.txt release_notes_200pre1.txt 
        release_notes_200pre2.txt release_notes_200pre3.txt 
        release_notes_200pre4.txt release_notes_200pre5.txt 
        release_notes_200RC1.txt 
Log Message:
synch'ing 2.0.0 branch and head


Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue-home.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** catalogue-home.pl   8 Aug 2003 13:46:26 -0000       1.9
--- catalogue-home.pl   11 Feb 2004 08:35:31 -0000      1.10
***************
*** 17,21 ****
                             type => "intranet",
                             authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
                             debug => 1,
                             });
--- 17,21 ----
                             type => "intranet",
                             authnotrequired => 0,
!                            flagsrequired => {catalogue => 1},
                             debug => 1,
                             });

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** detail.pl   8 May 2003 13:19:40 -0000       1.22
--- detail.pl   11 Feb 2004 08:35:31 -0000      1.23
***************
*** 96,100 ****
                                                SITE_RESULTS => $sitearray,
                                                loggedinuser => $loggedinuser,
!                                               biblionumber => $biblionumber);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 96,101 ----
                                                SITE_RESULTS => $sitearray,
                                                loggedinuser => $loggedinuser,
!                                               biblionumber => $biblionumber,
!                                               );
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: insertidata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertidata.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** insertidata.pl      6 Jun 2003 10:00:52 -0000       1.5
--- insertidata.pl      11 Feb 2004 08:35:31 -0000      1.6
***************
*** 40,86 ****
  my $problems;
  my $env;
  foreach my $key (@names){
    $data{$key}=$input->param($key);
  }
  my $dbh = C4::Context->dbh;
! my $query="Select * from borrowers where 
borrowernumber=$data{'borrowernumber'}";
! my $sth=$dbh->prepare($query);
! $sth->execute;
  if (my $data2=$sth->fetchrow_hashref){
!       $query="update borrowers set 
title='$data{'title'}',expiry='$data{'expiry'}',
!       
cardnumber='$data{'cardnumber_institution'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
!       
streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
!       
altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
!       
emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
!       
altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
!       city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
!       
borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'institution_name'}',
!       
initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
!       
gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
!       textmessaging='$data{'textmessaging'}', branchcode = 
'$data{'branchcode'}',
!       zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}'
!       where borrowernumber=$data{'borrowernumber'}";
  } else {
        my $surname=$data{'institution_name'};
!       $query="insert into borrowers 
(title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
!       
firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
!       
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
!       
initials,ethnicity,borrowernumber,guarantor,school,branchcode,zipcode,homezipcode)
!       values ('','$data{'expiry'}','$data{'cardnumber_institution'}',
!       '','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
!       '$data{'firstname'}','$data{'altnotes'}','','$data{'contactname'}',
!       '$data{'emailaddress'}',
!       
now(),'$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
!       
'$data{'phoneday'}','I','$data{'city'}','$data{'area'}','$data{'phone'}',
!       
'$data{'borrowernotes'}','$data{'altphone'}','$surname','$data{'initials'}',
!       
'$data{'ethnicity'}','$data{'borrowernumber'}','','','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')";
  }
  
- #print $query;
- my $sth2=$dbh->prepare($query);
- warn "==> $query";
- $sth2->execute;
  $sth2->finish;
! #$sth->finish;
  
  print 
$input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}");
--- 40,107 ----
  my $problems;
  my $env;
+ my $sth2;
  foreach my $key (@names){
    $data{$key}=$input->param($key);
  }
  my $dbh = C4::Context->dbh;
! my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
! $sth->execute($data{'borrowernumber'});
  if (my $data2=$sth->fetchrow_hashref){
!       $sth2=$dbh->prepare("update borrowers set title=?,expiry=?,
!       cardnumber=?,sex=?,ethnotes=?,
!       streetaddress=?,faxnumber=?,firstname=?,
!       altnotes=?,dateofbirth=?,contactname=?,
!       emailaddress=?,dateenrolled=?,streetcity=?,
!       altrelationship=?,othernames=?,phoneday=?,
!       city=?,area=?,phone=?,
!       borrowernotes=?,altphone=?,surname=?,
!       initials=?,physstreet=?,ethnicity=?,
!       gonenoaddress=?,lost=?,debarred=?,
!       textmessaging=?, branchcode = ?,
!       zipcode = ?,homezipcode=?
!       where borrowernumber=?");
!       $sth2->execute($data{'title'},$data{'expiry'},
!       $data{'cardnumber_institution'},$data{'sex'},$data{'ethnicnotes'},
!       $data{'address'},$data{'faxnumber'},$data{'firstname'},
!       $data{'altnotes'},$data{'dateofbirth'},$data{'contactname'},
!       $data{'emailaddress'},$data{'joining'},$data{'streetcity'},
!       $data{'altrelationship'},$data{'othernames'},$data{'phoneday'},
!       $data{'city'},$data{'area'},$data{'phone'},
!       $data{'borrowernotes'},$data{'altphone'},$data{'institution_name'},
!       $data{'initials'},$data{'streetaddress'},$data{'ethnicity'},
!       $data{'gna'},$data{'lost'},$data{'debarred'},
!       $data{'textmessaging'},$data{'branchcode'},
!       $data{'zipcode'},$data{'homezipcode'},
!       $data{'borrowernumber'});
  } else {
        my $surname=$data{'institution_name'};
!       # note for code reading : 5 on each line
!       $sth2=$dbh->prepare("insert into borrowers (
!                       title,                  expiry,         cardnumber,     
sex,            ethnotes,
!                       streetaddress,  faxnumber,      firstname,              
altnotes,       dateofbirth,
!                       contactname,    emailaddress,   dateenrolled,   
streetcity,     altrelationship,
!                       othernames,     phoneday,               categorycode,   
city,           area,
!                       phone,          borrowernotes,  altphone,               
surname,        initials,
!                       ethnicity,              borrowernumber,guarantor,       
        school, branchcode,
!                       zipcode,                homezipcode)
!       values (        ?,?,?,?,?,
!                       ?,?,?,?,?,
!                       ?,?,now(),?,?,
!                       ?,?,?,?,?,
!                       ?,?,?,?,?,
!                       ?,?,?,?,?,
!                       ?,?
!                       )");
!       $sth2->execute('',                              $data{'expiry'},        
                $data{'cardnumber_institution'},        '',                     
        $data{'ethnotes'},
!                               $data{'address'},       $data{'faxnumber'},     
        $surname,                                       $data{'altnotes'},      
'',
!                               $data{'contactname'},$data{'emailaddress'},     
$data{'streetcity'},                    $data{'altrelationship'}, # only 4 
because of now()
!                               $data{'othernames'},    $data{'phoneday'},      
        'I',                                            $data{'city'},          
$data{'area'},
!                               ''.$data{'phone'},              
$data{'borrowernotes'}, $data{'altphone'},                      $surname,       
                ''.$data{'initials'},
!                               $data{'ethnicity'},     
$data{'borrowernumber'},        '',                                             
'',                             $data{'branchcode'},
!                               $data{'zipcode'},       $data{'homezipcode'});
  }
  
  $sth2->finish;
! $sth->finish;
  
  print 
$input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}");

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** memberentry.pl      31 Dec 2003 18:08:33 -0000      1.38
--- memberentry.pl      11 Feb 2004 08:35:31 -0000      1.39
***************
*** 60,67 ****
        print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member");
  } else {  # this else goes down the whole script
!       if ($type ne 'Add'){
!               $template->param( header => 'Update Member Details'); # bad 
templating style
        } else {
!               $template->param( header => 'Add New Member');
        }
  
--- 60,67 ----
        print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member");
  } else {  # this else goes down the whole script
!       if ($type eq 'Add'){
!               $template->param( addAction => 1);
        } else {
!               $template->param( addAction =>0);
        }
  

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** newmember.pl        18 Dec 2003 17:02:13 -0000      1.18
--- newmember.pl        11 Feb 2004 08:35:31 -0000      1.19
***************
*** 127,133 ****
      my $sex;
      if ($data{'sex'} eq 'M'){
!       $sex="Male";
      } else {
!       $sex="Female";
      }
      if ($data{'joining'} eq ''){
--- 127,133 ----
      my $sex;
      if ($data{'sex'} eq 'M'){
!       $sex=1;
      } else {
!       $sex=0;
      }
      if ($data{'joining'} eq ''){

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** search.pl   19 Dec 2003 17:28:03 -0000      1.33
--- search.pl   11 Feb 2004 08:35:31 -0000      1.34
***************
*** 20,26 ****
--- 20,35 ----
  
  # $Log$
+ # Revision 1.34  2004/02/11 08:35:31  tipaul
+ # synch'ing 2.0.0 branch and head
+ #
  # Revision 1.33  2003/12/19 17:28:03  tipaul
  # fix for #683
  #
+ # Revision 1.32.2.2  2004/01/13 17:33:39  tipaul
+ # removing useless (& buggy here) checkauth
+ #
+ # Revision 1.32.2.1  2003/12/19 17:28:42  tipaul
+ # fix for 683
+ #
  # Revision 1.32  2003/06/11 18:37:55  tonnesen
  # Using boolean_preference instead of preference for 'marc' setting
***************
*** 43,50 ****
  my $type=$query->param('type');
  
- #(-e "opac") && ($type='opac');
- 
- my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') 
? (1) : (0));
- 
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
--- 52,55 ----

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** shelves.pl  5 Feb 2003 10:04:14 -0000       1.12
--- shelves.pl  11 Feb 2004 08:35:31 -0000      1.13
***************
*** 5,10 ****
  # $Header$
  #
- 
- 
  # Copyright 2000-2002 Katipo Communications
  #
--- 5,8 ----
***************
*** 36,40 ****
  my $env;
  my $query = new CGI;
- #print $query->header(-cookie => $cookie);
  my $headerbackgroundcolor='#663266';
  my $circbackgroundcolor='#555555';
--- 34,37 ----
***************
*** 45,83 ****
      = get_template_and_user({template_name => "shelves.tmpl",
                                                        query => $query,
!                             type => "intranet",
!                             authnotrequired => 0,
!                             flagsrequired => {parameters => 1},
!                          });
! #print startpage();
! #print startmenu('catalogue');
! #print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
! 
! 
! my ($shelflist) = GetShelfList();
  
  if ($query->param('modifyshelfcontents')) {
!     my $shelfnumber=$query->param('shelfnumber');
!     my $barcode=$query->param('addbarcode');
!     my ($item) = getiteminformation($env, 0, $barcode);
!     AddToShelf($env, $item->{'itemnumber'}, $shelfnumber);
!     foreach ($query->param) {
!       if (/REM-(\d*)/) {
!           my $itemnumber=$1;
!           RemoveFromShelf($env, $itemnumber, $shelfnumber);
        }
-     }
  }
  
  SWITCH: {
!       $template->param({      loggedinuser => $loggedinuser,
!                                               viewshelf => 
$query->param('viewshelf'),
!                                               shelves => 
$query->param('shelves'),
!                                               headerbackgroundcolor => 
$headerbackgroundcolor,
!                                               circbackgroundcolor => 
$circbackgroundcolor });
!     if ($query->param('viewshelf')) {  viewshelf($query->param('viewshelf')); 
last SWITCH;}
!     if ($query->param('shelves')) {  shelves(); last SWITCH;}
!       my $color='';
!       my @shelvesloop;
!     foreach my $element (sort keys %$shelflist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
--- 42,77 ----
      = get_template_and_user({template_name => "shelves.tmpl",
                                                        query => $query,
!                                                       type => "intranet",
!                                                       authnotrequired => 0,
!                                                       flagsrequired => 
{catalogue => 1},
!                                               });
  
  if ($query->param('modifyshelfcontents')) {
!       my $shelfnumber=$query->param('shelfnumber');
!       my $barcode=$query->param('addbarcode');
!       my ($item) = getiteminformation($env, 0, $barcode);
!       AddToShelf($env, $item->{'itemnumber'}, $shelfnumber);
!       foreach ($query->param) {
!               if (/REM-(\d*)/) {
!                       my $itemnumber=$1;
!                       RemoveFromShelf($env, $itemnumber, $shelfnumber);
!               }
        }
  }
+ my ($shelflist) = GetShelfList();
  
+ $template->param({    loggedinuser => $loggedinuser,
+                                       headerbackgroundcolor => 
$headerbackgroundcolor,
+                                       circbackgroundcolor => 
$circbackgroundcolor });
  SWITCH: {
!       if ($query->param('viewshelf')) {  
viewshelf($query->param('viewshelf')); last SWITCH;}
!       if ($query->param('shelves')) {  shelves(); last SWITCH;}
! }
! 
! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been 
added
! 
! my $color='';
! my @shelvesloop;
! foreach my $element (sort keys %$shelflist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
***************
*** 87,106 ****
                $line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
                push (@shelvesloop, \%line);
-     }
-       $template->param(shelvesloop => address@hidden);
  }
  
  output_html_with_http_headers $query, $cookie, $template->output;
  
- 
  sub shelves {
!     if (my $newshelf=$query->param('addshelf')) {
!       my ($status, $string) = AddShelf($env,$newshelf);
!       if ($status) {
!           $template->param(status1 => $status, string1 => $string);
        }
-     }
        my @paramsloop;
!     foreach ($query->param()) {
                my %line;
                if (/DEL-(\d+)/) {
--- 81,98 ----
                $line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
                push (@shelvesloop, \%line);
  }
+ $template->param(shelvesloop => address@hidden);
  
  output_html_with_http_headers $query, $cookie, $template->output;
  
  sub shelves {
!       if (my $newshelf=$query->param('addshelf')) {
!               my ($status, $string) = AddShelf($env,$newshelf);
!               if ($status) {
!                       $template->param(status1 => $status, string1 => 
$string);
!               }
        }
        my @paramsloop;
!       foreach ($query->param()) {
                my %line;
                if (/DEL-(\d+)/) {
***************
*** 114,123 ****
                #if the shelf is not deleted, %line points on null
                push(@paramsloop,\%line);
!     }
        $template->param(paramsloop => address@hidden);
!     my ($shelflist) = GetShelfList();
!     my $color='';
        my @shelvesloop;
!     foreach my $element (sort keys %$shelflist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
--- 106,115 ----
                #if the shelf is not deleted, %line points on null
                push(@paramsloop,\%line);
!       }
        $template->param(paramsloop => address@hidden);
!       my ($shelflist) = GetShelfList();
!       my $color='';
        my @shelvesloop;
!       foreach my $element (sort keys %$shelflist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
***************
*** 127,143 ****
                $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ;
                push(@shelvesloop, \%line);
!     }
!       $template->param(shelvesloop=>address@hidden);
  }
  
- 
- 
  sub viewshelf {
!     my $shelfnumber=shift;
!     my ($itemlist) = GetShelfContents($env, $shelfnumber);
!     my $item='';
!     my $color='';
        my @itemsloop;
!     foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
--- 119,135 ----
                $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ;
                push(@shelvesloop, \%line);
!       }
!       $template->param(shelvesloop=>address@hidden,
!                                                       shelves => 1,
!                                               );
  }
  
  sub viewshelf {
!       my $shelfnumber=shift;
!       my ($itemlist) = GetShelfContents($env, $shelfnumber);
!       my $item='';
!       my $color='';
        my @itemsloop;
!       foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
                my %line;
                ($color eq $linecolor1) ? ($color=$linecolor2) : 
($color=$linecolor1);
***************
*** 148,162 ****
                $line{'author'}=$item->{'author'};
                push(@itemsloop, \%line);
!     }
!       $template->param(       itemsloop => address@hidden);
!       $template->param(       shelfname => 
$shelflist->{$shelfnumber}->{'shelfname'});
!       $template->param(       shelfnumber => $shelfnumber);
  }
  
- #print endpage();
- #print endmenu('catalogue');
- 
  #
  # $Log$
  # Revision 1.12  2003/02/05 10:04:14  acli
  # Worked around weirdness with HTML::Template; without the {}, it complains
--- 140,159 ----
                $line{'author'}=$item->{'author'};
                push(@itemsloop, \%line);
!       }
!       $template->param(       itemsloop => address@hidden,
!                                               shelfname => 
$shelflist->{$shelfnumber}->{'shelfname'},
!                                               shelfnumber => $shelfnumber,
!                                               viewshelf => 
$query->param('viewshelf'),
!                                       );
  }
  
  #
  # $Log$
+ # Revision 1.13  2004/02/11 08:35:31  tipaul
+ # synch'ing 2.0.0 branch and head
+ #
+ # Revision 1.12.2.1  2004/02/06 14:22:19  tipaul
+ # fixing bugs in bookshelves management.
+ #
  # Revision 1.12  2003/02/05 10:04:14  acli
  # Worked around weirdness with HTML::Template; without the {}, it complains

Index: thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** thesaurus_popup.pl  12 Jan 2004 16:58:20 -0000      1.14
--- thesaurus_popup.pl  11 Feb 2004 08:35:31 -0000      1.15
***************
*** 37,40 ****
--- 37,41 ----
  my $result = $input->param('result');
  my $search_string= $input->param('search_string');
+ $search_string = $result unless ($search_string);
  my $op = $input->param('op');
  my $id = $input->param('id');
***************
*** 42,46 ****
  my $index= $input->param('index');
  my $insert = $input->param('insert');
! 
  my $dbh = C4::Context->dbh;
  
--- 43,47 ----
  my $index= $input->param('index');
  my $insert = $input->param('insert');
! my $nohierarchy = $input->param('nohierarchy'); # if 1, just show the last 
part of entry (Marseille). If 0, show everything (Europe -- France --Marseille)
  my $dbh = C4::Context->dbh;
  
***************
*** 52,58 ****
        my ($father,$freelib_text) = $sti->fetchrow_array;
        if (length($result)>0) {
!               $result .= "|$father $freelib_text";
        } else {
!               $result = "$father $freelib_text";
        }
  }
--- 53,67 ----
        my ($father,$freelib_text) = $sti->fetchrow_array;
        if (length($result)>0) {
!               if ($nohierarchy) {
!                       $result .= "|$freelib_text";
!               } else {
!                       $result .= "|$father $freelib_text";
!               }
        } else {
!               if ($nohierarchy) {
!                       $result = "$freelib_text";
!               } else {
!                       $result = "$father $freelib_text";
!               }
        }
  }
***************
*** 78,82 ****
        $sti->execute($search_string,$category);
        while (my $line=$sti->fetchrow_hashref) {
!               $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}";
                push(@freelib,$line->{'id'});
        }
--- 87,95 ----
        $sti->execute($search_string,$category);
        while (my $line=$sti->fetchrow_hashref) {
!               if ($nohierarchy) {
!                       $stdlib{$line->{'id'}} = "$line->{'freelib'}";
!               } else {
!                       $stdlib{$line->{'id'}} = "$line->{'father'} 
$line->{'freelib'}";
!               }
                push(@freelib,$line->{'id'});
        }
***************
*** 106,110 ****
                                                result => $result,
                                                category => $category,
!                                               index => $index
                                                );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 119,124 ----
                                                result => $result,
                                                category => $category,
!                                               index => $index,
!                                               nohierarchy => $nohierarchy,
                                                );
  output_html_with_http_headers $input, $cookie, $template->output;

--- release_notes_191.txt DELETED ---

--- release_notes_192.txt DELETED ---

--- release_notes_193.txt DELETED ---

--- release_notes_200pre1.txt DELETED ---

--- release_notes_200pre2.txt DELETED ---

--- release_notes_200pre3.txt DELETED ---

--- release_notes_200pre4.txt DELETED ---

--- release_notes_200pre5.txt DELETED ---

--- release_notes_200RC1.txt DELETED ---




reply via email to

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