svnno****@sourc*****
svnno****@sourc*****
2009年 8月 9日 (日) 03:54:12 JST
Revision: 952
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=952
Author: fdiary
Date: 2009-08-09 03:54:12 +0900 (Sun, 09 Aug 2009)
Log Message:
-----------
* misc/plugin/amazon.rb: import tDiary's amazon.rb (rev.3501).
Modified Paths:
--------------
hiki/trunk/ChangeLog
hiki/trunk/misc/plugin/amazon.rb
Modified: hiki/trunk/ChangeLog
===================================================================
--- hiki/trunk/ChangeLog 2009-08-08 07:36:36 UTC (rev 951)
+++ hiki/trunk/ChangeLog 2009-08-08 18:54:12 UTC (rev 952)
@@ -1,3 +1,6 @@
+2009-08-08 Kazuhiko <kazuh****@fdiar*****>
+ * misc/plugin/amazon.rb: import tDiary's amazon.rb (rev.3501).
+
2009-08-05 Kazuhiko <kazuh****@fdiar*****>
* style/default/hikidoc.rb: use recent hikidoc.rb (rev.110).
Modified: hiki/trunk/misc/plugin/amazon.rb
===================================================================
--- hiki/trunk/misc/plugin/amazon.rb 2009-08-08 07:36:36 UTC (rev 951)
+++ hiki/trunk/misc/plugin/amazon.rb 2009-08-08 18:54:12 UTC (rev 952)
@@ -52,7 +52,7 @@
aid = @conf['amazon.aid'] || ''
aid = 'cshs-22' if aid.empty?
- url = @amazon_ecs_url_hash[country].dup
+ url = (@conf['amazon.endpoints'] || @amazon_ecs_url_hash)[country].dup
url << "?Service=AWSECommerceService"
url << "&SubscriptionId=#{@amazon_subscription_id}"
url << "&AssociateTag=#{aid}"
@@ -226,7 +226,7 @@
def amazon_get( asin, with_image = true, label = nil, pos = 'amazon' )
asin = asin.to_s.strip # delete white spaces
asin.sub!(/\A([a-z]+):/, '')
- country = $1 || @amazon_default_country
+ country = $1 || @conf['amazon.default_country'] || @amazon_default_country
digit = asin.gsub( /[^\d]/, '' )
if digit.length == 13 then # ISBN-13
asin = digit