[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Cat
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86 |
|
Date: |
Wed, 11 Feb 2004 00:40:12 -0800 |
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4
Modified Files:
Biblio.pm BookShelves.pm Catalogue.pm Members.pm Output.pm
Search.pm
Log Message:
synch'ing 2.0.0 branch and head
Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** Biblio.pm 9 Dec 2003 15:57:28 -0000 1.78
--- Biblio.pm 11 Feb 2004 08:40:09 -0000 1.79
***************
*** 567,571 ****
return;
}
-
# otherwise, skip through each subfield...
my @fields = $record->fields();
--- 567,570 ----
***************
*** 695,699 ****
$dbh->do("delete from marc_subfield_table where bibid='$bibid' and
tag='$tag' and tagorder='$tagorder'
! and subfieldcode='$subfield' and
subfieldorder='$subfieldorder
");
}
--- 694,698 ----
$dbh->do("delete from marc_subfield_table where bibid='$bibid' and
tag='$tag' and tagorder='$tagorder'
! and subfieldcode='$subfield' and
subfieldorder='$subfieldorder'
");
}
***************
*** 1435,1439 ****
price =
?, replacementprice = ?,
replacementpricedate =
NOW(), itemnotes = ?,
! notforloan = ?
");
$sth->execute($itemnumber, $item->{'biblionumber'},
--- 1434,1438 ----
price =
?, replacementprice = ?,
replacementpricedate =
NOW(), itemnotes = ?,
! bulk =?,
notforloan = ?
");
$sth->execute($itemnumber, $item->{'biblionumber'},
***************
*** 1442,1446 ****
$item->{'homebranch'},$item->{'holdingbranch'},
$item->{'price'},$item->{'replacementprice'},
!
$item->{'itemnotes'},$item->{'notforloan'});
} else {
$sth=$dbh->prepare("Insert into items set
--- 1441,1445 ----
$item->{'homebranch'},$item->{'holdingbranch'},
$item->{'price'},$item->{'replacementprice'},
!
$item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'});
} else {
$sth=$dbh->prepare("Insert into items set
***************
*** 1451,1455 ****
price =
?, replacementprice = ?,
replacementpricedate =
NOW(), itemnotes = ?,
! notforloan = ?
");
$sth->execute($itemnumber, $item->{'biblionumber'},
--- 1450,1454 ----
price =
?, replacementprice = ?,
replacementpricedate =
NOW(), itemnotes = ?,
! bulk = ? , notforloan =
?
");
$sth->execute($itemnumber, $item->{'biblionumber'},
***************
*** 1458,1462 ****
$item->{'homebranch'},$item->{'holdingbranch'},
$item->{'price'},$item->{'replacementprice'},
!
$item->{'itemnotes'},$item->{'notforloan'});
}
if (defined $sth->errstr) {
--- 1457,1461 ----
$item->{'homebranch'},$item->{'holdingbranch'},
$item->{'price'},$item->{'replacementprice'},
!
$item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'});
}
if (defined $sth->errstr) {
***************
*** 1472,1477 ****
# my $dbh=C4Connect;
$item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'};
! my $query="update items set barcode=?,itemnotes=? where itemnumber=?";
! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'itemnum'});
if ($item->{'barcode'} eq ''){
$item->{'notforloan'}=0 unless $item->{'notforloan'};
--- 1471,1476 ----
# my $dbh=C4Connect;
$item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'};
! my $query="update items set barcode=?,itemnotes=?,bulk=?,notforloan=?
where itemnumber=?";
! my @bind =
($item->{'barcode'},$item->{'notes'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'});
if ($item->{'barcode'} eq ''){
$item->{'notforloan'}=0 unless $item->{'notforloan'};
***************
*** 1485,1491 ****
homebranch=?,
itemlost=?,
! wthdrawn=?
where itemnumber=?";
! @bind =
($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'itemnum'});
}
if ($item->{'replacement'} ne ''){
--- 1484,1492 ----
homebranch=?,
itemlost=?,
! wthdrawn=?,
! bulk=?,
! notforloan=?,
where itemnumber=?";
! @bind =
($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'});
}
if ($item->{'replacement'} ne ''){
***************
*** 1557,1561 ****
}
$query =~ s/\,$//;
- warn "Q 1560 : $query";
my $sth2=$dbh->prepare($query);
$sth2->execute(@bind);
--- 1558,1561 ----
***************
*** 1582,1586 ****
#replacing the last , by ",?)"
$query=~ s/\,$//;
- warn "Q olddelbiblio : $query";
$sth=$dbh->prepare($query);
$sth->execute(@bind);
--- 1582,1585 ----
***************
*** 2193,2196 ****
--- 2192,2208 ----
# $Id$
# $Log$
+ # Revision 1.79 2004/02/11 08:40:09 tipaul
+ # synch'ing 2.0.0 branch and head
+ #
+ # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul
+ # removing 2 warnings
+ #
+ # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul
+ # dealing correctly "bulk" field
+ #
+ # Revision 1.78.2.1 2004/01/13 17:29:53 tipaul
+ # * minor html fixes
+ # * adding publisher in acquisition process (& ordering basket by publisher)
+ #
# Revision 1.78 2003/12/09 15:57:28 tipaul
# rolling back to working char_decode sub
Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11
--- BookShelves.pm 11 Feb 2004 08:40:09 -0000 1.12
***************
*** 145,163 ****
#'
sub AddToShelf {
! my ($env, $itemnumber, $shelfnumber) = @_;
! my $sth=$dbh->prepare("select * from shelfcontents
! where shelfnumber=? and itemnumber=?");
!
! $sth->execute($shelfnumber, $itemnumber);
! if ($sth->rows) {
! # already on shelf
! } else {
! $sth=$dbh->prepare("insert into shelfcontents
! (shelfnumber, itemnumber, flags) values (?, ?, 0)");
- # FIXME - The default for 'flags' is NULL.
- # Why set it to 0?
$sth->execute($shelfnumber, $itemnumber);
! }
}
--- 145,159 ----
#'
sub AddToShelf {
! my ($env, $itemnumber, $shelfnumber) = @_;
! return unless $itemnumber;
! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=?
and itemnumber=?");
$sth->execute($shelfnumber, $itemnumber);
! if ($sth->rows) {
! # already on shelf
! } else {
! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber,
itemnumber, flags) values (?, ?, 0)");
! $sth->execute($shelfnumber, $itemnumber);
! }
}
***************
*** 244,247 ****
--- 240,249 ----
#
# $Log$
+ # Revision 1.12 2004/02/11 08:40:09 tipaul
+ # synch'ing 2.0.0 branch and head
+ #
+ # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul
+ # fixing bugs in bookshelves management.
+ #
# Revision 1.11 2003/12/15 10:57:08 slef
# DBI call fix for bug 662
Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** Catalogue.pm 17 Dec 2003 01:28:31 -0000 1.37
--- Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38
***************
*** 112,116 ****
$sth->execute($basketno);
}
! my @results = ();
while (my $data=$sth->fetchrow_hashref){
push(@results,$data);
--- 112,121 ----
$sth->execute($basketno);
}
! $query.=" order by biblioitems.publishercode";
! my $sth=$dbh->prepare($query);
! $sth->execute;
! my @results;
! # print $query;
! my $i=0;
while (my $data=$sth->fetchrow_hashref){
push(@results,$data);
Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Members.pm 15 Dec 2003 16:19:14 -0000 1.2
--- Members.pm 11 Feb 2004 08:40:10 -0000 1.3
***************
*** 67,73 ****
my $autonumber_members = C4::Context->boolean_preference('autoMemberNum');
$autonumber_members = 0 unless defined $autonumber_members;
-
- warn "autoMemberNum is $autonumber_members\n";
-
# Find out whether member numbers should be generated
# automatically. Should be either "1" or something else.
--- 67,70 ----
Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** Output.pm 10 Feb 2004 00:43:21 -0000 1.46
--- Output.pm 11 Feb 2004 08:40:10 -0000 1.47
***************
*** 76,80 ****
#FIXME: this is a quick fix to stop rc1 installing broken
#Still trying to figure out the correct fix.
! my $path =
C4::Context->config('intrahtdocs')."/intranet-tmpl/default/en/includes/";
#---------------------------------------------------------------------------------------------------------
--- 76,80 ----
#FIXME: this is a quick fix to stop rc1 installing broken
#Still trying to figure out the correct fix.
! my $path = C4::Context->config('intrahtdocs')."/default/en/includes/";
#---------------------------------------------------------------------------------------------------------
Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** Search.pm 14 Dec 2003 17:25:37 -0000 1.85
--- Search.pm 11 Feb 2004 08:40:10 -0000 1.86
***************
*** 1146,1150 ****
} else {
if ($type eq 'subject'){
! $query .= "group by subject order by subject ";
}
}
--- 1146,1150 ----
} else {
if ($type eq 'subject'){
! $query .= "order by subject group by subject ";
}
}
***************
*** 1350,1358 ****
}
! my $class = $data->{'classification'};
my $dewey = $data->{'dewey'};
$dewey =~ s/0+$//;
! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general
! # books about computer science
if ($dewey < 10){$dewey='00'.$dewey;}
if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
--- 1350,1357 ----
}
! my $class = $data->{'classification'};# FIXME : $class is useless
my $dewey = $data->{'dewey'};
$dewey =~ s/0+$//;
! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general
books about computer science
if ($dewey < 10){$dewey='00'.$dewey;}
if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
***************
*** 1378,1382 ****
$sth->finish;
#FIXME: ordering/indentation here looks wrong
! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=>");
$sth2->execute($biblionumber);
my $data;
--- 1377,1381 ----
$sth->finish;
#FIXME: ordering/indentation here looks wrong
! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?");
$sth2->execute($biblionumber);
my $data;
***************
*** 1949,1953 ****
}
#print $query;
! my $sth=$dbh->prepare("");
$sth->execute($bornum);
my @result;
--- 1948,1952 ----
}
#print $query;
! my $sth=$dbh->prepare($query);
$sth->execute($bornum);
my @result;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22
- Next by Date:
[Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11
- Previous by thread:
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22
- Next by thread:
[Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11
- Index(es):