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

CVS: koha/acqui.simple marcimport.pl,1.3,1.4
by Steve Tonnesen 03 Nov '01

03 Nov '01

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv16947 Modified Files: marcimport.pl Log Message: Z39.50 now stores list of servers to query in a database table. Index: marcimport.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** marcimport.pl 2001/11/02 21:21:25 1.3 --- marcimport.pl 2001/11/03 07:28:20 1.4 *************** *** 88,99 **** if (/S-(.*)/) { my $server=$1; - if ($server eq 'LOC') { - push @serverlist, "LOC/z3950.loc.gov:7090/voyager//"; - } - if ($server eq 'NLC') { - push @serverlist, "NLC/amicus.nlc-bnc.ca:210/AMICUS/bccms1/hawk5fad"; - } if ($server eq 'MAN') { push @serverlist, "MAN/".$input->param('manualz3950server')."//"; } } --- 88,98 ---- if (/S-(.*)/) { my $server=$1; if ($server eq 'MAN') { push @serverlist, "MAN/".$input->param('manualz3950server')."//"; + } else { + my $sth=$dbh->prepare("select host,port,db,userid,password from z3950servers where id=$server"); + $sth->execute; + my ($host, $port, $db, $userid, $password) = $sth->fetchrow; + push @serverlist, "$server/$host\:$port/$db/$userid/$password"; } } *************** *** 278,281 **** --- 277,283 ---- my ($barcode) = $sth->fetchrow; $barcode++; + if ($barcode==1) { + $barcode=int(rand()*1000000); + } print << "EOF"; <table border=0 cellpadding=10 cellspacing=0> *************** *** 316,327 **** my $biblioitemnumber=$input->param('biblioitemnumber'); my $replacementprice=($input->param('replacementprice') || 0); ! my $sth=$dbh->prepare("select max(itemnumber) from items"); ! $sth->execute; ! my ($itemnumber) = $sth->fetchrow; ! $itemnumber++; ! my @datearr=localtime(time); ! my $date=(1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; ! $sth=$dbh->prepare("insert into items (itemnumber, biblionumber, biblioitemnumber, barcode, itemnotes, homebranch, holdingbranch, dateaccessioned, replacementprice) values ($itemnumber, $biblionumber, $biblioitemnumber, $q_barcode, $q_notes, $q_homebranch, 'STWE', '$date', $replacementprice)"); $sth->execute; } --- 318,336 ---- my $biblioitemnumber=$input->param('biblioitemnumber'); my $replacementprice=($input->param('replacementprice') || 0); ! my $sth=$dbh->prepare("select barcode from items where ! barcode=$q_barcode"); $sth->execute; + if ($sth->rows) { + print "<font color=red>Barcode '$barcode' has already been assigned.</font><p>\n"; + } else { + $sth=$dbh->prepare("select max(itemnumber) from items"); + $sth->execute; + my ($itemnumber) = $sth->fetchrow; + $itemnumber++; + my @datearr=localtime(time); + my $date=(1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; + $sth=$dbh->prepare("insert into items (itemnumber, biblionumber, biblioitemnumber, barcode, itemnotes, homebranch, holdingbranch, dateaccessioned, replacementprice) values ($itemnumber, $biblionumber, $biblioitemnumber, $q_barcode, $q_notes, $q_homebranch, 'STWE', '$date', $replacementprice)"); + $sth->execute; + } } *************** *** 689,698 **** foreach $serverstring (split(/\s+/, $servers)) { my ($name, $server, $database, $auth) = split(/\//, $serverstring, 4); ! if ($name eq 'LOC') { print "Library of Congress<br>\n"; } elsif ($name eq 'NLC') { print "National Library of Canada<br>\n"; } else { ! print "$server/$database<br>\n"; } print "<ul>\n"; --- 698,713 ---- foreach $serverstring (split(/\s+/, $servers)) { my ($name, $server, $database, $auth) = split(/\//, $serverstring, 4); ! if ($name eq 'MAN') { ! print "$server/$database<br>\n"; ! } elsif ($name eq 'LOC') { print "Library of Congress<br>\n"; } elsif ($name eq 'NLC') { print "National Library of Canada<br>\n"; } else { ! my $sti=$dbh->prepare("select name from ! z3950servers where id=$name"); ! $sti->execute; ! my ($longname)=$sti->fetchrow; ! print "$longname<br>\n"; } print "<ul>\n"; *************** *** 887,891 **** print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n"; print "<table border=0><tr><td valign=top>\n"; ! print "<h2>Results of Z3950 searches</h2>\n"; print "<a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Refresh</a><br>\n<ul>\n"; while (my ($id, $term, $type, $done, $numrecords, $length, $startdate, $enddate, $servers) = $sth->fetchrow) { --- 902,906 ---- print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n"; print "<table border=0><tr><td valign=top>\n"; ! print "<h2>Results of Z39.50 searches</h2>\n"; print "<a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Refresh</a><br>\n<ul>\n"; while (my ($id, $term, $type, $done, $numrecords, $length, $startdate, $enddate, $servers) = $sth->fetchrow) { *************** *** 921,924 **** --- 936,948 ---- print "</ul>\n"; print "</td><td valign=top width=30%>\n"; + my $sth=$dbh->prepare("select id,name,checked from z3950servers order by rank"); + $sth->execute; + my $serverlist=''; + while (my ($id, $name, $checked) = $sth->fetchrow) { + ($checked) ? ($checked='checked') : ($checked=''); + $serverlist.="<input type=checkbox name=S-$id $checked> $name<br>\n"; + } + $serverlist.="<input type=checkbox name=S-MAN> <input name=manualz3950server size=25 value=otherserver:210/DATABASE>\n"; + print << "EOF"; <form action=$ENV{'SCRIPT_NAME'} method=GET> *************** *** 927,937 **** <p> <input type=hidden name=test value=testvalue> ! <table border=1 bgcolor=#dddddd><tr><th bgcolor=#bbbbbb colspan=2>Search for MARC records<br>LOC and NLC</th></tr> <tr><td>Query Term</td><td><input name=query></td></tr> <tr><td colspan=2 align=center><input type=radio name=type value=isbn checked> ISBN <input type=radio name=type value=lccn> LCCN <input type=radio name=type value=title> Title</td></tr> <tr><td colspan=2> ! <input type=checkbox name=S-LOC checked> Library of Congress<br> ! <input type=checkbox name=S-NLC checked> National Library of Canada<br> ! <input type=checkbox name=S-MAN> <input name=manualz3950server size=25 value=otherserver:210/DATABASE> </td></tr> <tr><td colspan=2 align=center> --- 951,959 ---- <p> <input type=hidden name=test value=testvalue> ! <table border=1 bgcolor=#dddddd><tr><th bgcolor=#bbbbbb colspan=2>Search for MARC records</th></tr> <tr><td>Query Term</td><td><input name=query></td></tr> <tr><td colspan=2 align=center><input type=radio name=type value=isbn checked> ISBN <input type=radio name=type value=lccn> LCCN <input type=radio name=type value=title> Title</td></tr> <tr><td colspan=2> ! $serverlist </td></tr> <tr><td colspan=2 align=center>

1 0

CVS: koha-html/intranet-html/includes aquisitions-top.inc,1.2,1.3
by Steve Tonnesen 02 Nov '01

02 Nov '01

Update of /cvsroot/koha/koha-html/intranet-html/includes In directory usw-pr-cvs1:/tmp/cvs-serv19055 Modified Files: aquisitions-top.inc Log Message: Spelling correction. Index: aquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/includes/aquisitions-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** aquisitions-top.inc 2001/02/05 18:54:58 1.2 --- aquisitions-top.inc 2001/11/02 21:55:24 1.3 *************** *** 6,10 **** <html> <head> ! <title>KOHA: INTRANET: Aquisitions</title> --- 6,10 ---- <html> <head> ! <title>KOHA: INTRANET: Acquisitions</title>

1 0

CVS: koha/acqui.simple processz3950queue,NONE,1.1
by Steve Tonnesen 02 Nov '01

02 Nov '01

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv14787 Added Files: processz3950queue Log Message: Daemon to process the queue of pending Z39.50 searches. I still need to come up with a way for this process to get launched. Looks like Koha might need its first init script. :) --- NEW FILE --- #!/usr/bin/perl use C4::Database; use DBI; #use strict; use C4::Acquisitions; use C4::Output; my $dbh=C4Connect; while (1) { my $sth=$dbh->prepare("select id,term,type,servers from z3950queue where isnull(done) || done=-1"); $sth->execute; while (my ($id, $term, $type, $servers) = $sth->fetchrow) { my $now=time(); my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=$now where id=$id"); $sti->execute; my $attr=''; if ($type eq 'isbn') { $attr='1=7'; } elsif ($type eq 'title') { $attr='1=4'; } elsif ($type eq 'lccn') { $attr='1=9'; } $term='"'.$term.'"'; $query="f \@attr $attr $term"; my $totalrecords=0; my $serverinfo; foreach $serverinfo (split(/\s+/, $servers)) { my ($name, $server, $database, $auth) = split(/\//, $serverinfo, 4); ($auth eq '/') && ($auth=''); print "Processing $type=$term at $name $server $database $auth\n"; $now=time(); my $q_serverinfo=$dbh->quote($serverinfo); my $sti=$dbh->prepare("insert into z3950results (server, queryid, startdate) values ($q_serverinfo, $id, $now)"); $sti->execute; my $resultsid=$dbh->{'mysql_insertid'}; getrecord($server, $database, $query, $auth); my $result=`cat yaz.mrc`; unlink ('yaz.mrc'); my $splitchar=chr(29); my @records=split(/$splitchar/, $result); my $numrecords=$#records+1; $totalrecords+=$numrecords; my $q_result=$dbh->quote($result); ($q_result) || ($q_result='""'); $now=time(); $sti=$dbh->prepare("update z3950results set numrecords=$numrecords,results=$q_result,enddate=$now where id=$resultsid"); $sti->execute; } $sti=$dbh->prepare("update z3950queue set done=1,numrecords=$totalrecords,enddate=$now where id=$id"); $sti->execute; } sleep 15; } sub getrecord { my $server=shift; my $base=shift; my $query=shift; my $auth=shift; open (M, "|yaz-client -m yaz.mrc >>yaz.out 2>>yaz.err"); select M; $|=1; select STDOUT; ($auth) && ($auth="authentication $auth\n"); print << "EOF"; $auth\open $server base $base $query s s s s s s s s s s quit EOF print M << "EOF"; $auth\open $server base $base $query s s s s s s s s s s quit EOF close M; }

1 0

CVS: koha/acqui.simple marcimport.pl,1.2,1.3
by Steve Tonnesen 02 Nov '01

02 Nov '01

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv9216 Modified Files: marcimport.pl Log Message: Added Z39.50 searching capability, and MARC file uploading from workstation using HTML forms. Z39.50 functionality requires the YAZ toolkit. Index: marcimport.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** marcimport.pl 2001/11/01 05:00:41 1.2 --- marcimport.pl 2001/11/02 21:21:25 1.3 *************** *** 81,84 **** --- 81,159 ---- my $file=$input->param('file'); + if ($input->param('z3950queue')) { + my $query=$input->param('query'); + my $type=$input->param('type'); + my @serverlist; + foreach ($input->param) { + if (/S-(.*)/) { + my $server=$1; + if ($server eq 'LOC') { + push @serverlist, "LOC/z3950.loc.gov:7090/voyager//"; + } + if ($server eq 'NLC') { + push @serverlist, "NLC/amicus.nlc-bnc.ca:210/AMICUS/bccms1/hawk5fad"; + } + if ($server eq 'MAN') { + push @serverlist, "MAN/".$input->param('manualz3950server')."//"; + } + } + } + my $isbnfailed=0; + if ($type eq 'isbn') { + my $q=$query; + $q=~s/[^X\d]//g; + $q=~s/X.//g; + if (length($q)==10) { + my $checksum=substr($q,9,1); + my $isbn=substr($q,0,9); + my $i; + my $c=0; + for ($i=0; $i<9; $i++) { + my $digit=substr($q,$i,1); + $c+=$digit*(10-$i); + } + $c=int(11-($c/11-int($c/11))*11+.1); + ($c==10) && ($c='X'); + if ($c eq $checksum) { + } else { + print "<font color=red size=+1>$query is not a valid ISBN + Number</font><p>\n"; + $isbnfailed=1; + } + } else { + print "<font color=red size=+1>$query is not a valid ISBN + Number</font><p>\n"; + $isbnfailed=1; + } + } + unless ($isbnfailed) { + my $q_term=$dbh->quote($query); + my $serverlist=''; + foreach (@serverlist) { + $serverlist.="$_ "; + } + chop $serverlist; + my $q_serverlist=$dbh->quote($serverlist); + my $sth=$dbh->prepare("insert into z3950queue (term,type,servers) values ($q_term, '$type', $q_serverlist)"); + $sth->execute; + } + } + + if (my $data=$input->param('uploadmarc')) { + my $name=$input->param('name'); + ($name) || ($name=$data); + my $marcrecord=''; + if (length($data)>0) { + while (<$data>) { + $marcrecord.=$_; + } + } + my $q_marcrecord=$dbh->quote($marcrecord); + my $q_name=$dbh->quote($name); + my $sth=$dbh->prepare("insert into uploadedmarc (marc,name) values ($q_marcrecord, $q_name)"); + $sth->execute; + } + + if ($input->param('insertnewrecord')) { my $isbn=$input->param('isbn'); *************** *** 99,103 **** my $biblioitemnumber=0; print "<center>\n"; ! print "<a href=marcimport.pl?file=$file>New Record</a> | <a href=marcimport.pl>New File</a><br>\n"; if ($sth->rows) { ($biblionumber, $biblioitemnumber) = $sth->fetchrow; --- 174,178 ---- my $biblioitemnumber=0; print "<center>\n"; ! print "<a href=$ENV{'SCRIPT_NAME'}?file=$file>New Record</a> | <a href=marcimport.pl>New File</a><br>\n"; if ($sth->rows) { ($biblionumber, $biblioitemnumber) = $sth->fetchrow; *************** *** 252,256 **** --- 327,333 ---- + my $menu = $input->param('menu'); if ($file) { + print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n"; my $qisbn=$input->param('isbn'); my $qissn=$input->param('issn'); *************** *** 258,264 **** my $qcontrolnumber=$input->param('controlnumber'); if ($qisbn || $qissn || $qlccn || $qcontrolnumber) { ! print "<a href=marcimport.pl>New File</a><hr>\n"; ! open (F, "$file"); ! my $data=<F>; $splitchar=chr(29); --- 335,353 ---- my $qcontrolnumber=$input->param('controlnumber'); if ($qisbn || $qissn || $qlccn || $qcontrolnumber) { ! print "<a href=$ENV{'SCRIPT_NAME'}>New File</a><hr>\n"; ! #open (F, "$file"); ! #my $data=<F>; ! my $data; ! if ($file=~/Z-(\d+)/) { ! my $id=$1; ! my $resultsid=$input->param('resultsid'); ! my $sth=$dbh->prepare("select results from z3950results where id=$resultsid"); ! $sth->execute; ! ($data) = $sth->fetchrow; ! } else { ! my $sth=$dbh->prepare("select marc from uploadedmarc where id=$file"); ! $sth->execute; ! ($data) = $sth->fetchrow; ! } $splitchar=chr(29); *************** *** 529,532 **** --- 618,622 ---- ($qisbn) || ($qisbn='NIL'); ($qcontrolnumber) || ($qcontrolnumber='NIL'); + $controlnumber=~s/\s+//g; unless (($isbn eq $qisbn) || ($issn eq $qissn) || ($lccn eq $qlccn) || ($controlnumber eq $qcontrolnumber)) { next RECORD; *************** *** 577,848 **** } } else { ! open (F, "$file"); ! my $data=<F>; ! ! $splitchar=chr(29); ! my @records; ! foreach $record (split(/$splitchar/, $data)) { ! $leader=substr($record,0,24); ! #print "<tr><td>Leader:</td><td>$leader</td></tr>\n"; ! $record=substr($record,24); ! $splitchar2=chr(30); ! my $directory=0; ! my $tagcounter=0; ! my %tag; ! my @record; ! foreach $field (split(/$splitchar2/, $record)) { ! my %field; ! ($color eq $lc1) ? ($color=$lc2) : ($color=$lc1); ! unless ($directory) { ! $directory=$field; ! my $itemcounter=1; ! $counter=0; ! while ($item=substr($directory,0,12)) { ! $tag=substr($directory,0,3); ! $length=substr($directory,3,4); ! $start=substr($directory,7,6); ! $directory=substr($directory,12); ! $tag{$counter}=$tag; ! $counter++; ! } ! $directory=1; ! next; ! } ! $tag=$tag{$tagcounter}; ! $tagcounter++; ! $field{'tag'}=$tag; ! $splitchar3=chr(31); ! my @subfields=split(/$splitchar3/, $field); ! $indicator=$subfields[0]; ! $field{'indicator'}=$indicator; ! my $firstline=1; ! unless ($#subfields==0) { ! my %subfields; ! for ($i=1; $i<=$#subfields; $i++) { ! my $text=$subfields[$i]; ! my $subfieldcode=substr($text,0,1); ! my $subfield=substr($text,1); ! if ($subfields{$subfieldcode}) { ! my $subfieldlist=$subfields{$subfieldcode}; ! my @subfieldlist=@$subfieldlist; ! if ($#subfieldlist>=0) { ! # print "$tag Adding to array $subfieldcode -- $subfield<br>\n"; ! push (@subfieldlist, $subfield); ! } else { ! # print "$tag Arraying $subfieldcode -- $subfield<br>\n"; ! @subfieldlist=($subfields{$subfieldcode}, $subfield); ! } ! $subfields{$subfieldcode}=\@subfieldlist; ! } else { ! $subfields{$subfieldcode}=$subfield; ! } ! } ! $field{'subfields'}=\%subfields; ! } ! push (@record, \%field); ! } ! push (@records, \@record); ! $counter++; ! } ! print << "EOF"; ! <center> ! <p> ! <a href=marcimport.pl>Select a New File</a> ! <p> ! <table border=0 cellpadding=10 cellspacing=0> ! <tr><th bgcolor=black><font color=white>Select a Record to Import</font></th></tr> ! <tr><td bgcolor=#dddddd> EOF ! my $text=''; ! foreach $record (@records) { ! my @subjects=(); ! my ($lccn, $isbn, $issn, $dewey, $author, $title, $place, $publisher, $publicationyear, $volume, $number, @subjects, $note, $controlnumber); ! foreach $field (@$record) { ! $text.=$field->{'tag'}."\n"; ! foreach (keys %{$field->{'subfields'}}) { ! my $value=$field->{'subfields'}->{$_}; ! $text.=" $_: $value\n"; ! } ! if ($field->{'tag'} eq '001') { ! $controlnumber=$field->{'indicator'}; ! } ! if ($field->{'tag'} eq '010') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! ($lccn) = (split(/\s+/, $lccn))[0]; ! } ! if ($field->{'tag'} eq '015') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! $lccn=~s/^C//; ! ($lccn) = (split(/\s+/, $lccn))[0]; ! } ! if ($field->{'tag'} eq '020') { ! $isbn=$field->{'subfields'}->{'a'}; ! ($isbn=~/ARRAY/) && ($isbn=$$isbn[0]); ! $isbn=~s/[^\d]*//g; ! } ! if ($field->{'tag'} eq '022') { ! $issn=$field->{'subfields'}->{'a'}; ! $issn=~s/^\s*//; ! ($issn) = (split(/\s+/, $issn))[0]; ! } ! if ($field->{'tag'} eq '082') { ! $dewey=$field->{'subfields'}->{'a'}; ! $dewey=~s/\///g; ! if (@$dewey) { ! $dewey=$$dewey[0]; ! } ! #$dewey=~s/\///g; ! } ! if ($field->{'tag'} eq '100') { ! $author=$field->{'subfields'}->{'a'}; ! } ! if ($field->{'tag'} eq '245') { ! $title=$field->{'subfields'}->{'a'}; ! $title=~s/ \/$//; ! $subtitle=$field->{'subfields'}->{'b'}; ! $subtitle=~s/ \/$//; } ! if ($field->{'tag'} eq '260') { ! $place=$field->{'subfields'}->{'a'}; ! if (@$place) { ! $place=$$place[0]; ! } ! $place=~s/\s*:$//g; ! $publisher=$field->{'subfields'}->{'b'}; ! if (@$publisher) { ! $publisher=$$publisher[0]; ! } ! $publisher=~s/\s*:$//g; ! $publicationyear=$field->{'subfields'}->{'c'}; ! if ($publicationyear=~/c(\d\d\d\d)/) { ! $copyrightdate=$1; ! } ! if ($publicationyear=~/[^c](\d\d\d\d)/) { ! $publicationyear=$1; ! } elsif ($copyrightdate) { ! $publicationyear=$copyrightdate; } else { ! $publicationyear=~/(\d\d\d\d)/; ! $publicationyear=$1; } ! } ! if ($field->{'tag'} eq '300') { ! $pages=$field->{'subfields'}->{'a'}; ! $pages=~s/ \;$//; ! $size=$field->{'subfields'}->{'c'}; ! $pages=~s/\s*:$//g; ! $size=~s/\s*:$//g; ! } ! if ($field->{'tag'} eq '362') { ! if ($field->{'subfields'}->{'a'}=~/(\d+).*(\d+)/) { ! $volume=$1; ! $number=$2; ! } ! } ! if ($field->{'tag'} eq '440') { ! $seriestitle=$field->{'subfields'}->{'a'}; ! if ($field->{'subfields'}->{'v'}=~/(\d+).*(\d+)/) { ! $volume=$1; ! $number=$2; ! } ! } ! if ($field->{'tag'} =~/^5/) { ! $note.="$field->{'subfields'}->{'a'}\n"; ! } ! if ($field->{'tag'} =~/65\d/) { ! my $subject=$field->{'subfields'}->{'a'}; ! $subject=~s/\.$//; ! if ($gensubdivision=$field->{'subfields'}->{'x'}) { ! my @sub=@$gensubdivision; ! if ($#sub>=0) { ! foreach $s (@sub) { ! $s=~s/\.$//; ! $subject.=" -- $s"; } ! } else { ! $gensubdivision=~s/\.$//; ! $subject.=" -- $gensubdivision"; ! } ! } ! if ($chronsubdivision=$field->{'subfields'}->{'y'}) { ! my @sub=@$chronsubdivision; ! if ($#sub>=0) { ! foreach $s (@sub) { ! $s=~s/\.$//; ! $subject.=" -- $s"; } ! } else { ! $chronsubdivision=~s/\.$//; ! $subject.=" -- $chronsubdivision"; ! } ! } ! if ($geosubdivision=$field->{'subfields'}->{'z'}) { ! my @sub=@$geosubdivision; ! if ($#sub>=0) { ! foreach $s (@sub) { ! $s=~s/\.$//; ! $subject.=" -- $s"; } } else { ! $geosubdivision=~s/\.$//; ! $subject.=" -- $geosubdivision"; } } ! push @subjects, $subject; } } ! my $q_isbn=$dbh->quote((($isbn) || ('NIL'))); ! my $q_issn=$dbh->quote((($issn) || ('NIL'))); ! my $q_lccn=$dbh->quote((($lccn) || ('NIL'))); ! my $q_controlnumber=$dbh->quote((($controlnumber) || ('NIL'))); ! my $sth=$dbh->prepare("select * from marcrecorddone where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn or controlnumber=$q_controlnumber"); $sth->execute; ! my $donetext=''; ! if ($sth->rows) { ! $donetext="DONE"; } ! $sth=$dbh->prepare("select * from biblioitems where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn"); ! $sth->execute; ! if ($sth->rows) { ! $donetext="DONE"; } ! if ($isbn) { ! print "<a href=marcimport.pl?file=$file&isbn=$isbn>$title by $author</a> $donetext<br>\n"; ! } elsif ($lccn) { ! print "<a href=marcimport.pl?file=$file&lccn=$lccn>$title by $author</a> $donetext<br>\n"; ! } elsif ($issn) { ! print "<a href=marcimport.pl?file=$file&issn=$issn>$title by $author</a><br> $donetext\n"; ! } elsif ($controlnumber) { ! print "<a href=marcimport.pl?file=$file&controlnumber=$controlnumber>$title by $author</a><br> $donetext\n"; } else { ! print "Error: Contact steve regarding $title by $author<br>\n"; } } - print "</td></tr></table>\n"; } ! } else { ! opendir(D, "/home/$userid/"); ! my @dirlist=readdir D; ! foreach $file (@dirlist) { ! (next) if ($file=~/^\./); ! (next) if ($file=~/^nsmail$/); ! (next) if ($file=~/^public_html$/); ! ($file=~/\.mrc/) || ($filelist.="$file<br>\n"); ! (next) unless ($file=~/\.mrc$/); ! $file=~s/ /\%20/g; ! print "<a href=marcimport.pl?file=/home/$userid/$file>$file</a><br>\n"; } print << "EOF"; ! <form method=get> ! File to read MARC records from: <input name=file size=30> ! <p> ! Other files in home directory:<p> ! $filelist </form> EOF } print endmenu(); print endpage(); --- 667,1081 ---- } } else { ! #open (F, "$file"); ! #my $data=<F>; ! my $data; ! my $name; ! my $z3950=0; ! if ($file=~/Z-(\d+)/) { ! print << "EOF"; ! <center> ! <p> ! <a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Select a New File</a> ! <p> ! <table border=0 cellpadding=10 cellspacing=0> ! <tr><th bgcolor=black><font color=white>Select a Record to Import</font></th></tr> ! <tr><td bgcolor=#dddddd> EOF ! my $id=$1; ! my $sth=$dbh->prepare("select servers from z3950queue where id=$id"); ! $sth->execute; ! my ($servers) = $sth->fetchrow; ! my $serverstring; ! foreach $serverstring (split(/\s+/, $servers)) { ! my ($name, $server, $database, $auth) = split(/\//, $serverstring, 4); ! if ($name eq 'LOC') { ! print "Library of Congress<br>\n"; ! } elsif ($name eq 'NLC') { ! print "National Library of Canada<br>\n"; ! } else { ! print "$server/$database<br>\n"; } ! print "<ul>\n"; ! my $q_server=$dbh->quote($serverstring); ! my $sti=$dbh->prepare("select numrecords,id,results,startdate,enddate from z3950results where queryid=$id and server=$q_server"); ! $sti->execute; ! ($numrecords,$resultsid,$data,$startdate,$enddate) = $sti->fetchrow; ! if ($sti->rows == 0) { ! print "pending..."; ! } elsif ($enddate == 0) { ! my $now=time(); ! my $elapsed=$now-$startdate; ! my $elapsedtime=''; ! if ($elapsed>60) { ! $elapsedtime=sprintf "%d minutes",($elapsed/60); } else { ! $elapsedtime=sprintf "%d seconds",$elapsed; } ! print "<font color=red>processing... ($elapsedtime)</font>"; ! } elsif ($numrecords) { ! my @records=parsemarcdata($data); ! foreach $record (@records) { ! my ($lccn, $isbn, $issn, $dewey, $author, $title, $place, $publisher, $publicationyear, $volume, $number, @subjects, $note, $controlnumber); ! foreach $field (@$record) { ! if ($field->{'tag'} eq '001') { ! $controlnumber=$field->{'indicator'}; } ! if ($field->{'tag'} eq '010') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! ($lccn) = (split(/\s+/, $lccn))[0]; } ! if ($field->{'tag'} eq '015') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! $lccn=~s/^C//; ! ($lccn) = (split(/\s+/, $lccn))[0]; ! } ! if ($field->{'tag'} eq '020') { ! $isbn=$field->{'subfields'}->{'a'}; ! ($isbn=~/ARRAY/) && ($isbn=$$isbn[0]); ! $isbn=~s/[^\d]*//g; ! } ! if ($field->{'tag'} eq '022') { ! $issn=$field->{'subfields'}->{'a'}; ! $issn=~s/^\s*//; ! ($issn) = (split(/\s+/, $issn))[0]; ! } ! if ($field->{'tag'} eq '100') { ! $author=$field->{'subfields'}->{'a'}; } + if ($field->{'tag'} eq '245') { + $title=$field->{'subfields'}->{'a'}; + $title=~s/ \/$//; + $subtitle=$field->{'subfields'}->{'b'}; + $subtitle=~s/ \/$//; + } + } + my $q_isbn=$dbh->quote((($isbn) || ('NIL'))); + my $q_issn=$dbh->quote((($issn) || ('NIL'))); + my $q_lccn=$dbh->quote((($lccn) || ('NIL'))); + my $q_controlnumber=$dbh->quote((($controlnumber) || ('NIL'))); + my $sth=$dbh->prepare("select * from marcrecorddone where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn or controlnumber=$q_controlnumber"); + $sth->execute; + my $donetext=''; + if ($sth->rows) { + $donetext="DONE"; + } + $sth=$dbh->prepare("select * from biblioitems where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn"); + $sth->execute; + if ($sth->rows) { + $donetext="DONE"; + } + ($author) && ($author="by $author"); + if ($isbn) { + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=$file&resultsid=$resultsid&isbn=$isbn>$title$subtitle $author</a> $donetext<br>\n"; + } elsif ($lccn) { + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=$file&resultsid=$resultsid&lccn=$lccn>$title$subtitle $author</a> $donetext<br>\n"; + } elsif ($issn) { + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=$file&resultsid=$resultsid&issn=$issn>$title$subtitle $author</a><br> $donetext\n"; + } elsif ($controlnumber) { + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=$file&resultsid=$resultsid&controlnumber=$controlnumber>$title $author</a><br> $donetext\n"; } else { ! print "Error: Contact steve regarding $title by $author<br>\n"; } } ! print "<p>\n"; ! } else { ! print "No records returned.<p>\n"; } + print "</ul>\n"; } ! } else { ! my $sth=$dbh->prepare("select marc,name from uploadedmarc where id=$file"); $sth->execute; ! ($data, $name) = $sth->fetchrow; ! print << "EOF"; ! <center> ! <p> ! <a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Select a New File</a> ! <p> ! <table border=0 cellpadding=10 cellspacing=0> ! <tr><th bgcolor=black><font color=white>Select a Record to Import<br>from $name</font></th></tr> ! <tr><td bgcolor=#dddddd> ! EOF ! ! my @records=parsemarcdata($data); ! foreach $record (@records) { ! my ($lccn, $isbn, $issn, $dewey, $author, $title, $place, $publisher, $publicationyear, $volume, $number, @subjects, $note, $controlnumber); ! foreach $field (@$record) { ! if ($field->{'tag'} eq '001') { ! $controlnumber=$field->{'indicator'}; ! } ! if ($field->{'tag'} eq '010') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! ($lccn) = (split(/\s+/, $lccn))[0]; ! } ! if ($field->{'tag'} eq '015') { ! $lccn=$field->{'subfields'}->{'a'}; ! $lccn=~s/^\s*//; ! $lccn=~s/^C//; ! ($lccn) = (split(/\s+/, $lccn))[0]; ! } ! if ($field->{'tag'} eq '020') { ! $isbn=$field->{'subfields'}->{'a'}; ! ($isbn=~/ARRAY/) && ($isbn=$$isbn[0]); ! $isbn=~s/[^\d]*//g; ! } ! if ($field->{'tag'} eq '022') { ! $issn=$field->{'subfields'}->{'a'}; ! $issn=~s/^\s*//; ! ($issn) = (split(/\s+/, $issn))[0]; ! } ! if ($field->{'tag'} eq '100') { ! $author=$field->{'subfields'}->{'a'}; ! } ! if ($field->{'tag'} eq '245') { ! $title=$field->{'subfields'}->{'a'}; ! $title=~s/ \/$//; ! $subtitle=$field->{'subfields'}->{'b'}; ! $subtitle=~s/ \/$//; ! } ! } ! my $q_isbn=$dbh->quote((($isbn) || ('NIL'))); ! my $q_issn=$dbh->quote((($issn) || ('NIL'))); ! my $q_lccn=$dbh->quote((($lccn) || ('NIL'))); ! my $q_controlnumber=$dbh->quote((($controlnumber) || ('NIL'))); ! my $sth=$dbh->prepare("select * from marcrecorddone where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn or controlnumber=$q_controlnumber"); ! $sth->execute; ! my $donetext=''; ! if ($sth->rows) { ! $donetext="DONE"; ! } ! $sth=$dbh->prepare("select * from biblioitems where isbn=$q_isbn or issn=$q_issn or lccn=$q_lccn"); ! $sth->execute; ! if ($sth->rows) { ! $donetext="DONE"; ! } ! ($author) && ($author="by $author"); ! if ($isbn) { ! print "<a href=$ENV{'SCRIPT_NAME'}?file=$file&isbn=$isbn>$title$subtitle $author</a> $donetext<br>\n"; ! } elsif ($lccn) { ! print "<a href=$ENV{'SCRIPT_NAME'}?file=$file&lccn=$lccn>$title$subtitle $author</a> $donetext<br>\n"; ! } elsif ($issn) { ! print "<a href=$ENV{'SCRIPT_NAME'}?file=$file&issn=$issn>$title$subtitle $author</a><br> $donetext\n"; ! } elsif ($controlnumber) { ! print "<a href=$ENV{'SCRIPT_NAME'}?file=$file&controlnumber=$controlnumber>$title by $author</a><br> $donetext\n"; ! } else { ! print "Error: Contact steve regarding $title by $author<br>\n"; ! } } ! } ! print "</td></tr></table>\n"; ! } ! } else { ! ! SWITCH: ! { ! if ($menu eq 'z3950') { z3950(); last SWITCH; } ! if ($menu eq 'uploadmarc') { uploadmarc(); last SWITCH; } ! if ($menu eq 'manual') { manual(); last SWITCH; } ! mainmenu(); ! } ! ! } ! ! ! sub z3950 { ! $sth=$dbh->prepare("select id,term,type,done,numrecords,length(results),startdate,enddate,servers from z3950queue order by id desc limit 20"); ! $sth->execute; ! print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n"; ! print "<table border=0><tr><td valign=top>\n"; ! print "<h2>Results of Z3950 searches</h2>\n"; ! print "<a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Refresh</a><br>\n<ul>\n"; ! while (my ($id, $term, $type, $done, $numrecords, $length, $startdate, $enddate, $servers) = $sth->fetchrow) { ! $type=uc($type); ! $term=~s/</</g; ! $term=~s/>/>/g; ! if ($done == 1) { ! my $elapsed=$enddate-$startdate; ! my $elapsedtime=''; ! if ($elapsed>60) { ! $elapsedtime=sprintf "%d minutes",($elapsed/60); ! } else { ! $elapsedtime=sprintf "%d seconds",$elapsed; ! } ! if ($numrecords) { ! print "<li><a href=$ENV{'SCRIPT_NAME'}?file=Z-$id&menu=$menu>$type=$term</a> <font size=-1>Done. $numrecords records found in $elapsedtime.</font><br>\n"; ! } else { ! print "<li><a href=$ENV{'SCRIPT_NAME'}?file=Z-$id&menu=$menu>$type=$term</a> <font size=-1>Done. No records found. Search took $elapsedtime.</font><br>\n"; } ! } elsif ($done == -1) { ! my $elapsed=time()-$startdate; ! my $elapsedtime=''; ! if ($elapsed>60) { ! $elapsedtime=sprintf "%d minutes",($elapsed/60); } else { ! $elapsedtime=sprintf "%d seconds",$elapsed; } + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=Z-$id&menu=$menu>$type=$term</a> <font color=red size=-1>Processing ($elapsedtime)</font><br>\n"; + } else { + print "<li><a href=$ENV{'SCRIPT_NAME'}?file=Z-$id&menu=$menu>$type=$term</a> $done <font size=-1>Pending</font><br>\n"; } } ! print "</ul>\n"; ! print "</td><td valign=top width=30%>\n"; ! print << "EOF"; ! <form action=$ENV{'SCRIPT_NAME'} method=GET> ! <input type=hidden name=z3950queue value=1> ! <input type=hidden name=menu value=$menu> ! <p> ! <input type=hidden name=test value=testvalue> ! <table border=1 bgcolor=#dddddd><tr><th bgcolor=#bbbbbb colspan=2>Search for MARC records<br>LOC and NLC</th></tr> ! <tr><td>Query Term</td><td><input name=query></td></tr> ! <tr><td colspan=2 align=center><input type=radio name=type value=isbn checked> ISBN <input type=radio name=type value=lccn> LCCN <input type=radio name=type value=title> Title</td></tr> ! <tr><td colspan=2> ! <input type=checkbox name=S-LOC checked> Library of Congress<br> ! <input type=checkbox name=S-NLC checked> National Library of Canada<br> ! <input type=checkbox name=S-MAN> <input name=manualz3950server size=25 value=otherserver:210/DATABASE> ! </td></tr> ! <tr><td colspan=2 align=center> ! <input type=submit> ! </td></tr> ! </table> ! ! </form> ! EOF ! print "</td></tr></table>\n"; ! } ! ! sub uploadmarc { ! print "<a href=$ENV{'SCRIPT_NAME'}>Main Menu</a><hr>\n"; ! my $sth=$dbh->prepare("select id,name from uploadedmarc"); ! $sth->execute; ! print "<h2>Select a set of MARC records</h2>\n<ul>"; ! while (my ($id, $name) = $sth->fetchrow) { ! print "<li><a href=$ENV{'SCRIPT_NAME'}?file=$id&menu=$menu>$name</a><br>\n"; } + print "</ul>\n"; + print "<p>\n"; + print "<table border=1 bgcolor=#dddddd><tr><th bgcolor=#bbbbbb + colspan=2>Upload a set of MARC records</th></tr>\n"; + print "<tr><td>Upload a set of MARC records:</td><td>"; + print $input->start_multipart_form(); + print $input->filefield('uploadmarc'); print << "EOF"; ! </td></tr> ! <tr><td> ! <input type=hidden name=menu value=$menu> ! Name this set of MARC records:</td><td><input type=text ! name=name></td></tr> ! <tr><td colspan=2 align=center> ! <input type=submit> ! </td></tr> ! </table> </form> EOF } + + sub manual { + } + + + sub mainmenu { + print << "EOF"; + <h1>Main Menu</h1> + <ul> + <li><a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Z39.50 Search</a> + <li><a href=$ENV{'SCRIPT_NAME'}?menu=uploadmarc>Upload MARC Records</a> + </ul> + EOF + } + + sub skip { + + #opendir(D, "/home/$userid/"); + #my @dirlist=readdir D; + #foreach $file (@dirlist) { + # (next) if ($file=~/^\./); + # (next) if ($file=~/^nsmail$/); + # (next) if ($file=~/^public_html$/); + # ($file=~/\.mrc/) || ($filelist.="$file<br>\n"); + # (next) unless ($file=~/\.mrc$/); + # $file=~s/ /\%20/g; + # print "<a href=$ENV{'SCRIPT_NAME'}?file=/home/$userid/$file>$file</a><br>\n"; + # } + + + #<form action=$ENV{'SCRIPT_NAME'} method=POST enctype=multipart/form-data> + + } print endmenu(); print endpage(); + sub parsemarcdata { + my $data=shift; + my $splitchar=chr(29); + my @records; + my $record; + foreach $record (split(/$splitchar/, $data)) { + my $leader=substr($record,0,24); + #print "<tr><td>Leader:</td><td>$leader</td></tr>\n"; + $record=substr($record,24); + my $splitchar2=chr(30); + my $directory=0; + my $tagcounter=0; + my %tag; + my @record; + my $field; + foreach $field (split(/$splitchar2/, $record)) { + my %field; + ($color eq $lc1) ? ($color=$lc2) : ($color=$lc1); + unless ($directory) { + $directory=$field; + my $itemcounter=1; + $counter=0; + while ($item=substr($directory,0,12)) { + $tag=substr($directory,0,3); + $length=substr($directory,3,4); + $start=substr($directory,7,6); + $directory=substr($directory,12); + $tag{$counter}=$tag; + $counter++; + } + $directory=1; + next; + } + $tag=$tag{$tagcounter}; + $tagcounter++; + $field{'tag'}=$tag; + $splitchar3=chr(31); + my @subfields=split(/$splitchar3/, $field); + $indicator=$subfields[0]; + $field{'indicator'}=$indicator; + my $firstline=1; + unless ($#subfields==0) { + my %subfields; + for ($i=1; $i<=$#subfields; $i++) { + my $text=$subfields[$i]; + my $subfieldcode=substr($text,0,1); + my $subfield=substr($text,1); + if ($subfields{$subfieldcode}) { + my $subfieldlist=$subfields{$subfieldcode}; + my @subfieldlist=@$subfieldlist; + if ($#subfieldlist>=0) { + # print "$tag Adding to array $subfieldcode -- $subfield<br>\n"; + push (@subfieldlist, $subfield); + } else { + # print "$tag Arraying $subfieldcode -- $subfield<br>\n"; + @subfieldlist=($subfields{$subfieldcode}, $subfield); + } + $subfields{$subfieldcode}=\@subfieldlist; + } else { + $subfields{$subfieldcode}=$subfield; + } + } + $field{'subfields'}=\%subfields; + } + push (@record, \%field); + } + push (@records, \@record); + $counter++; + } + return @records; + }

1 0

Z39.50
by Tonnesen Steve 02 Nov '01

02 Nov '01

Just let me know if you are getting sick of my posts. :) Cleaned up the interface quite a bit. Separated out the "uploaded marcs" from the "Z39.50 Searches". You can now specify which Z39.50 servers to query. I have the LOC and the NLC hard coded in, but I'd like to make those configurable for each installation of Koha. You can also now specify an arbitrary Z39.50 server for each query. The format is: z3950.loc.gov:7090/voyager amicus.nlc-bnc.ca:210/AMICUS etc. One thing I don't like about all of this is that it requires that the YAZ libraries be installed. That adds an extra step to the installation of Koha, although I don't think the YAZ license would restrict us from distributing it directly with Koha. Steve.

1 0

More on Z39.50
by Tonnesen Steve 02 Nov '01

02 Nov '01

Thanks for the testing! Your testing pointed out some small problems which I have corrected. I wasn't removing the '-'s from ISBN's. I am now. You can put in the dashes or leave 'em out. They'll be removed before querying the Z39.50 servers. I wasn't accessing the full AMICUS database at the National Library of Canada, so whoever searched for "Global action for biodiversity: an international framework for implementing the Convention on biological diversity" will find that it finds it successfully now. I've added a note saying how many records were found for each query in the queue. Now I really need to get full MARC support in Koha so that all of this data doesn't have to get mangled. :) Steve.

2 2

Z3950 searches
by Tonnesen Steve 01 Nov '01

01 Nov '01

Z3950 searches appear to be working now. This is a pretty rough and roudy interface. Definitely needs some cleaning up. However, if you want to try my Z3950 search, go to: http://142.28.224.14/ Acquisitions Marc Importing Tool Enter a query term and select one of ISBN, LCCN, or Title. At the moment, it searches the Library of Congress and the National Library of Canada. Steve.

1 0

Z3950
by Tonnesen Steve 01 Nov '01

01 Nov '01

I just tried the latest Net::Z3950 perl module and the rawdata() call now works. Woohoo! That means that I can now do Z3950 searches and download the raw marc data directly from Koha. Now I just wish I had two sweet clues how to format Z3950 queries. I know that @attr 1=4 "Linux" returns records with the title Linux. Anybody know what I have to use to search on ISBN or LCCN? Steve.

1 0

Marc Importing Tool
by Tonnesen Steve 01 Nov '01

01 Nov '01

I've revised the marc importing tool at: http://142.28.224.14/cgi-bin/koha/acqui.simple/marcimport.pl If you don't like typing in long URLs, just go to 142.28.224.14 and follow the "Acquisitions" and "Marc Importing tool" links. so that you can upload sets of marc records to the server. Give it a whirl, if you like. Try not to upload too large of a set of MARC records, as it may take a long time to process. Besides, my Internet connection is not very snappy here. :) Try to stick to less than 25 or so MARC records. Steve.

1 0

CVS: koha/acqui.simple marcimport.pl,1.1,1.2
by Steve Tonnesen 31 Oct '01

31 Oct '01

Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv8833 Modified Files: marcimport.pl Log Message: Use MARC controlnumber as a unique identifier for MARC records, in addition to ISBN, ISSN, and LCCN. Index: marcimport.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** marcimport.pl 2001/10/05 21:27:46 1.1 --- marcimport.pl 2001/11/01 05:00:41 1.2 *************** *** 88,95 **** my $q_origissn=$dbh->quote($input->param('origissn')); my $q_origlccn=$dbh->quote($input->param('origlccn')); my $q_isbn=$dbh->quote((($isbn) || ('NIL'))); my $q_issn=$dbh->quote((($issn) || ('NIL'))); my $q_lccn=$dbh->quote((($lccn) || ('NIL'))); ! $sth=$dbh->prepare("insert into marcrecorddone values ($q_origisbn, $q_origissn, $q_origlccn)"); $sth->execute; my $sth=$dbh->prepare("select biblionumber,biblioitemnumber from biblioitems where issn=$q_issn or isbn=$q_isbn or lccn=$q_lccn"); --- 88,96 ---- my $q_origissn=$dbh->quote($input->param('origissn')); my $q_origlccn=$dbh->quote($input->param('origlccn')); + my $q_origcontrolnumber=$dbh->quote($input->param('origcontrolnumber')); my $q_isbn=$dbh->quote((($isbn) || ('NIL'))); my $q_issn=$dbh->quote((($issn) || ('NIL'))); my $q_lccn=$dbh->quote((($lccn) || ('NIL'))); ! $sth=$dbh->prepare("insert into marcrecorddone values ($q_origisbn, $q_origissn, $q_origlccn, $q_origcontrolnumber)"); $sth->execute; my $sth=$dbh->prepare("select biblionumber,biblioitemnumber from biblioitems where issn=$q_issn or isbn=$q_isbn or lccn=$q_lccn");

1 0