anndl: Print raw names in choice list.

[utils.git] / ANN.pm

diff --git a/ANN.pm b/ANN.pm
index f10e869..6dd02e9 100644 (file)
--- a/ANN.pm
+++ b/ANN.pm
@@ -58,7 +58,7 @@ 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=\"([^\"]+)\"[^>]*>(<FONT[^>]*>)?(\<small\>.*\<\/small\>)?\s*([^<]+)<\//ig) {
+    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;
        }
@@ -83,7 +83,7 @@ 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=\"([^\"]+)\"[^>]*>(<FONT[^>]*>)?(\<small\>.*\<\/small\>)?\s*([^<]+)<\//ig) {
+    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];
        }