June 2001 - Koha-devel - lists.koha-community.org

CVS: koha/translator translator.pl,1.1,1.2
by Chris Cormack 27 Jun '01

27 Jun '01

Update of /cvsroot/koha/koha/translator In directory usw-pr-cvs1:/tmp/cvs-serv24880/translator Modified Files: translator.pl Log Message: Modified so that the first available language is chosen if none is specified Index: translator.pl =================================================================== RCS file: /cvsroot/koha/koha/translator/translator.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** translator.pl 2001/06/26 22:13:50 1.1 --- translator.pl 2001/06/27 21:53:05 1.2 *************** *** 21,43 **** textdomain("koha"); ! my %lang=( ! fr => "fr_FR", ! pl => "pl_PL", ! ); ! my @lang=split/,/,$ENV{"HTTP_ACCEPT_LANGUAGE"}; my $lang="us_US"; ! foreach (@lang){ ! my $lg=$lang{$_}; ! setlocale(LC_MESSAGES,$lg); ! my $tmp = gettext($_); ! if ($tmp ne $_) ! { ! $lang=$tmp; ! last; } } setlocale(LC_MESSAGES,$lang); --- 21,50 ---- textdomain("koha"); ! my @locale=`locale -a`; ! my %lang; ! foreach(@locale){ ! next unless (/_/); ! push @{$lang{$`}}, $'; ! } ! my $str_env=$ENV{"HTTP_ACCEPT_LANGUAGE"}; ! $str_env=~s/\s*//g; ! my @lang=split/,/,$str_env; my $lang="us_US"; ! foreach my $locale(@lang){ ! goto find_locale if ($locale eq 'en'); ! foreach my $lg(@{$lang{$locale}}){ ! setlocale(LC_MESSAGES,$locale."_".$lg); ! my $tmp = gettext($locale); ! if ($tmp ne $locale) ! { ! $lang=$tmp; ! goto find_locale; ! } } } + find_locale: setlocale(LC_MESSAGES,$lang); *************** *** 63,66 **** --- 70,75 ---- $dgettxt{'iso-8859-1'}=1; + $dgettxt{'us_US'}=1; + my $txt =<<TXT; <HTML> *************** *** 103,107 **** $dane=~s/\\\"/&zamien/ges; # change \" ! # taka out graphics $dane=~s/[\"\']\/?([\w-\/\.]*?\.gif)[\"\']/&zamien($1)/ges; --- 112,116 ---- $dane=~s/\\\"/&zamien/ges; # change \" ! # take out graphics $dane=~s/[\"\']\/?([\w-\/\.]*?\.gif)[\"\']/&zamien($1)/ges; *************** *** 168,170 **** return "%${\($dane{$tmp})}%"; } - --- 177,178 ----

1 0

Catalogue.pm
by Tonnesen Steve 27 Jun '01

27 Jun '01

Chris: Catalogue.pm is getting pretty close to complete for updating records. Once it reaches that point, the next step is to modify the existing code to use the new API when inserting and updating data. You are more familiar with the existing code than I am, but do you see any problems with implementing this with the following six subroutines alone? There'll have to be some additional routines because some circulation data is also stored in these tables (items->datelastborrowed, datelastseen, etc) Also, I assume you'll want me to hold of on any changes to existing code until after you've made another release? Steve. ------------ newBiblio($env, $biblio) $biblio is a hash ref... $biblio->{'title'}, $biblio->{'author'}, etc. $biblio->{'subject'}, and $biblio->{'additionalauthors'} will be array references. Why is subtitle stored in a separate table, and not just another field in the biblio table? Historical reasons? newBiblioItem($env, $biblioitem) $biblioitem is a hash ref... $biblioitem->{'isbn'} (dewey, itemtype, publishercode, etc...) newItem($env, $item) again, $item is a hash ref... updateBiblio($env, $biblio) $biblio is a hash reference $biblio->{'biblionumber'} is used to compare all of the biblio fields between the old and new versions of the biblio. Any changes are logged and the change is made in both the Koha and the MARC tables. updateBiblioItem($env, $biblioitem) Same as updateBiblio updateItem($env, $item) Same as updateBiblio

2 2

CVS: koha/C4 Catalogue.pm,1.5,1.6
by Steve Tonnesen 27 Jun '01

27 Jun '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv429 Modified Files: Catalogue.pm Log Message: Finished updateBiblioItem subroutine Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Catalogue.pm 2001/06/26 21:13:01 1.5 --- Catalogue.pm 2001/06/26 22:27:12 1.6 *************** *** 546,549 **** --- 546,669 ---- my ($env, $biblioitem) = @_; + my $dbh=&C4Connect; + + my $biblioitemnumber=$biblioitem->{'biblioitemnumber'}; + my $sth=$dbh->prepare("select * from biblioitems where biblioitemnumber=$biblioitemnumber"); + # obi = original biblioitem + my $obi=$sth->fetchrow_hashref; + $sth=$dbh->prepare("select B.Record_ID from Bib_Table B, 0XX_Tag_Table T, 0XX_Subfield_Table S where B.Tag_0XX_ID=T.Tag_ID and T.Subfield_ID=S.Subfield_ID and T.Tag='090' and S.Subfield_Mark='c' and S.Subfield_Value=$biblioitemnumber"); + $sth->execute; + my ($Record_ID) = $sth->fetchrow; + if ($biblioitem->{'biblionumber'} ne $obi->{'biblionumber'}) { + logchange('kohadb', 'biblioitems', 'biblionumber', $obi->{'biblionumber'}, $biblioitem->{'biblionumber'}); + my $sth=$dbh->prepare("update biblioitems set biblionumber=$biblioitem->{'biblionumber'} where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '090', 'c', $obi->{'biblionumber'}, $biblioitem->{'biblionumber'}); + changeSubfield($Record_ID, '090', 'c', $obi->{'biblionumber'}, $biblioitem->{'biblionumber'}); + } + if ($biblioitem->{'volume'} ne $obi->{'volume'}) { + logchange('kohadb', 'biblioitems', 'volume', $obi->{'volume'}, $biblioitem->{'volume'}); + my $q_volume=$dbh->quote($biblioitem->{'volume'}); + my $sth=$dbh->prepare("update biblioitems set volume=$q_volume where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '440', 'v', $obi->{'volume'}, $biblioitem->{'volume'}); + changeSubfield($Record_ID, '440', 'v', $obi->{'volume'}, $biblioitem->{'volume'}); + } + if ($biblioitem->{'number'} ne $obi->{'number'}) { + logchange('kohadb', 'biblioitems', 'number', $obi->{'number'}, $biblioitem->{'number'}); + my $q_number=$dbh->quote($biblioitem->{'number'}); + my $sth=$dbh->prepare("update biblioitems set number=$q_number where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '440', 'v', $obi->{'number'}, $biblioitem->{'number'}); + changeSubfield($Record_ID, '440', 'v', $obi->{'number'}, $biblioitem->{'number'}); + } + if ($biblioitem->{'itemtype'} ne $obi->{'itemtype'}) { + logchange('kohadb', 'biblioitems', 'itemtype', $obi->{'itemtype'}, $biblioitem->{'itemtype'}); + my $q_itemtype=$dbh->quote($biblioitem->{'itemtype'}); + my $sth=$dbh->prepare("update biblioitems set itemtype=$q_itemtype where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '090', 'a', $obi->{'itemtype'}, $biblioitem->{'itemtype'}); + changeSubfield($Record_ID, '090', 'a', $obi->{'itemtype'}, $biblioitem->{'itemtype'}); + } + if ($biblioitem->{'isbn'} ne $obi->{'isbn'}) { + logchange('kohadb', 'biblioitems', 'isbn', $obi->{'isbn'}, $biblioitem->{'isbn'}); + my $q_isbn=$dbh->quote($biblioitem->{'isbn'}); + my $sth=$dbh->prepare("update biblioitems set isbn=$q_isbn where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '020', 'a', $obi->{'isbn'}, $biblioitem->{'isbn'}); + changeSubfield($Record_ID, '020', 'a', $obi->{'isbn'}, $biblioitem->{'isbn'}); + } + if ($biblioitem->{'issn'} ne $obi->{'issn'}) { + logchange('kohadb', 'biblioitems', 'issn', $obi->{'issn'}, $biblioitem->{'issn'}); + my $q_issn=$dbh->quote($biblioitem->{'issn'}); + my $sth=$dbh->prepare("update biblioitems set issn=$q_issn where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '022', 'a', $obi->{'issn'}, $biblioitem->{'issn'}); + changeSubfield($Record_ID, '022', 'a', $obi->{'issn'}, $biblioitem->{'issn'}); + } + if ($biblioitem->{'dewey'} ne $obi->{'dewey'}) { + logchange('kohadb', 'biblioitems', 'dewey', $obi->{'dewey'}, $biblioitem->{'dewey'}); + my $sth=$dbh->prepare("update biblioitems set dewey=$dewey where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '082', 'a', $obi->{'dewey'}, $biblioitem->{'dewey'}); + changeSubfield($Record_ID, '082', 'a', $obi->{'dewey'}, $biblioitem->{'dewey'}); + } + if ($biblioitem->{'subclass'} ne $obi->{'subclass'}) { + logchange('kohadb', 'biblioitems', 'subclass', $obi->{'subclass'}, $biblioitem->{'subclass'}); + my $q_subclass=$dbh->quote($biblioitem->{'subclass'}); + my $sth=$dbh->prepare("update biblioitems set subclass=$q_subclass where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '090', 'b', $obi->{'subclass'}, $biblioitem->{'subclass'}); + changeSubfield($Record_ID, '090', 'b', $obi->{'subclass'}, $biblioitem->{'subclass'}); + } + if ($biblioitem->{'place'} ne $obi->{'place'}) { + logchange('kohadb', 'biblioitems', 'place', $obi->{'place'}, $biblioitem->{'place'}); + my $q_place=$dbh->quote($biblioitem->{'place'}); + my $sth=$dbh->prepare("update biblioitems set place=$q_place where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '260', 'a', $obi->{'place'}, $biblioitem->{'place'}); + changeSubfield($Record_ID, '260', 'a', $obi->{'place'}, $biblioitem->{'place'}); + } + if ($biblioitem->{'publishercode'} ne $obi->{'publishercode'}) { + logchange('kohadb', 'biblioitems', 'publishercode', $obi->{'publishercode'}, $biblioitem->{'publishercode'}); + my $q_publishercode=$dbh->quote($biblioitem->{'publishercode'}); + my $sth=$dbh->prepare("update biblioitems set publishercode=$q_publishercode where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '260', 'b', $obi->{'publishercode'}, $biblioitem->{'publishercode'}); + changeSubfield($Record_ID, '260', 'b', $obi->{'publishercode'}, $biblioitem->{'publishercode'}); + } + if ($biblioitem->{'publicationyear'} ne $obi->{'publicationyear'}) { + logchange('kohadb', 'biblioitems', 'publicationyear', $obi->{'publicationyear'}, $biblioitem->{'publicationyear'}); + my $q_publicationyear=$dbh->quote($biblioitem->{'publicationyear'}); + my $sth=$dbh->prepare("update biblioitems set publicationyear=$q_publicationyear where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '260', 'c', $obi->{'publicationyear'}, $biblioitem->{'publicationyear'}); + changeSubfield($Record_ID, '260', 'c', $obi->{'publicationyear'}, $biblioitem->{'publicationyear'}); + } + if ($biblioitem->{'illus'} ne $obi->{'illus'}) { + logchange('kohadb', 'biblioitems', 'illus', $obi->{'illus'}, $biblioitem->{'illus'}); + my $q_illus=$dbh->quote($biblioitem->{'illus'}); + my $sth=$dbh->prepare("update biblioitems set illus=$q_illus where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '700', 'a', $obi->{'illus'}, $biblioitem->{'illus'}); + changeSubfield($Record_ID, '700', 'a', $obi->{'illus'}, $biblioitem->{'illus'}); + } + if ($biblioitem->{'pages'} ne $obi->{'pages'}) { + logchange('kohadb', 'biblioitems', 'pages', $obi->{'pages'}, $biblioitem->{'pages'}); + my $q_pages=$dbh->quote($biblioitem->{'pages'}); + my $sth=$dbh->prepare("update biblioitems set pages=$q_pages where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '300', 'a', $obi->{'pages'}, $biblioitem->{'pages'}); + changeSubfield($Record_ID, '300', 'a', $obi->{'pages'}, $biblioitem->{'pages'}); + } + if ($biblioitem->{'size'} ne $obi->{'size'}) { + logchange('kohadb', 'biblioitems', 'size', $obi->{'size'}, $biblioitem->{'size'}); + my $q_size=$dbh->quote($biblioitem->{'size'}); + my $sth=$dbh->prepare("update biblioitems set size=$q_size where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '300', 'c', $obi->{'size'}, $biblioitem->{'size'}); + changeSubfield($Record_ID, '300', 'c', $obi->{'size'}, $biblioitem->{'size'}); + } + if ($biblioitem->{'notes'} ne $obi->{'notes'}) { + logchange('kohadb', 'biblioitems', 'notes', $obi->{'notes'}, $biblioitem->{'notes'}); + my $q_notes=$dbh->quote($biblioitem->{'notes'}); + my $sth=$dbh->prepare("update biblioitems set notes=$q_notes where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '500', 'a', $obi->{'notes'}, $biblioitem->{'notes'}); + changeSubfield($Record_ID, '500', 'a', $obi->{'notes'}, $biblioitem->{'notes'}); + } + if ($biblioitem->{'lccn'} ne $obi->{'lccn'}) { + logchange('kohadb', 'biblioitems', 'lccn', $obi->{'lccn'}, $biblioitem->{'lccn'}); + my $q_lccn=$dbh->quote($biblioitem->{'lccn'}); + my $sth=$dbh->prepare("update biblioitems set lccn=$q_lccn where biblioitemnumber=$biblioitemnumber"); + logchange('marc', '010', 'c', $obi->{'lccn'}, $biblioitem->{'lccn'}); + changeSubfield($Record_ID, '010', 'c', $obi->{'lccn'}, $biblioitem->{'lccn'}); + } + } *************** *** 551,554 **** --- 671,675 ---- sub newItem { my ($env, $Record_ID, $item) = @_; + my $dbh=&C4Connect; my $barcode=$item->{'barcode'}; my $dateaccessioned=$item->{'dateaccessioned'};

1 0

CVS: koha/translator translator.pl,NONE,1.1 translator.readme,NONE,1.1
by Chris Cormack 27 Jun '01

27 Jun '01

Update of /cvsroot/koha/koha/translator In directory usw-pr-cvs1:/tmp/cvs-serv29400/translator Added Files: translator.pl translator.readme Log Message: Scripts to permit koha webpages to display in different natural languages Courtesy of Pawel Skuza --- NEW FILE --- #!/usr/bin/perl use strict; use locale; use POSIX; use Locale::gettext; my $tofile; if (exists $ENV{"HTTP_ACCEPT"}) { $tofile=0; } else { $tofile=1; } print "Content-Type: text/html \n\n" unless($tofile); my $path=$ENV{"PATH_TRANSLATED"}; textdomain("koha"); my %lang=( fr => "fr_FR", pl => "pl_PL", ); my @lang=split/,/,$ENV{"HTTP_ACCEPT_LANGUAGE"}; my $lang="us_US"; foreach (@lang){ my $lg=$lang{$_}; setlocale(LC_MESSAGES,$lg); my $tmp = gettext($_); if ($tmp ne $_) { $lang=$tmp; last; } } setlocale(LC_MESSAGES,$lang); my @katalog; my $plik; if ($tofile){ @katalog=`ls -R`; $plik=$ARGV[0]; if ($plik eq ''){ $plik="koha.gettext.c"; } } else { @katalog=("cos"); } my $kat; my (%dgettxt, %dane, %dane2, @dane2); my $i; $dgettxt{'iso-8859-1'}=1; my $txt =<<TXT; <HTML> <META http-equiv=Content-Type content="text/thml; charset=${$gettext('iso-8859-1'))}"> TXT foreach(@katalog){ if (/:$/){ $kat="$`/"; next; } if ($tofile){ unless ($_=~/(\.html|\.inc)$/i) { next; } } print "$kat$_" if ($tofile); my $dane; { local $/; if ($tofile){ open PL, "$kat$_"; } else { open PL, "$path"; } $dane=<PL>; close PL; } $dane=~s/<html>/$txt/i; $dane=~s/%/&zamien/ges; # change % (specjal symbol) $dane=~s/\\\'/&zamien/ges; # change \' $dane=~s/\\\"/&zamien/ges; # change \" # taka out graphics $dane=~s/[\"\']\/?([\w-\/\.]*?\.gif)[\"\']/&zamien($1)/ges; # $dane=~s/messenger\s*\((.*?)$\s*[\}\{;]/&zamien($1)/ges; # $dane=~s/\.write(ln)?\s*$(.*?)$\s*[\};]/&zamien($2)/ges; # take out string in field alt $dane=~s/alt\s*=\s*[\"]([^\"]*)[\"]/&zamien($1)/iges; $dane=~s/alt\s*=\s*[\']([^\']*)[\']/&zamien($1)/iges; $dane=~s//&zamien/ges; $dane=~s/<script.*?<\/script>/&zamien/iges; $dane=~s/<[\w\/]\w*\s*((\w*\s*=\s*(\'[^\']*\'|\"[^\"]*\"|[\w-\/?&,\.=%#]*)|[%\d*%]|\w)\s*)*>/&zamien/ges; $dane=~s/<!\[.*?\]>/&zamien/ges; $dane=~s/<![^>]*>/&zamien/ges; $dane=~s/<#.*?#>/&zamien/ges; my $dane2=$dane; $dane2=~s/(\s*%\d+%\s*)+/%/gs; $dane2=~s/^%//g; $dane2=~s/%$//g; foreach my $tmp(split/%/,$dane2){ my $tmp_ok = $tmp; $tmp_ok=~s/\s+/ /gs; next unless ($tmp_ok=~/\w+/); $dgettxt{$tmp_ok}++ unless $dgettxt{$tmp_ok}; $tmp=~s/([\)\(])/\\$1/g; $dane=~s/$tmp/gettext($tmp_ok)/es; } unless ($tofile){ while($dane=~/%\d+%/){ $dane=~s/%(\d+)%/$dane2{$1}/g; } print $dane; } } if ($tofile) { open PK, ">$plik"; foreach my $tmp(sort keys %dgettxt){ $tmp=~s/\"/\\\"/gs; print PK "gettext(\"$tmp\");\n"; } close PK; } exit; ########################################################### sub zamien { my $tmp = $&; unless ($dgettxt{$_[0]}) { $dgettxt{$_[0]}++; } $tmp=~s/$_[0]/gettext($&)/es; unless ($dane{$tmp}) { push @dane2, $tmp; $dane2{$i}=$tmp; $dane{$tmp}=$i++; } return "%${\($dane{$tmp})}%"; } --- NEW FILE --- This is small note about 'translator.pl'. Author: Pawel Skuza email: pawelzc(a)cz.top.pl Script 'translator.pl' do two things: 1. Prepare strings which can be translate; 2. Translate strings used gettext. 1. Prepare strings which can be translate. Copy file 'translator.pl' into root koha directory and execute it. eg. cd /usr/src/koha cp scripts/translator.pl . ./translator.pl some_file_name xgettext some_file_name -okoha.po vi koha.po //now you must translate koha.po msgfmt koha.po -okoha.mo cp koha.mo /usr/share/locale/$$/LC_MESSAGES //where $$ is your language note: if you omnit 'some_file_name' translator create 'koha.gettext.c' 2. Translate strings used gettext. You have to configure your apache. Put this lines in koha and opac virtual: Action text/html /cgi-bin/koha/translator.pl Action text/plane /cgi-bin/koha/translator.pl Don't forget set up the language preference in your browser.

1 0

CVS: koha/translator - New directory
by Chris Cormack 27 Jun '01

27 Jun '01

Update of /cvsroot/koha/koha/translator In directory usw-pr-cvs1:/tmp/cvs-serv29244/translator Log Message: Directory /cvsroot/koha/koha/translator added to the repository

1 0

CVS: koha/C4 Catalogue.pm,1.4,1.5
by Steve Tonnesen 26 Jun '01

26 Jun '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv15526 Modified Files: Catalogue.pm Log Message: newBiblio subroutine completed. Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Catalogue.pm 2001/06/26 20:17:35 1.4 --- Catalogue.pm 2001/06/26 21:13:01 1.5 *************** *** 56,67 **** my ($env, $biblio) = @_; my $title=$biblio->{'title'}; ! my $author=$biblio->{'author'}; my $subtitle=$biblio->{'subtitle'}; ! my $title=$biblio->{'title'}; my $copyrightdate=$biblio->{'copyrightdate'}; my $serial=$biblio->{'serial'}; my $seriestitle=$biblio->{'seriestitle'}; ! my $unititle=$biblio->{'unititle'}; my $notes=$biblio->{'notes'}; } --- 56,93 ---- my ($env, $biblio) = @_; my $title=$biblio->{'title'}; ! my $q_title=$dbh->quote($title); my $subtitle=$biblio->{'subtitle'}; ! my $q_subtitle=$dbh->quote($subtitle); ! ($q_subtitle) || ($q_subtitle="''"); ! my $author=$biblio->{'author'}; ! my $q_author=$dbh->quote($author); ! my $unititle=$biblio->{'unititle'}; ! my $q_unititle=$dbh->quote($unititle); my $copyrightdate=$biblio->{'copyrightdate'}; my $serial=$biblio->{'serial'}; my $seriestitle=$biblio->{'seriestitle'}; ! my $q_seriestitle=$dbh->quote($seriestitle); my $notes=$biblio->{'notes'}; + my $q_notes=$dbh->quote($notes); + my $subject=$biblio->{'subject'}; + my $additionalauthors=$biblio->{'additionalauthors'}; + my $sth=$dbh->prepare("select max(biblionumber) from biblio"); + $sth->execute; + my ($biblionumber) = $sth->fetchrow; + $biblionumber++; + $sth=$dbh->prepare("insert into biblio (biblionumber,title,author,unititle,copyrightdate,serial,seriestitle,notes) values ($biblionumber,$q_title,$q_author,$q_unititle,$copyrightdate,$serial,$q_seriestitle,$q_notes)"); + $sth->execute; + $sth=$dbh->prepare("insert into bibliosubtitle (biblionumber,subtitle) values ($biblionumber,$q_subtitle)"); + $sth->execute; + foreach (@$subject) { + my $q_subject=$dbh->quote($_); + my $sth=$dbh->prepare("insert into bibliosubject (biblionumber,subject) values ($biblionumber,$q_subject)"); + $sth->execute; + } + foreach (@$additionalauthors) { + my $q_additionalauthor=$dbh->quote($_); + my $sth=$dbh->prepare("insert into additionalauthors (biblionumber,author) values ($biblionumber,$q_additionalauthor)"); + $sth->execute; + } } *************** *** 540,543 **** --- 566,583 ---- my $itemtype=$item->{'itemtype'}; my $subclass=$item->{'subclass'}; + + # KOHADB Section + + unless ($env->{'marconly'}) { + my $sth=$dbh->prepare("select max(itemnumber) from items"); + $sth->execute; + my ($itemnumber) =$sth->fetchrow; + $itemnumber++; + $sth=$dbh->prepare("insert into items (itemnumber,biblionumber,biblioitemnumber,barcode,dateaccessioned,booksellerid,homebranch,price,replacementprice,replacementpricedate,notforloan,itemlost,wthdrawn,restricted,itemnotes) values ($itemnumber,$biblionumber,$biblioitemnumber,$q_barcode,$dateaccessioned,$q_booksellerid,$q_homebranch,$price,$q_replacementpricedate,$notforloan,$itemlost,$wthdrawn,$restricted,$q_itemnotes)"); + $sth->execute; + } + + + # MARC SECTION my $subfields; $subfields->{1}->{'Subfield_Mark'}='p';

1 0

CVS: koha/C4 Catalogue.pm,1.3,1.4
by Steve Tonnesen 26 Jun '01

26 Jun '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv2146 Modified Files: Catalogue.pm Log Message: Added biblioitems table update when newBiblioItem() routine is called. Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Catalogue.pm 2001/06/26 17:15:13 1.3 --- Catalogue.pm 2001/06/26 20:17:35 1.4 *************** *** 145,148 **** --- 145,152 ---- my $sti=$dbh->prepare("update biblio set title=$q_title where biblionumber=$biblio->{'biblionumber'}"); $sti->execute; + logchange('marc', '245', 'a', $origbiblio->{'title'}, $biblio->{'title'}); + foreach (@marcrecords) { + changeSubfield($_, '245', 'a', $origbiblio->{'title'}, $biblio->{'title'}); + } } if ($biblio->{'unititle'} ne $origbiblio->{'unititle'}) { *************** *** 157,160 **** --- 161,168 ---- my $sti=$dbh->prepare("update biblio set notes=$q_notes where biblionumber=$biblio->{'biblionumber'}"); $sti->execute; + logchange('marc', '500', 'a', $origbiblio->{'notes'}, $biblio->{'notes'}); + foreach (@marcrecords) { + changeSubfield($_, '500', 'a', $origbiblio->{'notes'}, $biblio->{'notes'}); + } } if ($biblio->{'serial'} ne $origbiblio->{'serial'}) { *************** *** 169,172 **** --- 177,184 ---- my $sti=$dbh->prepare("update biblio set seriestitle=$q_seriestitle where biblionumber=$biblio->{'biblionumber'}"); $sti->execute; + logchange('marc', '440', 'a', $origbiblio->{'seriestitle'}, $biblio->{'seriestitle'}); + foreach (@marcrecords) { + changeSubfield($_, '440', 'a', $origbiblio->{'seriestitle'}, $biblio->{'seriestitle'}); + } } if ($biblio->{'copyrightdate'} ne $origbiblio->{'copyrightdate'}) { *************** *** 175,178 **** --- 187,194 ---- my $sti=$dbh->prepare("update biblio set copyrightdate=$q_copyrightdate where biblionumber=$biblio->{'biblionumber'}"); $sti->execute; + logchange('marc', '260', 'c', "c$origbiblio->{'notes'}", "c$biblio->{'notes'}"); + foreach (@marcrecords) { + changeSubfield($_, '260', 'c', "c$origbiblio->{'notes'}", "c$biblio->{'notes'}"); + } } } *************** *** 242,268 **** my $biblioitemnumber=$biblioitem->{'biblioitemnumber'}; my $volume=$biblioitem->{'volume'}; my $number=$biblioitem->{'number'}; my $classification=$biblioitem->{'classification'}; my $itemtype=$biblioitem->{'itemtype'}; my $isbn=$biblioitem->{'isbn'}; my $issn=$biblioitem->{'issn'}; my $dewey=$biblioitem->{'dewey'}; $dewey=~s/\.*0*$//; ($dewey == 0) && ($dewey=''); my $subclass=$biblioitem->{'subclass'}; my $publicationyear=$biblioitem->{'publicationyear'}; my $publishercode=$biblioitem->{'publishercode'}; my $volumedate=$biblioitem->{'volumedate'}; my $illus=$biblioitem->{'illus'}; my $pages=$biblioitem->{'pages'}; my $notes=$biblioitem->{'notes'}; my $size=$biblioitem->{'size'}; my $place=$biblioitem->{'place'}; my $lccn=$biblioitem->{'lccn'}; # Should we check if there is already a biblioitem/marc with the # same isbn/lccn/issn? ! my $sth=$dbh->prepare("select title,unititle,seriestitle,copyrightdate,notes,author from biblio where biblionumber=$biblionumber"); $sth->execute; my ($title, $unititle,$seriestitle,$copyrightdate,$biblionotes,$author) = $sth->fetchrow; --- 258,317 ---- my $biblioitemnumber=$biblioitem->{'biblioitemnumber'}; my $volume=$biblioitem->{'volume'}; + my $q_volume=$dbh->quote($volume); my $number=$biblioitem->{'number'}; + my $q_number=$dbh->quote($number); my $classification=$biblioitem->{'classification'}; + my $q_classification=$dbh->quote($classification); my $itemtype=$biblioitem->{'itemtype'}; + my $q_itemtype=$dbh->quote($itemtype); my $isbn=$biblioitem->{'isbn'}; + my $q_isbn=$dbh->quote($isbn); my $issn=$biblioitem->{'issn'}; + my $q_issn=$dbh->quote($issn); my $dewey=$biblioitem->{'dewey'}; $dewey=~s/\.*0*$//; ($dewey == 0) && ($dewey=''); my $subclass=$biblioitem->{'subclass'}; + my $q_subclass=$dbh->quote($subclass); my $publicationyear=$biblioitem->{'publicationyear'}; my $publishercode=$biblioitem->{'publishercode'}; + my $q_publishercode=$dbh->quote($publishercode); my $volumedate=$biblioitem->{'volumedate'}; + my $q_volumedate=$dbh->quote($volumedate); my $illus=$biblioitem->{'illus'}; + my $q_illus=$dbh->quote($illus); my $pages=$biblioitem->{'pages'}; + my $q_pages=$dbh->quote($pages); my $notes=$biblioitem->{'notes'}; + my $q_notes=$dbh->quote($notes); my $size=$biblioitem->{'size'}; + my $q_size=$dbh->quote($size); my $place=$biblioitem->{'place'}; + my $q_place=$dbh->quote($place); my $lccn=$biblioitem->{'lccn'}; + my $q_lccn=$dbh->quote($lccn); + + + # Unless the $env->{'marconly'} flag is set, update the biblioitems table with + # the new data + + unless ($env->{'marconly'}) { + #my $sth=$dbh->prepare("lock tables biblioitems write"); + #$sth->execute; + my $sth=$dbh->prepare("select max(biblioitemnumber) from biblioitems"); + $sth->execute; + my ($biblioitemnumber) =$sth->fetchrow; + $biblioitemnumber++; + $sth=$dbh->prepare("insert into biblioitems (biblionumber,biblioitemnumber,volume,number,classification,itemtype,isbn,issn,dewey,subclass,publicationyear,publishercode,volumedate,illus,pages,notes,size,place,lccn) values ($biblionumber, $biblioitemnumber, $q_volume, $q_number, $q_classification, $q_itemtype, $q_isbn, $q_issn, $dewey, $q_subclass, $q_publicationyear, $q_publishercode, $q_volumedate, $q_illus, $q_pages,$q_notes, $q_size, $q_place, $q_lccn)"); + $sth->execute; + #my $sth=$dbh->prepare("unlock tables"); + #$sth->execute; + } + # Should we check if there is already a biblioitem/marc with the # same isbn/lccn/issn? ! $sth=$dbh->prepare("select title,unititle,seriestitle,copyrightdate,notes,author from biblio where biblionumber=$biblionumber"); $sth->execute; my ($title, $unititle,$seriestitle,$copyrightdate,$biblionotes,$author) = $sth->fetchrow;

1 0

CVS: koha/C4 Catalogue.pm,1.2,1.3
by Steve Tonnesen 26 Jun '01

26 Jun '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv29042 Modified Files: Catalogue.pm Log Message: Beginning updateBiblio routine. Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Catalogue.pm 2001/06/25 19:43:59 1.2 --- Catalogue.pm 2001/06/26 17:15:13 1.3 *************** *** 12,16 **** @ISA = qw(Exporter); @EXPORT = qw(&newBiblio &newBiblioItem &newItem &updateBiblio &updateBiblioItem ! &updateItem); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 12,16 ---- @ISA = qw(Exporter); @EXPORT = qw(&newBiblio &newBiblioItem &newItem &updateBiblio &updateBiblioItem ! &updateItem &changeSubfield); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 52,55 **** --- 52,57 ---- sub newBiblio { + # This subroutine makes no modifications to the MARC tables. MARC records are + # only created when new biblioitems are added. my ($env, $biblio) = @_; my $title=$biblio->{'title'}; *************** *** 64,67 **** --- 66,103 ---- } + + sub changeSubfield { + # Subroutine changes a subfield value given a Record_ID, Tag, and Subfield_Mark. + # Routine should be made more robust. It currently checks to make sure that + # the existing Subfield_Value is the same as the one passed in. What if no + # subfield matches this Subfield_OldValue? Create a new Subfield? Maybe check + # to make sure that the mark is repeatable first and that no other subfield + # with that mark already exists? Ability to return errors and status? + # + # Also, currently, if more than one subfield matches the Record_ID, Tag, + # Subfield_Mark, and Subfield_OldValue, only the first one will be modified. + # + # Might be nice to be able to pass a Subfield_ID directly to this routine to + # remove ambiguity, if possible. + + my $Record_ID=shift; + my $tag=shift; + my $firstdigit=substr($tag, 0, 1); + my $Subfield_Mark=shift; + my $Subfield_OldValue=shift; + my $Subfield_Value=shift; + my $dbh=&C4Connect; + my $sth=$dbh->prepare("select S.Subfield_ID, S.Subfield_Value from Bib_Table B, $firstdigit\XX_Tag_Table T, $firstdigit\XX_Subfield_Table S where B.Record_ID=$Record_ID and B.Tag_$firstdigit\XX_ID=T.Tag_ID and T.Subfield_ID=S.Subfield_ID and S.Subfield_Mark='$Subfield_Mark'"); + $sth->execute; + while (my ($ID, $Value) = $sth->fetchrow) { + if ($Value eq $Subfield_OldValue) { + my $q_Subfield_Value=$dbh->quote($Subfield_Value); + my $sti=$dbh->prepare("update $firstdigit\XX_Subfield_Table set Subfield_Value=$q_Subfield_Value where Subfield_ID=$ID"); + $sti->execute; + last; + } + } + } + sub updateBiblio { # Update the biblio with biblionumber $biblio->{'biblionumber'} *************** *** 73,81 **** --- 109,194 ---- # to the existing record and _LOG ALL CHANGES MADE_ in some way. I'd like for # this logging feature to be usable to undo changes easily. + # + # Need to add support for bibliosubject, additionalauthors, bibliosubtitle tables + my ($env, $biblio) = @_; + my $biblionumber=$biblio->{'biblionumber'}; + my $dbh=&C4Connect; + my $sth=$dbh->prepare("select * from biblio where biblionumber=$biblionumber"); + $sth->execute; + my $origbiblio=$sth->fetchrow_hashref; + + + # Obtain a list of MARC Record_ID's that are tied to this biblio + $sth=$dbh->prepare("select B.Record_ID from Bib_Table B, 0XX_Tag_Table T, 0XX_Subfield_Table S where B.Tag_0XX_ID=T.Tag_ID and T.Subfield_ID=S.Subfield_ID and T.Tag='090' and S.Subfield_Value=$biblionumber and S.Subfield_Mark='c'"); + $sth->execute; + my @marcrecords; + while (my ($Record_ID) = $sth->fetchrow) { + push(@marcrecords, $Record_ID); + } + + + + if ($biblio->{'author'} ne $origbiblio->{'author'}) { + my $q_author=$dbh->quote($biblio->{'author'}); + logchange('kohadb', 'biblio', 'author', $origbiblio->{'author'}, $biblio->{'author'}); + my $sti=$dbh->prepare("update biblio set author=$q_author where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + logchange('marc', '100', 'a', $origbiblio->{'author'}, $biblio->{'author'}); + foreach (@marcrecords) { + changeSubfield($_, '100', 'a', $origbiblio->{'author'}, $biblio->{'author'}); + } + } + if ($biblio->{'title'} ne $origbiblio->{'title'}) { + my $q_title=$dbh->quote($biblio->{'title'}); + logchange('kohadb', 'biblio', 'title', $origbiblio->{'title'}, $biblio->{'title'}); + my $sti=$dbh->prepare("update biblio set title=$q_title where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } + if ($biblio->{'unititle'} ne $origbiblio->{'unititle'}) { + my $q_unititle=$dbh->quote($biblio->{'unititle'}); + logchange('kohadb', 'biblio', 'unititle', $origbiblio->{'unititle'}, $biblio->{'unititle'}); + my $sti=$dbh->prepare("update biblio set unititle=$q_unititle where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } + if ($biblio->{'notes'} ne $origbiblio->{'notes'}) { + my $q_notes=$dbh->quote($biblio->{'notes'}); + logchange('kohadb', 'biblio', 'notes', $origbiblio->{'notes'}, $biblio->{'notes'}); + my $sti=$dbh->prepare("update biblio set notes=$q_notes where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } + if ($biblio->{'serial'} ne $origbiblio->{'serial'}) { + my $q_serial=$dbh->quote($biblio->{'serial'}); + logchange('kohadb', 'biblio', 'serial', $origbiblio->{'serial'}, $biblio->{'serial'}); + my $sti=$dbh->prepare("update biblio set serial=$q_serial where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } + if ($biblio->{'seriestitle'} ne $origbiblio->{'seriestitle'}) { + my $q_seriestitle=$dbh->quote($biblio->{'seriestitle'}); + logchange('kohadb', 'biblio', 'seriestitle', $origbiblio->{'seriestitle'}, $biblio->{'seriestitle'}); + my $sti=$dbh->prepare("update biblio set seriestitle=$q_seriestitle where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } + if ($biblio->{'copyrightdate'} ne $origbiblio->{'copyrightdate'}) { + my $q_copyrightdate=$dbh->quote($biblio->{'copyrightdate'}); + logchange('kohadb', 'biblio', 'copyrightdate', $origbiblio->{'copyrightdate'}, $biblio->{'copyrightdate'}); + my $sti=$dbh->prepare("update biblio set copyrightdate=$q_copyrightdate where biblionumber=$biblio->{'biblionumber'}"); + $sti->execute; + } } + sub logchange { + # Subroutine to log changes to databases + my $database=shift; + my $section=shift; + my $item=shift; + my $original=shift; + my $new=shift; + } sub addTag { + # Subroutine to add a tag to an existing MARC Record. If a new linkage id is + # desired, set $env->{'linkage'} to 1. If an existing linkage id should be + # set, set $env->{'linkid'} to the link number. my ($env, $Record_ID, $tag, $Indicator1, $Indicator2, $subfields) = @_; my $dbh=&C4Connect; *************** *** 127,130 **** --- 240,244 ---- my $dbh=&C4Connect; my $biblionumber=$biblioitem->{'biblionumber'}; + my $biblioitemnumber=$biblioitem->{'biblioitemnumber'}; my $volume=$biblioitem->{'volume'}; my $number=$biblioitem->{'number'}; *************** *** 291,294 **** --- 405,412 ---- $subfields->{2}->{'Subfield_Mark'}='b'; $subfields->{2}->{'Subfield_Value'}=$subclass; + $subfields->{3}->{'Subfield_Mark'}='c'; + $subfields->{3}->{'Subfield_Value'}=$biblionumber; + $subfields->{4}->{'Subfield_Mark'}='d'; + $subfields->{4}->{'Subfield_Value'}=$biblioitemnumber; my $tag='090'; addTag($env, $Record_ID, $tag, ' ', ' ', $subfields); *************** *** 434,438 **** # modified, and log all changes. ! my ($env, $biblio) = @_; } --- 552,556 ---- # modified, and log all changes. ! my ($env, $item) = @_; }

1 0

CVS: koha/marc viewmarc.pl,NONE,1.1
by Steve Tonnesen 25 Jun '01

25 Jun '01

Update of /cvsroot/koha/koha/marc In directory usw-pr-cvs1:/tmp/cvs-serv21900 Added Files: viewmarc.pl Log Message: Prototype marc record viewer and editor. --- NEW FILE --- #!/usr/bin/perl # # TODO # # Add info on biblioitems and items already entered as you enter new ones # use C4::Database; use CGI; use strict; use C4::Acquisitions; use C4::Output; my $input = new CGI; my $dbh=C4Connect; my $fields; marcdefs(); [...10196 lines suppressed...] $fields->{'880'}->{'secondindicator'}="Same as associated field"; $fields->{'880'}->{'subfields'}->{"6"}->{'name'}="Linkage (NR) $a-z Same as associated field $0-5 Same as associated field $7-9 Same as associated field"; $fields->{'880'}->{'subfields'}->{"6"}->{'repeating'}=0; $fields->{'886'}->{'name'}="FOREIGN MARC INFORMATION FIELD (R)"; $fields->{'886'}->{'repeating'}=1; $fields->{'886'}->{'firstindicator'}="Type of field"; $fields->{'886'}->{'firstindicatorvalues'}->{"0"}="Leader"; $fields->{'886'}->{'firstindicatorvalues'}->{"1"}="Variable control fields (002-009)"; $fields->{'886'}->{'firstindicatorvalues'}->{"2"}="Variable data fields (010-999)"; $fields->{'886'}->{'secondindicator'}="Undefined"; $fields->{'886'}->{'subfields'}->{"a"}->{'name'}="Tag of the foreign MARC field (NR)"; $fields->{'886'}->{'subfields'}->{"a"}->{'repeating'}=0; $fields->{'886'}->{'subfields'}->{"b"}->{'name'}="Content of the foreign MARC field (NR)"; $fields->{'886'}->{'subfields'}->{"b"}->{'repeating'}=0; $fields->{'886'}->{'subfields'}->{"2"}->{'name'}="Source of data (NR) $a-z - Foreign MARC subfield (R) $0-9 - Foreign MARC subfield (R)"; $fields->{'886'}->{'subfields'}->{"2"}->{'repeating'}=0; ; }

1 0

CVS: koha/marc TODO,NONE,1.1
by Steve Tonnesen 25 Jun '01

25 Jun '01

Update of /cvsroot/koha/koha/marc In directory usw-pr-cvs1:/tmp/cvs-serv21324 Added Files: TODO Log Message: A TODO file for MARC support --- NEW FILE --- MARC ToDo list 1. Finish cataloguing api (Catalogue.pm) 2. Modify existing code to use the new cataloguing api a. start with all write routines b. then all read routines 3. Polish up MARC editor. Must include some sanity checks to prevent modifications with the MARC editor rendering the data unusable by Koha. a. don't delete the barcode, warning before modifying barcode b. don't mess up linkages between 852 and 876 tags c. Home branch and holding branch info should require warnings before updating. d. others? 4. Need to create some indexes of the MARC data to aid in searches. Soundex searches would be nice. a. subject index b. title index c. author index d. dewey index e. itemtype index f. soundex indexes would require an index with 1 word in each record. For example, a book with the title "The Habitat and Lifestyle of the Elephant" would have entries for "Habitat", "Lifestyle" and "Elephant" all pointing to the book's record. An sql query like "select Record_ID from soundex_index where soundex(word) like soundex('elefant')" would return a point to "The Habitat and Lifestyle of the Elephant". (Personally, I think this is pretty silly, but I had some librarians ask for it, and it isn't overly difficult to implement). Soundex searches should be configurable as an option somewhere. For example, have a special interface for young children where they just type in a word and hit enter and soundex searches are used, but normal searches do not use soundex. It would be annoying for titles with the words 'Rode' and 'Road' to show up when you search for 'Rhode', for example. 5. A million other things, probably...

1 0