bug fix for regular expression matches. now it returns all matches, n…

…ot just one
urbanadventurer · Jan 8, 2011 · 87f103b · 87f103b
1 parent ddcd29b
commit 87f103b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/plugins.rb b/lib/plugins.rb
@@ -109,9 +109,9 @@ def x
 			[:version,:model,:string,:firmware,:filepath].each do |symbol|
 		                if !match[symbol].nil? and match[symbol].class==Regexp
 		                        if @body =~ match[:regexp_compiled]
-		                                regexpmatch = $~
+						regexpmatch = @body.scan(match[:regexp_compiled])
 		                                m = match.dup
-		                                m[symbol] = regexpmatch[match[:regexp_offset]+1]
+		                                m[symbol] = regexpmatch.map {|eachmatch|  eachmatch[match[:regexp_offset]] }.flatten.sort.uniq
 		                                r << m
 		                        end
 		                end
@@ -193,9 +193,9 @@ def x
 				[:version,:model,:string,:firmware,:filepath].each do |symbol|
 				        if !match[symbol].nil? and match[symbol].class==Regexp
 				                if @body =~ match[:regexp_compiled]
-				                        regexpmatch = $~
+							regexpmatch = @body.scan(match[:regexp_compiled])
 				                        m = match.dup
-				                        m[symbol] = regexpmatch[match[:regexp_offset]+1]
+				                        m[symbol] = regexpmatch.map {|eachmatch|  eachmatch[match[:regexp_offset]] }.flatten.sort.uniq
 				                        r << m
 				                end
 				        end