<!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>[650] trunk/alexandria/lib/alexandria/book_providers/z3950.rb: z3950.rb: refactored, and prepared to add a new provider</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>650</dd>
<dt>Author</dt> <dd>laurusnobilis</dd>
<dt>Date</dt> <dd>2007-03-06 16:54:18 -0500 (Tue, 06 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>z3950.rb: refactored, and prepared to add a new provider</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriabook_providersz3950rb">trunk/alexandria/lib/alexandria/book_providers/z3950.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 (649 => 650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-06 18:47:40 UTC (rev 649)
+++ trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-06 21:54:18 UTC (rev 650)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> prefs.add("hostname", _("Hostname"), "")
</span><span class="cx"> prefs.add("port", _("Port"), 7090)
</span><span class="cx"> prefs.add("database", _("Database"), "")
</span><del>- prefs.add("record_syntax", _("Record syntax"), "USMARC", ["USMARC", "SUTRS", "UNIMARC"])
</del><ins>+ prefs.add("record_syntax", _("Record syntax"), "USMARC", ["USMARC", "UNIMARC", "SUTRS"])
</ins><span class="cx"> prefs.add("username", _("Username"), "", nil, false)
</span><span class="cx"> prefs.add("password", _("Password"), "", nil, false)
</span><span class="cx"> end
</span><span class="lines">@@ -49,14 +49,29 @@
</span><span class="cx"> resultset = search_records(criterion, type)
</span><span class="cx"> puts "total #{resultset.length}" if $Z3950_DEBUG
</span><span class="cx"> raise NoResultsError if resultset.length == 0
</span><del>-
</del><ins>+ results = books_from_marc(resultset)
+ type == SEARCH_BY_ISBN ? results.first : results
+ end
+
+ def url(book)
+ nil
+ end
+
+ #######
+ private
+ #######
+
+
+ def books_from_marc(resultset)
+
</ins><span class="cx"> results = []
</span><span class="cx"> resultset[0..9].each do |record|
</span><span class="cx"> marc_txt = record.render(prefs['record_syntax'], 'USMARC')
</span><ins>+ puts marc_txt if $Z3950_DEBUG
</ins><span class="cx"> marc = MARC::Record.new(marc_txt)
</span><span class="cx">
</span><span class="cx"> if $Z3950_DEBUG
</span><del>- puts "MARC"
</del><ins>+ puts "Parsing MARC"
</ins><span class="cx"> puts "title: #{marc.title}"
</span><span class="cx"> puts "authors: #{marc.authors.join(', ')}"
</span><span class="cx"> puts "isbn: #{marc.isbn}"
</span><span class="lines">@@ -80,17 +95,9 @@
</span><span class="cx"> (marc.edition or ""))
</span><span class="cx"> results << [book]
</span><span class="cx"> end
</span><del>- type == SEARCH_BY_ISBN ? results.first : results
</del><ins>+ return results
</ins><span class="cx"> end
</span><span class="cx">
</span><del>- def url(book)
- nil
- end
-
- #######
- private
- #######
-
</del><span class="cx"> def marc?
</span><span class="cx"> /MARC$/.match(prefs['record_syntax'])
</span><span class="cx"> end
</span><span class="lines">@@ -122,6 +129,7 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class LOCProvider < Z3950Provider
</span><span class="cx"> # http://en.wikipedia.org/wiki/Library_of_Congress
</span><span class="cx"> unabstract
</span><span class="lines">@@ -142,6 +150,7 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class BLProvider < Z3950Provider
</span><span class="cx"> # http://en.wikipedia.org/wiki/Copac
</span><span class="cx"> # http://en.wikipedia.org/wiki/British_Library
</span><span class="lines">@@ -168,15 +177,7 @@
</span><span class="cx"> resultset = search_records(criterion, type)
</span><span class="cx"> puts "total #{resultset.length}" if $Z3950_DEBUG
</span><span class="cx"> raise NoResultsError if resultset.length == 0
</span><del>-
- results = []
- resultset[0..9].each do |record|
- sutrs_text = record.render
- book = book_from_sutrs(sutrs_text)
- if book
- results << [book]
- end
- end
</del><ins>+ results = books_from_sutrs(resultset)
</ins><span class="cx"> type == SEARCH_BY_ISBN ? results.first : results
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -188,7 +189,12 @@
</span><span class="cx"> private
</span><span class="cx"> #######
</span><span class="cx">
</span><del>- def book_from_sutrs(text)
</del><ins>+ def books_from_sutrs(resultset)
+ results = []
+ resultset[0..9].each do |record|
+ text = record.render
+ puts text if $Z3950_DEBUG
+
</ins><span class="cx"> title = isbn = publisher = publish_year = edition = nil
</span><span class="cx"> authors = []
</span><span class="cx">
</span><span class="lines">@@ -205,7 +211,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if $Z3950_DEBUG
</span><del>- puts "SUTRS"
</del><ins>+ puts "Parsing SUTRS"
</ins><span class="cx"> puts "title: #{title}"
</span><span class="cx"> puts "authors: #{authors.join(' and ')}"
</span><span class="cx"> puts "isbn: #{isbn}"
</span><span class="lines">@@ -214,8 +220,13 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if title # and !authors.empty?
</span><del>- return Book.new(title, authors, isbn, (publisher or nil), (publish_year or nil), (edition or nil))
</del><ins>+ book = Book.new(title, authors, isbn, (publisher or nil), (publish_year or nil), (edition or nil))
+ results << [book]
</ins><span class="cx"> end
</span><ins>+
+ end
+ return results
+
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>