<!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>[623] trunk/alexandria/lib/alexandria/import_library.rb: - Fix for closed [#3130], most tellico entries should work now.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>623</dd>
<dt>Author</dt> <dd>method</dd>
<dt>Date</dt> <dd>2007-02-24 15:01:40 -0500 (Sat, 24 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>- Fix for closed [#3130], most tellico entries should work now. Need to
put in better error message, though.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriaimport_libraryrb">trunk/alexandria/lib/alexandria/import_library.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkalexandrialibalexandriaimport_libraryrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/import_library.rb (622 => 623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/import_library.rb 2007-02-24 17:30:06 UTC (rev 622)
+++ trunk/alexandria/lib/alexandria/import_library.rb 2007-02-24 20:01:40 UTC (rev 623)
</span><span class="lines">@@ -106,16 +106,28 @@
</span><span class="cx"> (total = entries.size).times do |n|
</span><span class="cx"> entry = entries[n]
</span><span class="cx"> elements = entry.elements
</span><del>- elements.each {|e| puts e.inspect}
</del><span class="cx"> #Feed an array in here, tomorrow.
</span><del>- book = Book.new(elements['title'].text,
- elements['authors'].elements.to_a.map \
- { |x| x.text },
- elements['isbn'].text,
- elements['publisher'].text,
- elements['pub_year'].text,
- elements['binding'].text)
- content << [ book, elements['cover'].text]
</del><ins>+ keys = ['isbn', 'publisher', 'pub_year', 'binding']
+
+ book_elements = [elements['title'].text,
+ elements['authors'].elements.to_a.map \
+ { |x| x.text }]
+ book_elements += keys.map {|key|
+ unless elements[key]
+ nil
+ else
+ elements[key].text
+ end
+ }
+ puts book_elements.inspect
+ if elements['cover']
+ cover = elements['cover'].text
+ else
+ cover = nil
+ end
+ puts cover
+ book = Book.new(*book_elements)
+ content << [ book, cover]
</ins><span class="cx"> on_iterate_cb.call(n+1, total) if on_iterate_cb
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -129,7 +141,7 @@
</span><span class="cx"> library << book
</span><span class="cx"> library.save(book)
</span><span class="cx"> end
</span><del>- return [library, nil]
</del><ins>+ return [library, []]
</ins><span class="cx"> rescue => e
</span><span class="cx"> puts e.message
</span><span class="cx"> return nil
</span></span></pre>
</div>
</div>
</body>
</html>