From e60f831e1f7004b3ee1f2df2eb08b36014455ce1 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 4 Apr 2003 08:40:44 +0000 Subject: [PATCH] last commits before 1.9.1 --- C4/Biblio.pm | 4 +++- C4/Output.pm | 2 -- C4/SearchMarc.pm | 7 ++++--- acqui.simple/addbiblio.pl | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index a6aa389e7f..870b0479dc 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -1,6 +1,9 @@ package C4::Biblio; # $Id$ # $Log$ +# Revision 1.42 2003/04/04 08:41:11 tipaul +# last commits before 1.9.1 +# # Revision 1.41 2003/04/01 12:26:43 tipaul # fixes # @@ -723,7 +726,6 @@ sub MARCmodbiblio { # modify the subfield if it's a different string if ($oldfield->subfield(@$subfield[0]) ne @$subfield[1] ) { my $subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder); - warn "subfieldid => $subfieldid"; &MARCmodsubfield($dbh,$subfieldid,@$subfield[1]); } } diff --git a/C4/Output.pm b/C4/Output.pm index 912a6303be..daeed45d34 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -120,11 +120,9 @@ sub themelanguage { THEME: foreach my $th (@themes) { foreach my $la (@languages) { - warn "File = $htdocs/$th/$la/$tmpl\n"; if (-e "$htdocs/$th/$la/$tmpl") { $theme = $th; $lang = $la; - warn "FOUND"; last THEME; } } diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm index 8ef3b349ff..796d46325d 100644 --- a/C4/SearchMarc.pm +++ b/C4/SearchMarc.pm @@ -69,7 +69,6 @@ sub catalogsearch { my $sql_where1; # will contain the "true" where my $sql_where2; # will contain m1.bibid=m2.bibid my $nb=1; - warn "value : ".@$value; for(my $i=0; $i<=@$value;$i++) { if (@$value[$i]) { if ($nb==1) { @@ -128,9 +127,11 @@ sub catalogsearch { chop $sql_tables; my $sth; if ($sql_where2) { - $sth = $dbh->prepare("select m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)"); + $sth = $dbh->prepare("select distinct m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)"); + warn("-->select m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)"); } else { - $sth = $dbh->prepare("select m1.bibid from $sql_tables where $sql_where1"); + $sth = $dbh->prepare("select distinct m1.bibid from $sql_tables where $sql_where1"); + warn("==>select m1.bibid from $sql_tables where $sql_where1"); } $sth->execute; my @result; diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl index e8779a92a1..857986fbf9 100755 --- a/acqui.simple/addbiblio.pl +++ b/acqui.simple/addbiblio.pl @@ -215,7 +215,7 @@ sub build_tabs ($$$) { my %subfield_data; $subfield_data{tag}=$tag; $subfield_data{subfield}=$subfield; - $subfield_data{marc_lib}="
".$tagslib->{$tag}->{$subfield}->{lib}."
"; + $subfield_data{marc_lib}="
".$tagslib->{$tag}->{$subfield}->{lib}."
"; $subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory}; $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory}; $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable}; -- 2.20.1