<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[610] trunk/rails/lib/uva:
Changed to make blacklight work in PC-land under JRuby</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>610</dd>
<dt>Author</dt> <dd>haschart</dd>
<dt>Date</dt> <dd>2008-06-23 14:05:39 -0400 (Mon, 23 Jun 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Changed to make blacklight work in PC-land under JRuby</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkrailslibuvavirgo_marc_recordrb">trunk/rails/lib/uva/virgo_marc_record.rb</a></li>
<li><a href="#trunkrailslibuvaz3950rb">trunk/rails/lib/uva/z3950.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkrailslibuvavirgo_marc_recordrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/lib/uva/virgo_marc_record.rb (609 => 610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/lib/uva/virgo_marc_record.rb 2008-06-18 21:12:45 UTC (rev 609)
+++ trunk/rails/lib/uva/virgo_marc_record.rb 2008-06-23 18:05:39 UTC (rev 610)
</span><span class="lines">@@ -12,6 +12,8 @@
</span><span class="cx"> @record=reader.detect{|r|true}
</span><span class="cx"> else
</span><span class="cx"> @record = MARC::Record.new_from_marc(marc, :forgiving=>true)
</span><ins>+ #puts record.to_s
+ return(@record)
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkrailslibuvaz3950rb"></a>
<div class="modfile"><h4>Modified: trunk/rails/lib/uva/z3950.rb (609 => 610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/lib/uva/z3950.rb 2008-06-18 21:12:45 UTC (rev 609)
+++ trunk/rails/lib/uva/z3950.rb 2008-06-23 18:05:39 UTC (rev 610)
</span><span class="lines">@@ -7,11 +7,8 @@
</span><span class="cx"> require 'java/commons-logging-api.jar'
</span><span class="cx"> require 'java/commons-logging.jar'
</span><span class="cx"> require 'java/log4j-1.2.5.jar'
</span><del>- require 'java/a2jruntime-1_2_3.jar'
- require 'java/ki-jzkit-hss-1_2_3.jar'
- require 'java/ki-jzkit-iface-1_2_3.jar'
- require 'java/ki-jzkit-z3950-1_2_3.jar'
</del><span class="cx"> require 'java/ki-util.jar'
</span><ins>+ require 'java/jzkit_client.jar'
</ins><span class="cx"> require 'java/marc4j.jar'
</span><span class="cx"> require 'java/zclient.jar'
</span><span class="cx"> else
</span><span class="lines">@@ -77,7 +74,8 @@
</span><span class="cx"> zclient.cmdElements("F")
</span><span class="cx"> zclient.cmdFormat("usmarc")
</span><span class="cx"> rawrecord = zclient.getStringByIDNum(ckey.gsub(/[^0-9]+/, '').to_i)
</span><del>- return rawrecord
</del><ins>+ zclient.disconnect();
+ return rawrecord
</ins><span class="cx"> else
</span><span class="cx"> raise Z3950ConnectionError
</span><span class="cx"> end
</span><span class="lines">@@ -101,8 +99,8 @@
</span><span class="cx"> data[:holdings]=[]
</span><span class="cx"> data[:summary_holdings]=[]
</span><span class="cx">
</span><del>- query(method, id) do |rec,marc|
- data[:title] = marc['245']['a'] rescue nil
</del><ins>+ query(method, id) do |rec,marc|
+ data[:title] = marc['245']['a'] rescue nil
</ins><span class="cx"> data[:author] = marc['245']['c'] rescue nil
</span><span class="cx"> data[:isbn] = marc['020']['a'].gsub(/[^\d]+/i,'') rescue nil
</span><span class="cx"> data[:holdings] = extract_holdings(marc)
</span><span class="lines">@@ -156,8 +154,11 @@
</span><span class="cx"> tries=0
</span><span class="cx"> begin
</span><span class="cx"> response = self.send(method, *args)
</span><del>- if response.is_a?(String)
- yield UVA::VirgoMarcRecord.new(response)
</del><ins>+ if response == nil
+ #puts response
+ elsif response.is_a?(String)
+ #puts response
+ yield response, UVA::VirgoMarcRecord.new(response)
</ins><span class="cx"> else
</span><span class="cx"> response.records.each do |rec|
</span><span class="cx"> yield rec, UVA::VirgoMarcRecord.new(rec.raw)
</span></span></pre>
</div>
</div>
</body>
</html>