<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[655] trunk/alexandria: - test_providers.rb: added test of SBN</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>655</dd>
<dt>Author</dt> <dd>laurusnobilis</dd>
<dt>Date</dt> <dd>2007-03-13 06:13:51 -0400 (Tue, 13 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>- test_providers.rb: added test of SBN
- z3950.rb: now, when searching by ISBN, the ISBN of the returned book is the ISBN used in the search. This because
ruby/zoom has a bug, and may return a cutted ISBN, or because the z39.50 server may return more than one ISBN.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriabook_providersz3950rb">trunk/alexandria/lib/alexandria/book_providers/z3950.rb</a></li>
<li><a href="#trunkalexandriateststest_providersrb">trunk/alexandria/tests/test_providers.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkalexandrialibalexandriabook_providersz3950rb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/z3950.rb (654 => 655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-13 08:58:56 UTC (rev 654)
+++ trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-13 10:13:51 UTC (rev 655)
</span><span class="lines">@@ -46,11 +46,12 @@
</span><span class="cx"> raise NoResultsError
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+ isbn = type == SEARCH_BY_ISBN ? criterion : nil
</ins><span class="cx"> criterion = Library.canonicalise_isbn(criterion) if type == SEARCH_BY_ISBN
</span><span class="cx"> resultset = search_records(criterion, type, 10)
</span><span class="cx"> puts "total #{resultset.length}" if $Z3950_DEBUG
</span><span class="cx"> raise NoResultsError if resultset.length == 0
</span><del>- results = books_from_marc(resultset)
</del><ins>+ results = books_from_marc(resultset, isbn)
</ins><span class="cx"> type == SEARCH_BY_ISBN ? results.first : results
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> #######
</span><span class="cx">
</span><span class="cx">
</span><del>- def books_from_marc(resultset)
</del><ins>+ def books_from_marc(resultset, isbn)
</ins><span class="cx">
</span><span class="cx"> results = []
</span><span class="cx"> resultset[0..9].each do |record|
</span><span class="lines">@@ -75,18 +76,16 @@
</span><span class="cx"> puts "Parsing MARC"
</span><span class="cx"> puts "title: #{marc.title}"
</span><span class="cx"> puts "authors: #{marc.authors.join(', ')}"
</span><del>- puts "isbn: #{marc.isbn}"
</del><ins>+ puts "isbn: #{marc.isbn}, #{isbn}"
</ins><span class="cx"> puts "publisher: #{marc.publisher}"
</span><span class="cx"> puts "publish year: #{marc.publish_year}" if marc.respond_to?(:publish_year)
</span><span class="cx"> puts "edition: #{marc.edition}"
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> next if marc.title.nil? # or marc.authors.empty?
</span><del>- if marc.isbn == nil
- isbn = nil
- else
- isbn = Library.canonicalise_ean(marc.isbn)
- end
</del><ins>+
+ isbn = isbn or marc.isbn
+ isbn = Library.canonicalise_ean(isbn)
</ins><span class="cx">
</span><span class="cx"> book = Book.new(marc.title, marc.authors,
</span><span class="cx"> isbn,
</span><span class="lines">@@ -255,11 +254,12 @@
</span><span class="cx"> def search(criterion, type)
</span><span class="cx"> prefs.read
</span><span class="cx">
</span><ins>+ isbn = type == SEARCH_BY_ISBN ? criterion : nil
</ins><span class="cx"> criterion = canonicalise_isbn_with_dashes(criterion)
</span><span class="cx"> resultset = search_records(criterion, type, 0)
</span><span class="cx"> puts "total #{resultset.length}" if $Z3950_DEBUG
</span><span class="cx"> raise NoResultsError if resultset.length == 0
</span><del>- results = books_from_marc(resultset)
</del><ins>+ results = books_from_marc(resultset, isbn)
</ins><span class="cx"> type == SEARCH_BY_ISBN ? results.first : results
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkalexandriateststest_providersrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/tests/test_providers.rb (654 => 655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/tests/test_providers.rb 2007-03-13 08:58:56 UTC (rev 654)
+++ trunk/alexandria/tests/test_providers.rb 2007-03-13 10:13:51 UTC (rev 655)
</span><span class="lines">@@ -69,6 +69,11 @@
</span><span class="cx"> '9781853260803')
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+ def test_SBN
+ __test_provider(Alexandria::BookProviders::SBNProvider,
+ '9788835926436')
+ end
+
</ins><span class="cx"> # providers supposed to be always working
</span><span class="cx">
</span><span class="cx"> def test_bn
</span></span></pre>
</div>
</div>
</body>
</html>