plugin(oxford): moved to lexico.com, closes #13

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / urban.rb

diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index a15b36224e05be4586ae82b876555df537a65d58..70d451af7788d5848dbfca074367a0e350859d61 100644 (file)
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -21,13 +21,15 @@ class UrbanPlugin < Plugin
 
     notfound = s.match %r{<i>.*?</i> isn't defined}
 
-    numpages = if s[%r{<div id='paginator'>.*?</div>}m]
-      $&.scan(/\d+/).collect {|x| x.to_i}.max || 1
+    numpages = if s[%r{<ul class="pagination[^"]+">.*?</ul>}m]
+      $&.scan(/>(\d+)</).collect {|x| x[0].to_i}.max || 1
     else 1 end
 
     rv = Array.new
-    s.scan(%r{<div class='word'[^>]*>.*?<a class="index"[^>]*>.*?(\d+)\..*?</a>.*?<span>(.*?)</span>.*?<div class="definition">(.+?)</div>.*?<div class="example">(.+?)</div>}m) do |num, wrd, desc, ex|
-      rv << [num.to_i, wrd.strip, desc.strip, ex.strip]
+    num = 1
+    s.scan(%r{<a class="word"[^>]* href="\/define[^>]*>([^<]+)</a>.*?<div class='meaning'>(.+?)</div>.*?<div class='example'>(.+?)</div>}m) do |wrd, desc, ex|
+      rv << [num, wrd.strip, desc.strip, ex.strip]
+      num += 1
     end
 
     maxnum = rv.collect {|x| x[0]}.max || 0