<!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>[658] trunk/alexandria/lib/alexandria/book_providers/z3950.rb: z3950.rb: - added conversion from and to utf-8.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>658</dd>
<dt>Author</dt> <dd>laurusnobilis</dd>
<dt>Date</dt> <dd>2007-03-13 15:28:11 -0400 (Tue, 13 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>z3950.rb: - added conversion from and to utf-8.
- fixed "authors" for BL</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 (657 => 658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-13 16:44:04 UTC (rev 657)
+++ trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-13 19:28:11 UTC (rev 658)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> # Copyright (C) 2005-2006 Laurent Sansonetti
</span><ins>+# Copyright (C) 2007 Laurent Sansonetti and Marco Costantini
</ins><span class="cx"> #
</span><span class="cx"> # Alexandria is free software; you can redistribute it and/or
</span><span class="cx"> # modify it under the terms of the GNU General Public License as
</span><span class="lines">@@ -34,10 +35,12 @@
</span><span class="cx"> prefs.add("record_syntax", _("Record syntax"), "USMARC", ["USMARC", "UNIMARC", "SUTRS"])
</span><span class="cx"> prefs.add("username", _("Username"), "", nil, false)
</span><span class="cx"> prefs.add("password", _("Password"), "", nil, false)
</span><ins>+ prefs.add("charset", _("Charset encoding"), "utf-8")
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><span class="cx"> prefs.read
</span><ins>+ criterion = criterion.convert(prefs['charset'], "utf-8")
</ins><span class="cx">
</span><span class="cx"> # We only decode MARC at the moment.
</span><span class="cx"> # SUTRS needs to be decoded separately, because each Z39.50 server has a
</span><span class="lines">@@ -70,6 +73,7 @@
</span><span class="cx"> resultset[0..9].each do |record|
</span><span class="cx"> marc_txt = record.render(prefs['record_syntax'], 'USMARC')
</span><span class="cx"> puts marc_txt if $Z3950_DEBUG
</span><ins>+ marc_txt = marc_txt.convert("utf-8", prefs['charset'])
</ins><span class="cx"> marc = MARC::Record.new(marc_txt)
</span><span class="cx">
</span><span class="cx"> if $Z3950_DEBUG
</span><span class="lines">@@ -143,6 +147,7 @@
</span><span class="cx"> prefs.variable_named("port").default_value = 7090
</span><span class="cx"> prefs.variable_named("database").default_value = "Voyager"
</span><span class="cx"> prefs.variable_named("record_syntax").default_value = "USMARC"
</span><ins>+ prefs.variable_named("charset").default_value = "iso-8859-1"
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def url(book)
</span><span class="lines">@@ -170,6 +175,7 @@
</span><span class="cx"> prefs.variable_named("port").default_value = 9909
</span><span class="cx"> prefs.variable_named("database").default_value = "BLAC"
</span><span class="cx"> prefs.variable_named("record_syntax").default_value = "SUTRS"
</span><ins>+ prefs.variable_named("charset").default_value = "iso-8859-1"
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><span class="lines">@@ -197,6 +203,7 @@
</span><span class="cx"> resultset[0..9].each do |record|
</span><span class="cx"> text = record.render
</span><span class="cx"> puts text if $Z3950_DEBUG
</span><ins>+ text = text.convert("utf-8", prefs['charset'])
</ins><span class="cx">
</span><span class="cx"> title = isbn = publisher = publish_year = edition = nil
</span><span class="cx"> authors = []
</span><span class="lines">@@ -206,6 +213,8 @@
</span><span class="cx"> title = md[1].sub(/\.$/, '').squeeze(' ')
</span><span class="cx"> elsif md = /^Added Person Name:\s+(.*),[^,]+$/.match(line)
</span><span class="cx"> authors << md[1]
</span><ins>+ elsif md = /^ME-Personal Name:\s+(.*),[^,]+$/.match(line)
+ authors << md[1]
</ins><span class="cx"> elsif md = /^ISBN:\s+([\dXx]+)/.match(line)
</span><span class="cx"> isbn = Library.canonicalise_ean( md[1] )
</span><span class="cx"> elsif md = /^Imprint:.+\:\s*(.+)\,/.match(line)
</span><span class="lines">@@ -249,6 +258,7 @@
</span><span class="cx"> prefs.variable_named("database").default_value = "nopac"
</span><span class="cx"> # supported 'USMARC', 'UNIMARC' , 'SUTRS'
</span><span class="cx"> prefs.variable_named("record_syntax").default_value = "USMARC"
</span><ins>+ prefs.variable_named("charset").default_value = "iso-8859-1"
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span></span></pre>
</div>
</div>
</body>
</html>