<!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>[660] trunk/alexandria: fixed: utf-8 -> UTF-8, iso-8859-* -> ISO-8859-*</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>660</dd>
<dt>Author</dt> <dd>laurusnobilis</dd>
<dt>Date</dt> <dd>2007-03-16 07:33:39 -0400 (Fri, 16 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixed: utf-8 -> UTF-8, iso-8859-* -> ISO-8859-*
z3950.rb: default charset is now ISO-8859-1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandriaChangeLog">trunk/alexandria/ChangeLog</a></li>
<li><a href="#trunkalexandriaNEWS">trunk/alexandria/NEWS</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersadlibrisrb">trunk/alexandria/lib/alexandria/book_providers/adlibris.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersamazonrb">trunk/alexandria/lib/alexandria/book_providers/amazon.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersbnrb">trunk/alexandria/lib/alexandria/book_providers/bn.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersbol_itrb">trunk/alexandria/lib/alexandria/book_providers/bol_it.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersdea_store_itrb">trunk/alexandria/lib/alexandria/book_providers/dea_store_it.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersibs_itrb">trunk/alexandria/lib/alexandria/book_providers/ibs_it.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providerslsrb">trunk/alexandria/lib/alexandria/book_providers/ls.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersmcurb">trunk/alexandria/lib/alexandria/book_providers/mcu.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersproxisrb">trunk/alexandria/lib/alexandria/book_providers/proxis.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersrenaudrb">trunk/alexandria/lib/alexandria/book_providers/renaud.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersthaliarb">trunk/alexandria/lib/alexandria/book_providers/thalia.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providerswebster_itrb">trunk/alexandria/lib/alexandria/book_providers/webster_it.rb</a></li>
<li><a href="#trunkalexandrialibalexandriabook_providersz3950rb">trunk/alexandria/lib/alexandria/book_providers/z3950.rb</a></li>
<li><a href="#trunkalexandrialibalexandriaexport_libraryrb">trunk/alexandria/lib/alexandria/export_library.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkalexandriaChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/ChangeLog (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/ChangeLog 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/ChangeLog 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -13,9 +13,9 @@
</span><span class="cx"> * several fixes and updates for various providers
</span><span class="cx"> * added info about the Wikipedia page for each provder (if any)
</span><span class="cx"> * added the country of the provider after the name
</span><del>- * converted the encoding from utf-8, when searching by
</del><ins>+ * converted the encoding from UTF-8, when searching by
</ins><span class="cx"> title/author/keyword
</span><del>- * converted the output from the provider to utf-8
</del><ins>+ * converted the output from the provider to UTF-8
</ins><span class="cx"> * used CGI::unescapeHTML for renaud and thalia
</span><span class="cx"> * now most providers return EAN instead of ISBN-10
</span><span class="cx"> * added Library.canonicalise_isbn for the providers that don't
</span></span></pre></div>
<a id="trunkalexandriaNEWS"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/NEWS (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/NEWS 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/NEWS 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx">
</span><span class="cx"> Bugs fixed:
</span><span class="cx"> * several fixes and updates for various providers
</span><del>- * converted the encoding from utf-8, when searching by title/author/keyword
- * converted the output from the provider to utf-8
</del><ins>+ * converted the encoding from UTF-8, when searching by title/author/keyword
+ * converted the output from the provider to UTF-8
</ins><span class="cx"> * used CGI::unescapeHTML for renaud and thalia
</span><span class="cx"> * now nul is returned instead of "", "n/a", or "Unknown Binding", when the provider doesn't return a value
</span><span class="cx">
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersadlibrisrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/adlibris.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/adlibris.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/adlibris.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI
</span><span class="cx"> if type == SEARCH_BY_ISBN
</span><span class="cx"> req += "product.aspx?isbn="+criterion+"&checked=1"
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> def to_book_isbn(data, isbn)
</span><span class="cx"> #puts data
</span><span class="cx"> raise NoResultsError if /Ingen titel med detta ISBN finns hos AdLibris/.match(data) != nil
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx">
</span><span class="cx"> product = {}
</span><span class="cx">
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersamazonrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/amazon.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/amazon.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/amazon.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> # valid UTF-8. It does not always work - see isbn 2259196098
</span><span class="cx"> # (from the mailing list) for an example.
</span><span class="cx"> #if req.locale == 'us'
</span><del>- # title = title.convert('iso-8859-1','utf-8')
</del><ins>+ # title = title.convert('ISO-8859-1','UTF-8')
</ins><span class="cx"> #end
</span><span class="cx">
</span><span class="cx"> media = product.media.squeeze(' ')
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersbnrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/bn.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/bn.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/bn.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "booksearch/"
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> def to_book(data)
</span><span class="cx"> raise NoResultsError if /<body><h1>Object Moved<\/h1>This object may be found <a HREF="http:\/\/www.barnesandnoble.com\/booksearch\/noresults.asp/.match(data) != nil
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx">
</span><span class="cx"> raise "No title" unless md = /Barnes&nbsp;&amp;&nbsp;Noble.com - Books: ([^<]+)/.match(data)
</span><span class="cx"> title = md[1].strip
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersbol_itrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/bol_it.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/bol_it.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/bol_it.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "/" + LOCALE + "/"
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> def to_book(data)
</span><span class="cx"> raise NoResultsError if /Scheda libro non completa \(TP null\)/.match(data) != nil
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx">
</span><span class="cx"> raise "No title" unless md = /<INPUT type =hidden name ="mailTitolo" value="([^"]+)/.match(data)
</span><span class="cx"> title = CGI.unescape(md[1].strip)
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersdea_store_itrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/dea_store_it.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/dea_store_it.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/dea_store_it.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("windows-1252", "utf-8")
</del><ins>+ criterion = criterion.convert("windows-1252", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "/"
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersibs_itrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/ibs_it.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/ibs_it.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/ibs_it.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "/ser/"
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> def to_book(data)
</span><span class="cx"> raise NoResultsError if /<b>Il libro che hai cercato non &egrave; presente nel nostro catalogo<\/b><br>/.match(data) != nil
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx">
</span><span class="cx"> raise "No title" unless md = /<b>Titolo<\/b><\/td><td valign="top"><span class="lbarrasup">([^<]+)/.match(data)
</span><span class="cx"> title = CGI.unescape(md[1].strip)
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providerslsrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/ls.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/ls.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/ls.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "/livro.asp?tipo=10&pesquisa="
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> #######
</span><span class="cx">
</span><span class="cx"> def to_book(data)
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx"> raise NoResultsError if /<strong>Nenhum t.tulo foi encontrado\.<BR>/.match(data) != nil
</span><span class="cx">
</span><span class="cx"> raise "No Title" unless md = /><strong(\s+class="titulodetalhes")?>([^<]+)<\/strong>(<\/a>)?<br ?\/>/.match(data)
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersmcurb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/mcu.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/mcu.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/mcu.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><span class="cx"> prefs.read
</span><del>- criterion = criterion.convert("iso-8859-1", "UTF-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> print "Doing search with MCU #{criterion}, type: #{type}\n" if $DEBUG # for DEBUGing
</span><span class="cx"> req = BASE_URI + "CMD=VERLST&BASE=ISBN&DOCS=1-15&CONF=AEISPA.cnf&OPDEF=AND&DOCS=1-1000&SEPARADOR=&"
</span><span class="cx"> req += case type
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersproxisrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/proxis.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/proxis.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/proxis.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> def search(criterion, type)
</span><span class="cx"> prefs.read
</span><span class="cx">
</span><del>- criterion = criterion.convert("windows-1252", "utf-8")
</del><ins>+ criterion = criterion.convert("windows-1252", "UTF-8")
</ins><span class="cx"> req = case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="cx"> "p_isbn=#{CGI::escape(criterion)}&p_title=&p_author="
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> #######
</span><span class="cx">
</span><span class="cx"> def parseBook(product_id)
</span><del>- conv = proc { |str| str.convert("utf-8", "windows-1252") if str != nil }
</del><ins>+ conv = proc { |str| str.convert("UTF-8", "windows-1252") if str != nil }
</ins><span class="cx"> detailspage='http://oas2000.proxis.be/gate/jabba.coreii.g_p?bi=4&sp=DETAILS&mi='+product_id
</span><span class="cx"> product = {}
</span><span class="cx"> product['authors'] = []
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersrenaudrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/renaud.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/renaud.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/renaud.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_wsc.asp&OnlyAvailable=false&Tri="
</span><span class="cx"> # req = BASE_URI + "francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_section_wsc.asp&OnlyAvailable=false&Tri="
</span><span class="cx"> req += case type
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> def to_books(data)
</span><span class="cx"> data = CGI::unescapeHTML(data)
</span><del>- data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx"> raise NoResultsError if /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/.match(data) != nil
</span><span class="cx">
</span><span class="cx"> titles = []
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersthaliarb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/thalia.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/thalia.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/thalia.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-1", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-1", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "shop/bde_bu_hg_startseite/schnellsuche/buch/?"
</span><span class="cx"> #if type == SEARCH_BY_ISBN
</span><span class="cx"> # req += ""
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> def to_book(data)
</span><span class="cx"> puts data if $DEBUG
</span><span class="cx"> raise NoResultsError if /Leider f&uuml;hrte Ihre Suche zu keinen Ergebnissen\./.match(data) != nil
</span><del>-# data = data.convert("UTF-8", "iso-8859-1")
</del><ins>+# data = data.convert("UTF-8", "ISO-8859-1")
</ins><span class="cx"> data = CGI::unescapeHTML(data)
</span><span class="cx"> product = {}
</span><span class="cx"> # title
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providerswebster_itrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/webster_it.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/webster_it.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/webster_it.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><del>- criterion = criterion.convert("iso-8859-15", "utf-8")
</del><ins>+ criterion = criterion.convert("ISO-8859-15", "UTF-8")
</ins><span class="cx"> req = BASE_URI + "/"
</span><span class="cx"> req += case type
</span><span class="cx"> when SEARCH_BY_ISBN
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> def to_book(data)
</span><span class="cx"> raise NoResultsError if /<font color="\#ffffff"><b>Prodotto non esistente<\/b><\/font>/.match(data) != nil
</span><del>- data = data.convert("UTF-8", "iso-8859-15")
</del><ins>+ data = data.convert("UTF-8", "ISO-8859-15")
</ins><span class="cx">
</span><span class="cx"> raise unless md = /<li><span class="product_label">Titolo:<\/span><span class="product_text"> ([^<]+)/.match(data)
</span><span class="cx"> title = CGI.unescape(md[1].strip)
</span></span></pre></div>
<a id="trunkalexandrialibalexandriabook_providersz3950rb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/book_providers/z3950.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/book_providers/z3950.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -35,12 +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><del>- prefs.add("charset", _("Charset encoding"), "utf-8")
</del><ins>+ prefs.add("charset", _("Charset encoding"), "ISO-8859-1")
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def search(criterion, type)
</span><span class="cx"> prefs.read
</span><del>- criterion = criterion.convert(prefs['charset'], "utf-8")
</del><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">@@ -73,7 +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><del>- marc_txt = marc_txt.convert("utf-8", prefs['charset'])
</del><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">@@ -147,7 +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><del>- prefs.variable_named("charset").default_value = "iso-8859-1"
</del><ins>+ prefs.variable_named("charset").default_value = "ISO_6937"
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def url(book)
</span><span class="lines">@@ -175,7 +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><del>- prefs.variable_named("charset").default_value = "iso-8859-1"
</del><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">@@ -203,7 +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><del>- text = text.convert("utf-8", prefs['charset'])
</del><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">@@ -258,7 +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><del>- prefs.variable_named("charset").default_value = "iso-8859-1"
</del><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>
<a id="trunkalexandrialibalexandriaexport_libraryrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/export_library.rb (659 => 660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/export_library.rb 2007-03-13 21:04:48 UTC (rev 659)
+++ trunk/alexandria/lib/alexandria/export_library.rb 2007-03-16 11:33:39 UTC (rev 660)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
</del><ins>+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</ins><span class="cx"> <meta name="generator" content="#{generator}"/>
</span><span class="cx"> <title>#{name}</title>
</span><span class="cx"> <link rel="stylesheet" href="#{css}" type="text/css"/>
</span></span></pre>
</div>
</div>
</body>
</html>