X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=ANN.pm;h=6dd02e94fc951f0b1773cf7f5131f6ecf3359386;hp=8b311f4b84d69f3fec2e3b292b157a6f94d1d17a;hb=HEAD;hpb=cbdc054a5abdbe2f2275bb9a52f422cb31dd40b2

diff --git a/ANN.pm b/ANN.pm
index 8b311f4..6dd02e9 100644
--- a/ANN.pm
+++ b/ANN.pm
@@ -58,9 +58,9 @@ sub getlist
     # The only way to recognize entries that seems sure is to look
     # after the "HOVERLINE" class.
     
-    while($html =~ /<A\s.*CLASS=HOVERLINE\s.*HREF=\"([^\"]+)\".*>(\<small\>.*\<\/small\>)?([^<]+)<\//ig) {
-	if((substr "" . lc $3 , 0, length $name) eq lc $name) {
-	    push @ret, $3;
+    while($html =~ /<A\s+CLASS="HOVERLINE"\s+HREF="([^"]+)"[^>]*>(<FONT[^>]*>)?(<small>[^<]*<\/small>)?\s*([^<]+)<\//ig) {
+	if((substr "" . lc $4 , 0, length $name) eq lc $name) {
+	    push @ret, $4;
 	}
     }
     # push @ret, $1 while $html =~ /<A\s.*CLASS=HOVERLINE\s.*>.*<FONT.*>([^<>]*$name[^<>]*)<\/FONT/ig;
@@ -83,8 +83,8 @@ sub getid
     # The only way to recognize entries that seems sure is to look
     # after the "HOVERLINE" class.
     
-    while($html =~ /<A\s.*CLASS=HOVERLINE\s.*HREF=\"([^\"]+)\".*>(\<small\>.*\<\/small\>)?([^<]+)<\//ig) {
-	if((substr "" . lc $3 , 0, length $name) eq lc $name) {
+    while($html =~ /<A\s+CLASS="HOVERLINE"\s+HREF="([^"]+)"[^>]*>(<FONT[^>]*>)?(<small>[^<]*<\/small>)?\s*([^<]+)<\//ig) {
+	if((substr "" . lc $4 , 0, length $name) eq lc $name) {
 	    return ($1 =~ /id=(\d+)$/)[0];
 	}
     }