X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=ANN.pm;h=2ae48cda5aaa72696596de49a554c5bf7202d9fd;hb=639d9800b021409ce4641a980fd720ff23ade428;hp=fbf08e55a88d0d943c556006168fd93890ff8a2e;hpb=23d4abb2e29634e8d2e11879be91cec9cfd6ad13;p=utils.git

diff --git a/ANN.pm b/ANN.pm
index fbf08e5..2ae48cd 100644
--- a/ANN.pm
+++ b/ANN.pm
@@ -53,6 +53,14 @@ sub getid
     return ($url =~ /\?id=(\d+)$/)[0];
 }
 
+sub geturl
+{
+    my($id);
+    ($id) = @_;
+    
+    return "http://www.animenewsnetwork.com/encyclopedia/anime.php?id=$id";
+}
+
 sub getthemes
 {
     my($html, $kind, @ret);
@@ -67,13 +75,13 @@ sub getthemes
 		$ct = {};
 		$ct->{"num"} = $parts[1] if defined $parts[1];
 		if(defined $parts[5]) {
-		    $ct->{"tit"} = $parts[5];
+		    $ct->{"tit"} = decode_entities($parts[5]);
 		    $ct->{"jat"} = decode_entities($parts[2]) if defined $parts[2];
 		} else {
-		    $ct->{"tit"} = $parts[2] if defined $parts[2];
+		    $ct->{"tit"} = decode_entities($parts[2]) if defined $parts[2];
 		}
-		$ct->{"ent"} = $parts[7] if defined $parts[7];
-		$ct->{"prf"} = $parts[8] if defined $parts[8];
+		$ct->{"ent"} = decode_entities($parts[7]) if defined $parts[7];
+		$ct->{"prf"} = decode_entities($parts[8]) if defined $parts[8];
 		$ct->{"fep"} = $parts[10] if defined $parts[10];
 		$ct->{"lep"} = $parts[11] if defined $parts[11];
 		push @ret, $ct;
@@ -89,10 +97,15 @@ sub getseries
     my($id, $buf, $html, %ret);
     ($id) = @_;
     
-    $html = _get "http://www.animenewsnetwork.com/encyclopedia/anime.php?id=$id";
+    $html = _get geturl $id;
     
-    $ret{"url"} = "http://www.animenewsnetwork.com/encyclopedia/anime.php?id=$id";
-    ($ret{"name"}) = ($html =~ /\<TITLE\>Anime News Network - ([^<]*)<\/TITLE>/);
+    $ret{"url"} = geturl $id;
+    ($buf) = ($html =~ /\<TITLE\>Anime News Network - ([^<]*)<\/TITLE>/);
+    if($buf =~ /\([^\)]+\)$/) {
+	($ret{"name"}, $ret{"type"}) = ($buf =~ /^(.*[^\s])\s*\(([^\)]+)\)$/);
+    } else {
+	$ret{"name"} = $buf;
+    }
     if(($buf) = ($html =~ /vintage:<\/b>\n([^<]+)</is)) {
 	$ret{"vtg"} = $buf;
     }