updated

diff --git a/linkmap/map.cgi b/linkmap/map.cgi
index 27f2701..ab4690b 100755 (executable)
--- a/linkmap/map.cgi
+++ b/linkmap/map.cgi
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 
 $PERL = "/usr/bin/perl";
-#$LINKMAP_DIR = "/var/www/fonts.jp/chise_linkmap";
-$LINKMAP_DIR = "/var/www/chise_linkmap";
+$LINKMAP_DIR = "/var/www/fonts.jp/chise_linkmap";
 
 use CGI;
 $cgi = new CGI;

diff --git a/linkmap/map.pl b/linkmap/map.pl
index 8a0a143..cb888a6 100755 (executable)
--- a/linkmap/map.pl
+++ b/linkmap/map.pl
@@ -199,11 +199,11 @@ seek FH, 0, 0;
 $i = 0;
 foreach(<FH>){
   if($i == 1){
-    m/points=\"[0-9]+,[0-9]+ ([0-9]+),([0-9]+) [0-9]+,[0-9]+ ([0-9]+),([0-9]+) /;
-    print FH2 "<area href=\"http://app.kita.zinbun.kyoto-u.ac.jp/char-desc?char=%26u-$target%3B\" shape=\"rect\" coords=\"".int($3 / $rate).", ".int($4 / $rate).", ".int($1 / $rate).", ".int($2 / $rate)."\">\n";
+    m/points=\"[0-9.-]+,[0-9.-]+ ([0-9.-]+),([0-9.-]+) [0-9.-]+,[0-9.-]+ ([0-9.-]+),([0-9.-]+) /;
+    print FH2 "<area href=\"http://$SERVER/char-desc?char=%26U-$target%3B\" shape=\"rect\" coords=\"".(int($3 / $rate) + $x).", ".($cy + int($4 / $rate) + $y).", ".(int($1 / $rate) + $x).", ".($cy + int($2 / $rate) + $y)."\">\n";
     $i = 0;
   }
-  elsif(m/^<g id=\"node[0-9]+\" class=\"node\"><title>(2{0,1}[0-9A-F]{4})<\/title>\n$/){
+  elsif(m/^<g id=\"node[0-9]+\" class=\"node\"><title>(2?[0-9A-F]{4})<\/title>\n$/){
     $target = $1;
     $i = 1;
   }