Initial import.

[utils.git] / ANN.pm

diff --git a/ANN.pm b/ANN.pm
index 020c547..1406c45 100644 (file)
--- a/ANN.pm
+++ b/ANN.pm
@@ -57,7 +57,12 @@ sub getlist
     # The only way to recognize entries that seems sure is to look
     # after the "HOVERLINE" class.
     
-    push @ret, $1 while $html =~ /<A\s.*CLASS=HOVERLINE\s.*>.*<FONT.*>([^<>]*$name[^<>]*)<\/FONT/ig;
+    while($html =~ /<A\s.*CLASS=HOVERLINE\s.*HREF=\"([^\"]+)\".*>([^<]+)<\//ig) {
+       if((substr "" . lc $2 , 0, length $name) eq lc $name) {
+           push @ret, $2;
+       }
+    }
+    # push @ret, $1 while $html =~ /<A\s.*CLASS=HOVERLINE\s.*>.*<FONT.*>([^<>]*$name[^<>]*)<\/FONT/ig;
     
     return @ret;
 }
@@ -76,9 +81,13 @@ sub getid
     # The only way to recognize entries that seems sure is to look
     # after the "HOVERLINE" class.
     
-    (($url) = ($html =~ /<A\s.*CLASS=HOVERLINE\s.*HREF=\"([^\"]+)\".*$name/i)) || return;
+    while($html =~ /<A\s.*CLASS=HOVERLINE\s.*HREF=\"([^\"]+)\".*>([^<]+)<\//ig) {
+       if((substr "" . lc $2 , 0, length $name) eq lc $name) {
+           return ($1 =~ /id=(\d+)$/)[0];
+       }
+    }
     
-    return ($url =~ /\?id=(\d+)$/)[0];
+    return undef;
 }
 
 sub geturl
@@ -98,8 +107,8 @@ sub getthemes
        my(@parts, $ct, $buf);
        while($html =~ /\G\<br\>&nbsp; &nbsp; (([^<>]|\<i\>|<\/i>)+)/igc) {
            $buf = $1;
-           #                     0  1            2         3     4     5        6        7                      8              9         10    11
-           if(@parts = ($buf =~ /(\#(\d+):)?\s*\"([^\"\(]+)(\s*\((\<i\>(.*)<\/i>(;\s*)?)?([^<>]+)?\))?\"\s+by\s+([^\(]*[^\(\s])(\s*\(eps (\d+)-(\d+)?\))?/i)) {
+           #                     0  1            2           3     4     5        6        7                      8              9         10    11
+           if(@parts = ($buf =~ /(\#(\d+):)?\s*\"([^\"\(]+\S)(\s*\((\<i\>(.*)<\/i>(;\s*)?)?([^<>]+)?\))?\"\s+by\s+([^\(]*[^\(\s])(\s*\(eps (\d+)-(\d+)?\))?/i)) {
                $ct = {};
                $ct->{"num"} = $parts[1] if defined $parts[1];
                if(defined $parts[5]) {