Remove obsolete references to JIS0201.TXT JIS0208.TXT.

We don't use those files anymore, since commit 1de9cc0dcc.

diff --git a/src/backend/utils/mb/Unicode/Makefile b/src/backend/utils/mb/Unicode/Makefile
index 10708b3e273c839fec94707fc3a35f9976434450..fa12000064d0454536f29331e1436050973434ba 100644 (file)
--- a/src/backend/utils/mb/Unicode/Makefile
+++ b/src/backend/utils/mb/Unicode/Makefile
@@ -132,7 +132,7 @@ gb-18030-2000.xml windows-949-2000.xml:
 GB2312.TXT:
        $(DOWNLOAD) 'http://trac.greenstone.org/browser/trunk/gsdl/unicode/MAPPINGS/EASTASIA/GB/GB2312.TXT?rev=1842&format=txt'
 
-JIS0201.TXT JIS0208.TXT JIS0212.TXT:
+JIS0212.TXT:
        $(DOWNLOAD) http://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/$(@F)
 
 JOHAB.TXT KSX1001.TXT:

diff --git a/src/backend/utils/mb/Unicode/convutils.pm b/src/backend/utils/mb/Unicode/convutils.pm
index 0ae79a2f33170ed12d7acd4fb67c37c6d1dcfffa..eb3c602c32d62e3890af02aa2ce70c2a3f0e236f 100644 (file)
--- a/src/backend/utils/mb/Unicode/convutils.pm
+++ b/src/backend/utils/mb/Unicode/convutils.pm
@@ -57,8 +57,11 @@ sub read_source
 
                next if (/^0x([0-9A-F]+)\s+(#.*)$/);
 
-               # Skip the first column for JIS0208.TXT
-               if (!/^0x([0-9A-Fa-f]+)\s+0x([0-9A-Fa-f]+)\s+(?:0x([0-9A-Fa-f]+)\s+)?(#.*)$/)
+               # The Unicode source files have three columns
+               # 1: The "foreign" code (in hex)
+               # 2: Unicode code point (in hex)
+               # 3: Unicode name
+               if (!/^0x([0-9A-Fa-f]+)\s+0x([0-9A-Fa-f]+)\s+(#.*)$/)
                {
                        print STDERR "READ ERROR at line $. in $fname: $_\n";
                        exit;