[Koha-cvs] CVS: koha/value_builder unimarc_field_225a.pl,1.8,1.9

[Paul POULAIN]

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

Modified Files:
        unimarc_field_225a.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: unimarc_field_225a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** unimarc_field_225a.pl       23 Sep 2004 16:33:13 -0000      1.8
--- unimarc_field_225a.pl       1 Mar 2005 13:41:32 -0000       1.9
***************
*** 119,127 ****
        # if there is an isbn, complete search
                my @collections;
-       if ($isbn_found) {
                my $sth = $dbh->prepare("select 
auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
                                                left join auth_header on 
auth_subfield_table.authid=auth_header.authid 
                                                where authtypecode='EDITORS' 
and tag='200' and subfieldcode='a' and subfieldvalue=?");
!               my $sth2 = $dbh->prepare("select subfieldvalue from 
auth_subfield_table where tag='200' and subfieldcode='c' and authid=?");
                my @splited = split //, $isbn_found;
                my $isbn_rebuild='';
--- 119,126 ----
        # if there is an isbn, complete search
                my @collections;
                my $sth = $dbh->prepare("select 
auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
                                                left join auth_header on 
auth_subfield_table.authid=auth_header.authid 
                                                where authtypecode='EDITORS' 
and tag='200' and subfieldcode='a' and subfieldvalue=?");
!               my $sth2 = $dbh->prepare("select subfieldvalue from 
auth_subfield_table where tag='200' and subfieldcode='c' and authid=? order by 
subfieldvalue");
                my @splited = split //, $isbn_found;
                my $isbn_rebuild='';
***************
*** 135,146 ****
                        }
                }
-       } else {
-       # if there is no isbn, search with %
-               my $sth = $dbh->prepare("select stdlib from bibliothesaurus 
where father like ? and category='EDITORS' order by stdlib");
-               $sth->execute("\%$authoritysep $editor_found $authoritysep");
-               while (my ($line)= $sth->fetchrow) {
-                       push @collections,$line;
-               }
-       }
  #     my @collections = ["test"];
        my $collection =CGI::scrolling_list(-name=>'f1',
--- 134,137 ----