[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.54,1.55 Search.pm,1.72,1.73
|
From: |
MJ Ray |
|
Subject: |
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.54,1.55 Search.pm,1.72,1.73 |
|
Date: |
Mon, 14 Jul 2003 17:02:51 -0700 |
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv32425/C4
Modified Files:
Biblio.pm Search.pm
Log Message:
Work on bug 515... can we do a single-side rename of notes to bnotes?
Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** Biblio.pm 11 Jul 2003 11:51:32 -0000 1.54
--- Biblio.pm 15 Jul 2003 00:02:49 -0000 1.55
***************
*** 2,5 ****
--- 2,8 ----
# $Id$
# $Log$
+ # Revision 1.55 2003/07/15 00:02:49 slef
+ # Work on bug 515... can we do a single-side rename of notes to bnotes?
+ #
# Revision 1.54 2003/07/11 11:51:32 tipaul
# *** empty log message ***
***************
*** 948,952 ****
my $sth2=$dbh->prepare(" SELECT
biblioitemnumber,biblionumber,volume,number,classification,
itemtype,url,isbn,issn,dewey,subclass,publicationyear,publishercode,
!
volumedate,volumeddesc,timestamp,illus,pages,notes,size,place
FROM biblioitems
WHERE biblionumber=? and
biblioitemnumber=?
--- 951,955 ----
my $sth2=$dbh->prepare(" SELECT
biblioitemnumber,biblionumber,volume,number,classification,
itemtype,url,isbn,issn,dewey,subclass,publicationyear,publishercode,
!
volumedate,volumeddesc,timestamp,illus,pages,notes AS bnotes,size,place
FROM biblioitems
WHERE biblionumber=? and
biblioitemnumber=?
***************
*** 1526,1530 ****
$biblioitem->{'pages'} = $dbh->quote($biblioitem->{'pages'});
$biblioitem->{'volumeddesc'} =
$dbh->quote($biblioitem->{'volumeddesc'});
! $biblioitem->{'notes'} = $dbh->quote($biblioitem->{'notes'});
$biblioitem->{'size'} = $dbh->quote($biblioitem->{'size'});
$biblioitem->{'place'} = $dbh->quote($biblioitem->{'place'});
--- 1529,1533 ----
$biblioitem->{'pages'} = $dbh->quote($biblioitem->{'pages'});
$biblioitem->{'volumeddesc'} =
$dbh->quote($biblioitem->{'volumeddesc'});
! $biblioitem->{'bnotes'} = $dbh->quote($biblioitem->{'bnotes'});
$biblioitem->{'size'} = $dbh->quote($biblioitem->{'size'});
$biblioitem->{'place'} = $dbh->quote($biblioitem->{'place'});
***************
*** 1542,1546 ****
pages = $biblioitem->{'pages'},
volumeddesc = $biblioitem->{'volumeddesc'},
! notes = $biblioitem->{'notes'},
size = $biblioitem->{'size'},
place = $biblioitem->{'place'}
--- 1545,1549 ----
pages = $biblioitem->{'pages'},
volumeddesc = $biblioitem->{'volumeddesc'},
! notes = $biblioitem->{'bnotes'},
size = $biblioitem->{'size'},
place = $biblioitem->{'place'}
***************
*** 1597,1601 ****
$biblioitem->{'publishercode'},
$biblioitem->{'volumedate'},
$biblioitem->{'volumeddesc'},
$biblioitem->{'illus'},
! $biblioitem->{'pages'},
$biblioitem->{'notes'},
$biblioitem->{'size'},
$biblioitem->{'lccn'},
$biblioitem->{'marc'},
$biblioitem->{'place'});
--- 1600,1604 ----
$biblioitem->{'publishercode'},
$biblioitem->{'volumedate'},
$biblioitem->{'volumeddesc'},
$biblioitem->{'illus'},
! $biblioitem->{'pages'},
$biblioitem->{'binotes'},
$biblioitem->{'size'},
$biblioitem->{'lccn'},
$biblioitem->{'marc'},
$biblioitem->{'place'});
***************
*** 2265,2384 ****
# $encoding = C4::Context->preference("marcflavour") unless $encoding;
if ($encoding eq "UNIMARC") {
! s/\xe1/Æ/gm ;
! s/\xe2/Ð/gm ;
! s/\xe9/Ø/gm ;
! s/\xec/þ/gm ;
! s/\xf1/æ/gm ;
! s/\xf3/ð/gm ;
! s/\xf9/ø/gm ;
! s/\xfb/ß/gm ;
! s/\xc1\x61/à/gm ;
! s/\xc1\x65/è/gm ;
! s/\xc1\x69/ì/gm ;
! s/\xc1\x6f/ò/gm ;
! s/\xc1\x75/ù/gm ;
! s/\xc1\x41/À/gm ;
! s/\xc1\x45/È/gm ;
! s/\xc1\x49/Ì/gm ;
! s/\xc1\x4f/Ò/gm ;
! s/\xc1\x55/Ù/gm ;
! s/\xc2\x41/Á/gm ;
! s/\xc2\x45/É/gm ;
! s/\xc2\x49/Í/gm ;
! s/\xc2\x4f/Ó/gm ;
! s/\xc2\x55/Ú/gm ;
! s/\xc2\x59/Ý/gm ;
! s/\xc2\x61/á/gm ;
! s/\xc2\x65/é/gm ;
! s/\xc2\x69/í/gm ;
! s/\xc2\x6f/ó/gm ;
! s/\xc2\x75/ú/gm ;
! s/\xc2\x79/ý/gm ;
! s/\xc3\x41/Â/gm ;
! s/\xc3\x45/Ê/gm ;
! s/\xc3\x49/Î/gm ;
! s/\xc3\x4f/Ô/gm ;
! s/\xc3\x55/Û/gm ;
! s/\xc3\x61/â/gm ;
! s/\xc3\x65/ê/gm ;
! s/\xc3\x69/î/gm ;
! s/\xc3\x6f/ô/gm ;
! s/\xc3\x75/û/gm ;
! s/\xc4\x41/Ã/gm ;
! s/\xc4\x4e/Ñ/gm ;
! s/\xc4\x4f/Õ/gm ;
! s/\xc4\x61/ã/gm ;
! s/\xc4\x6e/ñ/gm ;
! s/\xc4\x6f/õ/gm ;
! s/\xc8\x45/Ë/gm ;
! s/\xc8\x49/Ï/gm ;
! s/\xc8\x65/ë/gm ;
! s/\xc8\x69/ï/gm ;
! s/\xc8\x76/ÿ/gm ;
! s/\xc9\x41/Ä/gm ;
! s/\xc9\x4f/Ö/gm ;
! s/\xc9\x55/Ü/gm ;
! s/\xc9\x61/ä/gm ;
! s/\xc9\x6f/ö/gm ;
! s/\xc9\x75/ü/gm ;
! s/\xca\x41/Å/gm ;
! s/\xca\x61/å/gm ;
! s/\xd0\x43/Ç/gm ;
! s/\xd0\x63/ç/gm ;
# this handles non-sorting blocks (if implementation requires
this)
$string = nsb_clean($_) ;
} elsif ($encoding eq "USMARC") {
if(/[\xc1-\xff]/) {
! s/\xe1\x61/à/gm ;
! s/\xe1\x65/è/gm ;
! s/\xe1\x69/ì/gm ;
! s/\xe1\x6f/ò/gm ;
! s/\xe1\x75/ù/gm ;
! s/\xe1\x41/À/gm ;
! s/\xe1\x45/È/gm ;
! s/\xe1\x49/Ì/gm ;
! s/\xe1\x4f/Ò/gm ;
! s/\xe1\x55/Ù/gm ;
! s/\xe2\x41/Á/gm ;
! s/\xe2\x45/É/gm ;
! s/\xe2\x49/Í/gm ;
! s/\xe2\x4f/Ó/gm ;
! s/\xe2\x55/Ú/gm ;
! s/\xe2\x59/Ý/gm ;
! s/\xe2\x61/á/gm ;
! s/\xe2\x65/é/gm ;
! s/\xe2\x69/í/gm ;
! s/\xe2\x6f/ó/gm ;
! s/\xe2\x75/ú/gm ;
! s/\xe2\x79/ý/gm ;
! s/\xe3\x41/Â/gm ;
! s/\xe3\x45/Ê/gm ;
! s/\xe3\x49/Î/gm ;
! s/\xe3\x4f/Ô/gm ;
! s/\xe3\x55/Û/gm ;
! s/\xe3\x61/â/gm ;
! s/\xe3\x65/ê/gm ;
! s/\xe3\x69/î/gm ;
! s/\xe3\x6f/ô/gm ;
! s/\xe3\x75/û/gm ;
! s/\xe4\x41/Ã/gm ;
! s/\xe4\x4e/Ñ/gm ;
! s/\xe4\x4f/Õ/gm ;
! s/\xe4\x61/ã/gm ;
! s/\xe4\x6e/ñ/gm ;
! s/\xe4\x6f/õ/gm ;
! s/\xe8\x45/Ë/gm ;
! s/\xe8\x49/Ï/gm ;
! s/\xe8\x65/ë/gm ;
! s/\xe8\x69/ï/gm ;
! s/\xe8\x76/ÿ/gm ;
! s/\xe9\x41/Ä/gm ;
! s/\xe9\x4f/Ö/gm ;
! s/\xe9\x55/Ü/gm ;
! s/\xe9\x61/ä/gm ;
! s/\xe9\x6f/ö/gm ;
! s/\xe9\x75/ü/gm ;
! s/\xea\x41/Å/gm ;
! s/\xea\x61/å/gm ;
# this handles non-sorting blocks (if implementation
requires this)
$string = nsb_clean($_) ;
--- 2268,2387 ----
# $encoding = C4::Context->preference("marcflavour") unless $encoding;
if ($encoding eq "UNIMARC") {
! s/\xe1/Â/gm ;
! s/\xe2/Â/gm ;
! s/\xe9/Â/gm ;
! s/\xec/Â/gm ;
! s/\xf1/Â/gm ;
! s/\xf3/Â/gm ;
! s/\xf9/Â/gm ;
! s/\xfb/Â/gm ;
! s/\xc1\x61/Â/gm ;
! s/\xc1\x65/Â/gm ;
! s/\xc1\x69/Â/gm ;
! s/\xc1\x6f/Â/gm ;
! s/\xc1\x75/Â/gm ;
! s/\xc1\x41/Â/gm ;
! s/\xc1\x45/Â/gm ;
! s/\xc1\x49/Â/gm ;
! s/\xc1\x4f/Â/gm ;
! s/\xc1\x55/Â/gm ;
! s/\xc2\x41/Â/gm ;
! s/\xc2\x45/Â/gm ;
! s/\xc2\x49/Â/gm ;
! s/\xc2\x4f/Â/gm ;
! s/\xc2\x55/Â/gm ;
! s/\xc2\x59/Â/gm ;
! s/\xc2\x61/Â/gm ;
! s/\xc2\x65/Â/gm ;
! s/\xc2\x69/Â/gm ;
! s/\xc2\x6f/Â/gm ;
! s/\xc2\x75/Â/gm ;
! s/\xc2\x79/Â/gm ;
! s/\xc3\x41/Â/gm ;
! s/\xc3\x45/Â/gm ;
! s/\xc3\x49/Â/gm ;
! s/\xc3\x4f/Â/gm ;
! s/\xc3\x55/Â/gm ;
! s/\xc3\x61/Â/gm ;
! s/\xc3\x65/Â/gm ;
! s/\xc3\x69/Â/gm ;
! s/\xc3\x6f/Â/gm ;
! s/\xc3\x75/Â/gm ;
! s/\xc4\x41/Â/gm ;
! s/\xc4\x4e/Â/gm ;
! s/\xc4\x4f/Â/gm ;
! s/\xc4\x61/Â/gm ;
! s/\xc4\x6e/Â/gm ;
! s/\xc4\x6f/Â/gm ;
! s/\xc8\x45/Â/gm ;
! s/\xc8\x49/Â/gm ;
! s/\xc8\x65/Â/gm ;
! s/\xc8\x69/Â/gm ;
! s/\xc8\x76/Â/gm ;
! s/\xc9\x41/Â/gm ;
! s/\xc9\x4f/Â/gm ;
! s/\xc9\x55/Â/gm ;
! s/\xc9\x61/Â/gm ;
! s/\xc9\x6f/Â/gm ;
! s/\xc9\x75/Â/gm ;
! s/\xca\x41/Â/gm ;
! s/\xca\x61/Â/gm ;
! s/\xd0\x43/Â/gm ;
! s/\xd0\x63/Â/gm ;
# this handles non-sorting blocks (if implementation requires
this)
$string = nsb_clean($_) ;
} elsif ($encoding eq "USMARC") {
if(/[\xc1-\xff]/) {
! s/\xe1\x61/Â/gm ;
! s/\xe1\x65/Â/gm ;
! s/\xe1\x69/Â/gm ;
! s/\xe1\x6f/Â/gm ;
! s/\xe1\x75/Â/gm ;
! s/\xe1\x41/Â/gm ;
! s/\xe1\x45/Â/gm ;
! s/\xe1\x49/Â/gm ;
! s/\xe1\x4f/Â/gm ;
! s/\xe1\x55/Â/gm ;
! s/\xe2\x41/Â/gm ;
! s/\xe2\x45/Â/gm ;
! s/\xe2\x49/Â/gm ;
! s/\xe2\x4f/Â/gm ;
! s/\xe2\x55/Â/gm ;
! s/\xe2\x59/Â/gm ;
! s/\xe2\x61/Â/gm ;
! s/\xe2\x65/Â/gm ;
! s/\xe2\x69/Â/gm ;
! s/\xe2\x6f/Â/gm ;
! s/\xe2\x75/Â/gm ;
! s/\xe2\x79/Â/gm ;
! s/\xe3\x41/Â/gm ;
! s/\xe3\x45/Â/gm ;
! s/\xe3\x49/Â/gm ;
! s/\xe3\x4f/Â/gm ;
! s/\xe3\x55/Â/gm ;
! s/\xe3\x61/Â/gm ;
! s/\xe3\x65/Â/gm ;
! s/\xe3\x69/Â/gm ;
! s/\xe3\x6f/Â/gm ;
! s/\xe3\x75/Â/gm ;
! s/\xe4\x41/Â/gm ;
! s/\xe4\x4e/Â/gm ;
! s/\xe4\x4f/Â/gm ;
! s/\xe4\x61/Â/gm ;
! s/\xe4\x6e/Â/gm ;
! s/\xe4\x6f/Â/gm ;
! s/\xe8\x45/Â/gm ;
! s/\xe8\x49/Â/gm ;
! s/\xe8\x65/Â/gm ;
! s/\xe8\x69/Â/gm ;
! s/\xe8\x76/Â/gm ;
! s/\xe9\x41/Â/gm ;
! s/\xe9\x4f/Â/gm ;
! s/\xe9\x55/Â/gm ;
! s/\xe9\x61/Â/gm ;
! s/\xe9\x6f/Â/gm ;
! s/\xe9\x75/Â/gm ;
! s/\xea\x41/Â/gm ;
! s/\xea\x61/Â/gm ;
# this handles non-sorting blocks (if implementation
requires this)
$string = nsb_clean($_) ;
Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** Search.pm 1 Jul 2003 10:30:05 -0000 1.72
--- Search.pm 15 Jul 2003 00:02:49 -0000 1.73
***************
*** 1436,1440 ****
my ($bibnum, $type) = @_;
my $dbh = C4::Context->dbh;
! my $query = "Select *, biblio.notes
from biblio, biblioitems
left join bibliosubtitle on
--- 1436,1440 ----
my ($bibnum, $type) = @_;
my $dbh = C4::Context->dbh;
! my $query = "Select *, biblioitems.notes AS bnotes, biblio.notes
from biblio, biblioitems
left join bibliosubtitle on
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/C4 Biblio.pm,1.54,1.55 Search.pm,1.72,1.73,
MJ Ray <=