<!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>[620] trunk/alexandria/lib/alexandria: -Improvements on import filetype detection (made it dumb instead of sloppy)</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>620</dd>
<dt>Author</dt> <dd>method</dd>
<dt>Date</dt> <dd>2007-02-24 01:08:51 -0500 (Sat, 24 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>-Improvements on import filetype detection (made it dumb instead of sloppy)
-Working toward solution of [#3130]</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriaimport_libraryrb">trunk/alexandria/lib/alexandria/import_library.rb</a></li>
<li><a href="#trunkalexandrialibalexandriauimain_apprb">trunk/alexandria/lib/alexandria/ui/main_app.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 (619 => 620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/import_library.rb 2007-02-23 22:42:18 UTC (rev 619)
+++ trunk/alexandria/lib/alexandria/import_library.rb 2007-02-24 06:08:51 UTC (rev 620)
</span><span class="lines">@@ -61,12 +61,21 @@
</span><span class="cx">
</span><span class="cx"> class Library
</span><span class="cx"> def self.import_autodetect(*args)
</span><ins>+ puts args.inspect
+ filename = args[1]
+ puts "Filename is #{filename} and ext is #{filename[-4..-1]}"
</ins><span class="cx"> puts "Beginning import: #{args[0]}, #{args[1]}"
</span><del>- begin
</del><ins>+ if filename[-4..-1] == ".txt"
</ins><span class="cx"> self.import_as_isbn_list(*args)
</span><del>- rescue => e
- puts e.message
</del><ins>+ elsif [".tc",".bc"].include? filename[-3..-1]
+ begin
</ins><span class="cx"> self.import_as_tellico_xml_archive(*args)
</span><ins>+ rescue => e
+ puts e.message
+ end
+ else
+ puts "Bailing on this import!"
+ raise "Not supported type"
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -97,18 +106,16 @@
</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><ins>+ elements.each {|e| puts e.inspect}
+ #Feed an array in here, tomorrow.
</ins><span class="cx"> book = Book.new(elements['title'].text,
</span><span class="cx"> elements['authors'].elements.to_a.map \
</span><span class="cx"> { |x| x.text },
</span><span class="cx"> elements['isbn'].text,
</span><span class="cx"> elements['publisher'].text,
</span><del>- elements['pub_year'] != nil \
- ? elements['pub_year'].text \
- : nil,
</del><ins>+ elements['pub_year'].text,
</ins><span class="cx"> elements['binding'].text)
</span><del>- content << [ book, elements['cover'] \
- ? elements['cover'].text \
- : nil ]
</del><ins>+ content << [ book, elements['cover'].text]
</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">@@ -122,9 +129,10 @@
</span><span class="cx"> library << book
</span><span class="cx"> library.save(book)
</span><span class="cx"> end
</span><del>- break library
- rescue
- break nil
</del><ins>+ return [library, nil]
+ rescue => e
+ puts e.message
+ return nil
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkalexandrialibalexandriauimain_apprb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/ui/main_app.rb (619 => 620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/ui/main_app.rb 2007-02-23 22:42:18 UTC (rev 619)
+++ trunk/alexandria/lib/alexandria/ui/main_app.rb 2007-02-24 06:08:51 UTC (rev 620)
</span><span class="lines">@@ -1204,8 +1204,12 @@
</span><span class="cx">
</span><span class="cx"> on_import = proc do
</span><span class="cx"> ImportDialog.new(@main_app) do |library, bad_isbns|
</span><del>- if bad_isbns
- quick_message("The following ISBNs failed to import: #{bad_isbns.inspect}")
</del><ins>+ unless bad_isbns.empty?
+ message = "The following ISBNs failed to import:"
+ bad_isbns.each {|bi| message += "\n#{bi}"}
+ bad_isbn_warn = Gtk::MessageDialog.new(@main_app, Gtk::Dialog::MODAL, Gtk::MessageDialog::WARNING, Gtk::MessageDialog::BUTTONS_CLOSE, message ).show
+ bad_isbn_warn.signal_connect('response') { bad_isbn_warn.destroy }
+ #quick_message("The following ISBNs failed to import: #{bad_isbns.inspect}")
</ins><span class="cx"> end
</span><span class="cx"> @libraries.add_library(library)
</span><span class="cx"> append_library(library, true)
</span></span></pre>
</div>
</div>
</body>
</html>