Add contrib/isn module for ISBN/ISSN/EAN13/etc product numbers, and

remove the old isbn_issn module which is about to be obsoleted by EAN13. contrib/isn is by Germán Méndez Bravo. Our thanks to Garrett A. Wollman for having written the original isbn_issn module.

Add contrib/isn module for ISBN/ISSN/EAN13/etc product numbers, and
remove the old isbn_issn module which is about to be obsoleted by EAN13. contrib/isn is by Germán Méndez Bravo. Our thanks to Garrett A. Wollman for having written the original isbn_issn module.
dff84dc7 · Tom Lane · 42c17a6b · dff84dc7 · dff84dc7 · 42c17a6b
Commit dff84dc7 authored Sep 09, 2006 by Tom Lane
17 changed files
--- a/contrib/Makefile
+++ b/contrib/Makefile
-# $PostgreSQL: pgsql/contrib/Makefile,v 1.69 2006/09/05 18:00:57 teodor Exp $
+# $PostgreSQL: pgsql/contrib/Makefile,v 1.70 2006/09/09 04:07:51 tgl Exp $

 subdir = contrib
 top_builddir = ..
@@ -12,10 +12,10 @@ WANTED_DIRS = \
 		dblink		\
 		earthdistance	\
 		fuzzystrmatch	\
-		hstore			\
+		hstore		\
 		intagg		\
 		intarray	\
-		isbn_issn	\
+		isn		\
 		lo		\
 		ltree		\
 		oid2name	\

--- a/contrib/README
+++ b/contrib/README
@@ -64,9 +64,9 @@ intarray -
 	Index support for arrays of int4, using GiST
 	by Teodor Sigaev <teodor@sigaev.ru> and Oleg Bartunov <oleg@sai.msu.su>

-isbn_issn -
-	PostgreSQL type extensions for ISBN (books) and ISSN (serials)
-	by Garrett A. Wollman <wollman@khavrinen.lcs.mit.edu>
+isn -
+	PostgreSQL type extensions for ISBN, ISSN, ISMN, EAN13 product numbers
+	by Germn Mndez Bravo (Kronuz) <kronuz@hotmail.com>

 lo -
 	Large Object maintenance

--- a/contrib/isbn_issn/README.isbn_issn
+++ b/contrib/isbn_issn/README.isbn_issn
-
-ISBN (books) and ISSN (serials)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This directory contains definitions for a couple of PostgreSQL
-external types, for a couple of international-standard namespaces:
-ISBN (books) and ISSN (serials).  Rather than just using a char()
-member of the appropriate length, I wanted my database to include
-the validity-checking that both these numbering systems were designed
-to encompass.  A little bit of research revealed the formulae
-for computing the check digits, and I also included some validity
-constraints on the number of hyphens.
-
-The internal representation of these types is intended to be
-compatible with `char16', in the (perhaps vain) hope that
-this will make it possible to create indices of these types
-using char16_ops.
-
-These are based on Tom Ivar Helbekkmo's IP address type definition,
-from which I have copied the entire form of the implementation.
-
-Garrett A. Wollman, August 1998
--- a/contrib/isbn_issn/isbn_issn.c
+++ b/contrib/isbn_issn/isbn_issn.c
-/*
- *	PostgreSQL type definitions for ISBNs.
- *
- *	$PostgreSQL: pgsql/contrib/isbn_issn/isbn_issn.c,v 1.9 2006/05/30 22:12:13 tgl Exp $
- */
-
-#include "postgres.h"
-
-#include "fmgr.h"
-
-
-PG_MODULE_MAGIC;
-
-/*
- *	This is the internal storage format for ISBNs.
- *	NB: This is an intentional type pun with builtin type `char16'.
- */
-
-typedef struct isbn
-{
-	char		num[13];
-	char		pad[3];
-}	isbn;
-
-/*
- *	Various forward declarations:
- */
-
-isbn	   *isbn_in(char *str);
-char	   *isbn_out(isbn * addr);
-
-bool		isbn_lt(isbn * a1, isbn * a2);
-bool		isbn_le(isbn * a1, isbn * a2);
-bool		isbn_eq(isbn * a1, isbn * a2);
-bool		isbn_ge(isbn * a1, isbn * a2);
-bool		isbn_gt(isbn * a1, isbn * a2);
-
-bool		isbn_ne(isbn * a1, isbn * a2);
-
-int4		isbn_cmp(isbn * a1, isbn * a2);
-
-int4		isbn_sum(char *str);
-
-/*
- *	ISBN reader.
- */
-
-isbn *
-isbn_in(char *str)
-{
-	isbn	   *result;
-	int			len;
-
-	len = strlen(str);
-	if (len != 13)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid ISBN: \"%s\"", str),
-				 errdetail("ISBNs must be 13 characters in length.")));
-
-	if (isbn_sum(str) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid ISBN: \"%s\"", str),
-				 errdetail("ISBN failed checksum.")));
-
-	result = (isbn *) palloc(sizeof(isbn));
-	memcpy(result->num, str, len);
-	memset(result->pad, ' ', 3);
-	return (result);
-}
-
-/*
- * The ISBN checksum is defined as follows:
- *
- * Number the digits from 1 to 9 (call this N).
- * Compute the sum, S, of N * D_N.
- * The check digit, C, is the value which satisfies the equation
- *	S + 10*C === 0 (mod 11)
- * The value 10 for C is written as `X'.
- *
- * For our purposes, we want the complete sum including the check
- * digit; if this is zero, then the checksum passed.  We also check
- * the syntactic validity if the provided string, and return 12
- * if any errors are found.
- */
-int4
-isbn_sum(char *str)
-{
-	int4		sum = 0,
-				dashes = 0,
-				val;
-	int			i;
-
-	for (i = 0; str[i] && i < 13; i++)
-	{
-		switch (str[i])
-		{
-			case '-':
-				if (++dashes > 3)
-					return 12;
-				continue;
-
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				val = str[i] - '0';
-				break;
-
-			case 'X':
-			case 'x':
-				val = 10;
-				break;
-
-			default:
-				return 12;
-		}
-
-		sum += val * (i + 1 - dashes);
-	}
-	return (sum % 11);
-}
-
-/*
- *	ISBN output function.
- */
-
-char *
-isbn_out(isbn * num)
-{
-	char	   *result;
-
-	if (num == NULL)
-		return (NULL);
-
-	result = (char *) palloc(14);
-
-	result[0] = '\0';
-	strncat(result, num->num, 13);
-	return (result);
-}
-
-/*
- *	Boolean tests for magnitude.
- */
-
-bool
-isbn_lt(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) < 0);
-}
-
-bool
-isbn_le(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) <= 0);
-}
-
-bool
-isbn_eq(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) == 0);
-}
-
-bool
-isbn_ge(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) >= 0);
-}
-
-bool
-isbn_gt(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) > 0);
-}
-
-bool
-isbn_ne(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) != 0);
-}
-
-/*
- *	Comparison function for sorting:
- */
-
-int4
-isbn_cmp(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13));
-}
-
-
-/* ----------------------------- ISSN --------------------------- */
-
-/*
- *	This is the internal storage format for ISSNs.
- *	NB: This is an intentional type pun with builtin type `char16'.
- */
-
-typedef struct issn
-{
-	char		num[9];
-	char		pad[7];
-}	issn;
-
-/*
- *	Various forward declarations:
- */
-
-issn	   *issn_in(char *str);
-char	   *issn_out(issn * addr);
-
-bool		issn_lt(issn * a1, issn * a2);
-bool		issn_le(issn * a1, issn * a2);
-bool		issn_eq(issn * a1, issn * a2);
-bool		issn_ge(issn * a1, issn * a2);
-bool		issn_gt(issn * a1, issn * a2);
-
-bool		issn_ne(issn * a1, issn * a2);
-
-int4		issn_cmp(issn * a1, issn * a2);
-
-int4		issn_sum(char *str);
-
-/*
- *	ISSN reader.
- */
-
-issn *
-issn_in(char *str)
-{
-	issn	   *result;
-	int			len;
-
-	len = strlen(str);
-	if (len != 9)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid ISSN: \"%s\"", str),
-				 errdetail("ISSNs must be 9 characters in length.")));
-
-	if (issn_sum(str) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid ISSN: \"%s\"", str),
-				 errdetail("ISSN failed checksum.")));
-
-	result = (issn *) palloc(sizeof(issn));
-	memcpy(result->num, str, len);
-	memset(result->pad, ' ', 7);
-	return (result);
-}
-
-/*
- * The ISSN checksum works just like the ISBN sum, only different
- * (of course!).
- * Here, the weights start at 8 and decrease.
- */
-int4
-issn_sum(char *str)
-{
-	int4		sum = 0,
-				dashes = 0,
-				val;
-	int			i;
-
-	for (i = 0; str[i] && i < 9; i++)
-	{
-		switch (str[i])
-		{
-			case '-':
-				if (++dashes > 1)
-					return 12;
-				continue;
-
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				val = str[i] - '0';
-				break;
-
-			case 'X':
-			case 'x':
-				val = 10;
-				break;
-
-			default:
-				return 12;
-		}
-
-		sum += val * (8 - (i - dashes));
-	}
-	return (sum % 11);
-}
-
-/*
- *	ISSN output function.
- */
-
-char *
-issn_out(issn * num)
-{
-	char	   *result;
-
-	if (num == NULL)
-		return (NULL);
-
-	result = (char *) palloc(14);
-
-	result[0] = '\0';
-	strncat(result, num->num, 9);
-	return (result);
-}
-
-/*
- *	Boolean tests for magnitude.
- */
-
-bool
-issn_lt(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) < 0);
-}
-
-bool
-issn_le(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) <= 0);
-}
-
-bool
-issn_eq(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) == 0);
-}
-
-bool
-issn_ge(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) >= 0);
-}
-
-bool
-issn_gt(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) > 0);
-}
-
-bool
-issn_ne(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) != 0);
-}
-
-/*
- *	Comparison function for sorting:
- */
-
-int4
-issn_cmp(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9));
-}
--- a/contrib/isbn_issn/isbn_issn.sql.in
+++ b/contrib/isbn_issn/isbn_issn.sql.in
--
--	PostgreSQL code for ISSNs.
--
--	$PostgreSQL: pgsql/contrib/isbn_issn/isbn_issn.sql.in,v 1.12 2006/02/27 16:09:48 petere Exp $
--
-
-- Adjust this setting to control where the objects get created.
-SET search_path = public;
-
--
--	Input and output functions and the type itself:
--
-
-CREATE FUNCTION issn_in(cstring)
-RETURNS issn
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_out(issn)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE TYPE issn (
-	INTERNALLENGTH = 16,
-	EXTERNALLENGTH = 9,
-	INPUT = issn_in,
-	OUTPUT = issn_out
-);
-
-COMMENT ON TYPE issn
-  is 'International Standard Serial Number';
-
-
--
--	The various boolean tests:
--
-
-CREATE FUNCTION issn_lt(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_le(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_eq(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_ge(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_gt(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION issn_ne(issn, issn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
--
--	Now the operators.  Note how some of the parameters to some
--	of the 'create operator' commands are commented out.  This
--	is because they reference as yet undefined operators, and
--	will be implicitly defined when those are, further down.
--
-
-CREATE OPERATOR < (
-	LEFTARG = issn,
-	RIGHTARG = issn,
--	NEGATOR = >=,
-	PROCEDURE = issn_lt
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = issn,
-	RIGHTARG = issn,
--	NEGATOR = >,
-	PROCEDURE = issn_le
-);
-
-CREATE OPERATOR = (
-	LEFTARG = issn,
-	RIGHTARG = issn,
-	COMMUTATOR = =,
--	NEGATOR = <>,
-	PROCEDURE = issn_eq
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = issn,
-	RIGHTARG = issn,
-	NEGATOR = <,
-	PROCEDURE = issn_ge
-);
-
-CREATE OPERATOR > (
-	LEFTARG = issn,
-	RIGHTARG = issn,
-	NEGATOR = <=,
-	PROCEDURE = issn_gt
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = issn,
-	RIGHTARG = issn,
-	NEGATOR = =,
-	PROCEDURE = issn_ne
-);
-
-- Register 'issn' comparison function
-CREATE FUNCTION issn_cmp(issn, issn)
-RETURNS integer
-AS '$libdir/isbn_issn'
-LANGUAGE C STRICT;
-
-- Create default operator class for 'issn'    --
-- Needed to create index or primary key       --
-
-CREATE OPERATOR CLASS issn_ops
-DEFAULT FOR TYPE issn USING btree 
-AS
-        OPERATOR        1       < ,
-        OPERATOR        2       <= ,
-        OPERATOR        3       = ,
-        OPERATOR        4       >= ,
-        OPERATOR        5       > ,
-        FUNCTION        1       issn_cmp(issn, issn);
-
-
------------------------------------------------------------------------
-
--
--	Same code for ISBN
--
--	Input and output functions and the type itself:
--
-
-CREATE FUNCTION isbn_in(cstring)
-RETURNS isbn
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_out(isbn)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE TYPE isbn (
-	INTERNALLENGTH = 16,
-	EXTERNALLENGTH = 13,
-	INPUT = isbn_in,
-	OUTPUT = isbn_out
-);
-
-COMMENT ON TYPE isbn IS 'International Standard Book Number';
-
-
--
--	The various boolean tests:
--
-
-CREATE FUNCTION isbn_lt(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_le(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_eq(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_ge(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_gt(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION isbn_ne(isbn, isbn)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
-
--
--	Now the operators.  Note how some of the parameters to some
--	of the 'create operator' commands are commented out.  This
--	is because they reference as yet undefined operators, and
--	will be implicitly defined when those are, further down.
--
-
-CREATE OPERATOR < (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
--	NEGATOR = >=,
-	PROCEDURE = isbn_lt
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
--	NEGATOR = >,
-	PROCEDURE = isbn_le
-);
-
-CREATE OPERATOR = (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
-	COMMUTATOR = =,
--	NEGATOR = <>,
-	PROCEDURE = isbn_eq
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
-	NEGATOR = <,
-	PROCEDURE = isbn_ge
-);
-
-CREATE OPERATOR > (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
-	NEGATOR = <=,
-	PROCEDURE = isbn_gt
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = isbn,
-	RIGHTARG = isbn,
-	NEGATOR = =,
-	PROCEDURE = isbn_ne
-);
-
-
-- Register 'isbn' comparison function
-CREATE FUNCTION isbn_cmp(isbn, isbn)
-RETURNS integer
-AS '$libdir/isbn_issn'
-LANGUAGE C STRICT;
-
-- Create default operator class for 'isbn'    --
-- Needed to create index or primary key       --
-
-CREATE OPERATOR CLASS isbn_ops
-DEFAULT FOR TYPE isbn USING btree 
-AS
-        OPERATOR        1       < ,
-        OPERATOR        2       <= ,
-        OPERATOR        3       = ,
-        OPERATOR        4       >= ,
-        OPERATOR        5       > ,
-        FUNCTION        1       isbn_cmp(isbn, isbn);
--- a/contrib/isbn_issn/uninstall_isbn_issn.sql
+++ b/contrib/isbn_issn/uninstall_isbn_issn.sql
-SET search_path = public;
-
-DROP OPERATOR CLASS isbn_ops USING btree;
-
-DROP FUNCTION isbn_cmp(isbn, isbn);
-
-DROP OPERATOR <> (isbn, isbn);
-
-DROP OPERATOR > (isbn, isbn);
-
-DROP OPERATOR >= (isbn, isbn);
-
-DROP OPERATOR = (isbn, isbn);
-
-DROP OPERATOR <= (isbn, isbn);
-
-DROP OPERATOR < (isbn, isbn);
-
-DROP FUNCTION isbn_ne(isbn, isbn);
-
-DROP FUNCTION isbn_gt(isbn, isbn);
-
-DROP FUNCTION isbn_ge(isbn, isbn);
-
-DROP FUNCTION isbn_eq(isbn, isbn);
-
-DROP FUNCTION isbn_le(isbn, isbn);
-
-DROP FUNCTION isbn_lt(isbn, isbn);
-
-DROP TYPE isbn CASCADE;
-
-DROP OPERATOR CLASS issn_ops USING btree;
-
-DROP FUNCTION issn_cmp(issn, issn);
-
-DROP OPERATOR <> (issn, issn);
-
-DROP OPERATOR > (issn, issn);
-
-DROP OPERATOR >= (issn, issn);
-
-DROP OPERATOR = (issn, issn);
-
-DROP OPERATOR <= (issn, issn);
-
-DROP OPERATOR < (issn, issn);
-
-DROP FUNCTION issn_ne(issn, issn);
-
-DROP FUNCTION issn_gt(issn, issn);
-
-DROP FUNCTION issn_ge(issn, issn);
-
-DROP FUNCTION issn_eq(issn, issn);
-
-DROP FUNCTION issn_le(issn, issn);
-
-DROP FUNCTION issn_lt(issn, issn);
-
-DROP TYPE issn CASCADE;
--- a/contrib/isn/EAN13.h
+++ b/contrib/isn/EAN13.h
+/* 
+ * EAN13.h
+ *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
+ *
+ * Information recompiled by Kronuz on August 23, 2006
+ * http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/isn/EAN13.h,v 1.1 2006/09/09 04:07:52 tgl Exp $
+ *
+ */
+
+/* where the digit set begins, and how many of them are in the table */
+const unsigned EAN13_index[10][2] = {
+	{0,		6},
+	{6,		1},
+	{7,		1},
+	{8,		5},
+	{13,	20},
+	{33,	15},
+	{48,	19},
+	{67,	23},
+	{90,	17},
+	{107,	12},
+};
+const char *EAN13_range[][2] = {
+	{"000", "019"}, /* GS1 US */
+	{"020", "029"}, /* Restricted distribution (MO defined) */
+	{"030", "039"}, /* GS1 US */
+	{"040", "049"}, /* Restricted distribution (MO defined) */
+	{"050", "059"}, /* Coupons */
+	{"060", "099"}, /* GS1 US */
+	{"100", "139"}, /* GS1 US */
+	{"200", "299"}, /* Restricted distribution (MO defined) */
+	{"300", "379"}, /* GS1 France */
+	{"380", "380"}, /* GS1 Bulgaria */
+	{"383", "383"}, /* GS1 Slovenija */
+	{"385", "385"}, /* GS1 Croatia */
+	{"387", "387"}, /* GS1 BIH (Bosnia-Herzegovina) */
+	{"400", "440"}, /* GS1 Germany */
+	{"450", "459"}, /* GS1 Japan */
+	{"460", "469"}, /* GS1 Russia */
+	{"470", "470"}, /* GS1 Kyrgyzstan */
+	{"471", "471"}, /* GS1 Taiwan */
+	{"474", "474"}, /* GS1 Estonia */
+	{"475", "475"}, /* GS1 Latvia */
+	{"476", "476"}, /* GS1 Azerbaijan */
+	{"477", "477"}, /* GS1 Lithuania */
+	{"478", "478"}, /* GS1 Uzbekistan */
+	{"479", "479"}, /* GS1 Sri Lanka */
+	{"480", "480"}, /* GS1 Philippines */
+	{"481", "481"}, /* GS1 Belarus */
+	{"482", "482"}, /* GS1 Ukraine */
+	{"484", "484"}, /* GS1 Moldova */
+	{"485", "485"}, /* GS1 Armenia */
+	{"486", "486"}, /* GS1 Georgia */
+	{"487", "487"}, /* GS1 Kazakstan */
+	{"489", "489"}, /* GS1 Hong Kong */
+	{"490", "499"}, /* GS1 Japan */
+	{"500", "509"}, /* GS1 UK */
+	{"520", "520"}, /* GS1 Greece */
+	{"528", "528"}, /* GS1 Lebanon */
+	{"529", "529"}, /* GS1 Cyprus */
+	{"530", "530"}, /* GS1 Albania */
+	{"531", "531"}, /* GS1 MAC (FYR Macedonia) */
+	{"535", "535"}, /* GS1 Malta */
+	{"539", "539"}, /* GS1 Ireland */
+	{"540", "549"}, /* GS1 Belgium & Luxembourg */
+	{"560", "560"}, /* GS1 Portugal */
+	{"569", "569"}, /* GS1 Iceland */
+	{"570", "579"}, /* GS1 Denmark */
+	{"590", "590"}, /* GS1 Poland */
+	{"594", "594"}, /* GS1 Romania */
+	{"599", "599"}, /* GS1 Hungary */
+	{"600", "601"}, /* GS1 South Africa */
+	{"603", "603"}, /* GS1 Ghana */
+	{"608", "608"}, /* GS1 Bahrain */
+	{"609", "609"}, /* GS1 Mauritius */
+	{"611", "611"}, /* GS1 Morocco */
+	{"613", "613"}, /* GS1 Algeria */
+	{"616", "616"}, /* GS1 Kenya */
+	{"618", "618"}, /* GS1 Ivory Coast */
+	{"619", "619"}, /* GS1 Tunisia */
+	{"621", "621"}, /* GS1 Syria */
+	{"622", "622"}, /* GS1 Egypt */
+	{"624", "624"}, /* GS1 Libya */
+	{"625", "625"}, /* GS1 Jordan */
+	{"626", "626"}, /* GS1 Iran */
+	{"627", "627"}, /* GS1 Kuwait */
+	{"628", "628"}, /* GS1 Saudi Arabia */
+	{"629", "629"}, /* GS1 Emirates */
+	{"640", "649"}, /* GS1 Finland */
+	{"690", "695"}, /* GS1 China */
+	{"700", "709"}, /* GS1 Norway */
+	{"729", "729"}, /* GS1 Israel */
+	{"730", "739"}, /* GS1 Sweden */
+	{"740", "740"}, /* GS1 Guatemala */
+	{"741", "741"}, /* GS1 El Salvador */
+	{"742", "742"}, /* GS1 Honduras */
+	{"743", "743"}, /* GS1 Nicaragua */
+	{"744", "744"}, /* GS1 Costa Rica */
+	{"745", "745"}, /* GS1 Panama */
+	{"746", "746"}, /* GS1 Republica Dominicana */
+	{"750", "750"}, /* GS1 Mexico */
+	{"754", "755"}, /* GS1 Canada */
+	{"759", "759"}, /* GS1 Venezuela */
+	{"760", "769"}, /* GS1 Schweiz, Suisse, Svizzera */
+	{"770", "770"}, /* GS1 Colombia */
+	{"773", "773"}, /* GS1 Uruguay */
+	{"775", "775"}, /* GS1 Peru */
+	{"777", "777"}, /* GS1 Bolivia */
+	{"779", "779"}, /* GS1 Argentina */
+	{"780", "780"}, /* GS1 Chile */
+	{"784", "784"}, /* GS1 Paraguay */
+	{"786", "786"}, /* GS1 Ecuador */
+	{"789", "790"}, /* GS1 Brasil */
+	{"800", "839"}, /* GS1 Italy */
+	{"840", "849"}, /* GS1 Spain */
+	{"850", "850"}, /* GS1 Cuba */
+	{"858", "858"}, /* GS1 Slovakia */
+	{"859", "859"}, /* GS1 Czech */
+	{"860", "860"}, /* GS1 YU (Serbia & Montenegro) */
+	{"865", "865"}, /* GS1 Mongolia */
+	{"867", "867"}, /* GS1 North Korea */
+	{"869", "869"}, /* GS1 Turkey */
+	{"870", "879"}, /* GS1 Netherlands */
+	{"880", "880"}, /* GS1 South Korea */
+	{"884", "884"}, /* GS1 Cambodia */
+	{"885", "885"}, /* GS1 Thailand */
+	{"888", "888"}, /* GS1 Singapore */
+	{"890", "890"}, /* GS1 India */
+	{"893", "893"}, /* GS1 Vietnam */
+	{"899", "899"}, /* GS1 Indonesia */
+	{"900", "919"}, /* GS1 Austria */
+	{"930", "939"}, /* GS1 Australia */
+	{"940", "949"}, /* GS1 New Zealand */
+	{"950", "950"}, /* GS1 Head Office */
+	{"955", "955"}, /* GS1 Malaysia */
+	{"958", "958"}, /* GS1 Macau */
+	{"977", "977"}, /* Serial publications (ISSN) */
+	{"978", "978"}, /* Bookland (ISBN) */
+	{"979", "979"},	/* International Standard Music Number (ISMN) and ISBN contingent */
+	{"980", "980"}, /* Refund receipts */
+	{"981", "982"}, /* Common Currency Coupons */
+	{"990", "999"}, /* Coupons */
+	{NULL, NULL}
+};
--- a/contrib/isn/ISBN.h
+++ b/contrib/isn/ISBN.h
--- a/contrib/isn/ISMN.h
+++ b/contrib/isn/ISMN.h
+/* 
+ * ISMN.h
+ *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
+ *
+ * Information recompiled by Kronuz on November 12, 2004
+ * http://www.ismn-international.org
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/isn/ISMN.h,v 1.1 2006/09/09 04:07:52 tgl Exp $
+ *
+ * M-3452-4680-5 <=> (0)-3452-4680-5 <=> 0345246805 <=> 9790345246805 <=> 979-0-3452-4680-5
+ *
+ *             (M counts as 3)
+ * ISMN         M   3   4    5   2   4   6    8   0
+ * Weight       3   1   3    1   3   1   3    1   3
+ * Product      9 + 3 + 12 + 5 + 6 + 4 + 18 + 8 + 0 = 65
+ *              65 / 10 = 6 remainder 5
+ * Check digit  10 - 5 = 5 
+ * => M-3452-4680-5
+ *
+ * ISMN         9   7    9   0   3   4    5   2   4   6    8   0
+ * Weight       1   3    1   3   1   3    1   3   1   3    1   3
+ * Product      9 + 21 + 9 + 0 + 3 + 12 + 5 + 6 + 4 + 18 + 8 + 0 = 95
+ *              95 / 10 = 9 remainder 5
+ * Check digit  10 - 5 = 5 
+ * => 979-0-3452-4680-5
+ *
+ * Since mod10(9*1 + 7*3 + 9*1 + 0*3) = mod10(M*3) = mod10(3*3) = 9; the check digit remains the same.
+ *
+ */
+
+/* where the digit set begins, and how many of them are in the table */
+const unsigned ISMN_index[10][2] = {
+	{0,		5},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+	{5,		0},
+};
+const char *ISMN_range[][2] = {
+	{"0-000", "0-099"},
+	{"0-1000", "0-3999"},
+	{"0-40000", "0-69999"},
+	{"0-700000", "0-899999"},
+	{"0-9000000", "0-9999999"},
+	{NULL, NULL}
+};
--- a/contrib/isn/ISSN.h
+++ b/contrib/isn/ISSN.h
+/* 
+ * ISSN.h
+ *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
+ *
+ * Information recompiled by Kronuz on November 12, 2004
+ * http://www.issn.org/
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/isn/ISSN.h,v 1.1 2006/09/09 04:07:52 tgl Exp $
+ *
+ * 1144-875X <=> 1144875(X) <=> 1144875 <=> (977)1144875 <=> 9771144875(00) <=> 977114487500(7) <=> 977-1144-875-00-7
+ *
+ * 
+ * ISSN         1   1   4    4    8    7    5
+ * Weight       8   7   6    5    4    3    2 
+ * Product      8 + 7 + 24 + 20 + 32 + 21 + 10 = 122
+ *              122 / 11 = 11 remainder 1
+ * Check digit  11 - 1 = 10 = X
+ * => 1144-875X
+ * 
+ * ISSN         9   7    7   1   1   4    4   8    7   5    0   0
+ * Weight       1   3    1   3   1   3    1   3    1   3    1   3
+ * Product      9 + 21 + 7 + 3 + 1 + 12 + 4 + 24 + 7 + 15 + 0 + 0 = 103
+ *              103 / 10 = 10 remainder 3
+ * Check digit  10 - 3 = 7
+ * => 977-1144875-00-7 ??  <- suplemental number (number of the week, month, etc.)
+ *                ^^ 00 for non-daily publications (01=Monday, 02=Tuesday, ...)
+ *
+ * The hyphenation is always in after the four digits of the ISSN code.
+ *
+ */
+
+/* where the digit set begins, and how many of them are in the table */
+const unsigned ISSN_index[10][2] = {
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+	{0,		1},
+};
+const char *ISSN_range[][2] = {
+	{"0000-000", "9999-999"},
+	{NULL, NULL}
+};
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
-# $PostgreSQL: pgsql/contrib/isbn_issn/Makefile,v 1.15 2006/02/27 12:54:39 petere Exp $
+# $PostgreSQL: pgsql/contrib/isn/Makefile,v 1.1 2006/09/09 04:07:52 tgl Exp $

-MODULES = isbn_issn
-DATA_built = isbn_issn.sql
-DATA = uninstall_isbn_issn.sql
-DOCS = README.isbn_issn
+MODULES = isn
+DATA_built = isn.sql
+DATA = uninstall_isn.sql
+DOCS = README.isn

 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PGXS = $(shell pg_config --pgxs)
 include $(PGXS)
 else
-subdir = contrib/isbn_issn
+subdir = contrib/isn
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk

--- a/contrib/isn/README.isn
+++ b/contrib/isn/README.isn
+
+EAN13 - UPC - ISBN (books) - ISMN (music) - ISSN (serials)
+----------------------------------------------------------
+
+Copyright Germán Méndez Bravo (Kronuz), 2004 - 2006
+This module is released under the same BSD license as the rest of PostgreSQL.
+
+The information to implement this module was collected through
+several sites, including:
+   http://www.isbn-international.org/
+   http://www.issn.org/
+   http://www.ismn-international.org/
+   http://www.wikipedia.org/
+the prefixes used for hyphenation where also compiled from:
+   http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html
+   http://www.isbn-international.org/en/identifiers.html
+   http://www.ismn-international.org/ranges.html
+Care was taken during the creation of the algorithms and they
+were meticulously verified against the suggested algorithms
+in the official ISBN, ISMN, ISSN User Manuals.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+THIS MODULE IS PROVIDED "AS IS" AND WITHOUT ANY WARRANTY
+        OF ANY KIND, EXPRESS OR IMPLIED.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Content of the Module
+-------------------------------------------------
+
+This directory contains definitions for a few PostgreSQL
+data types, for the following international-standard namespaces:
+EAN13, UPC, ISBN (books), ISMN (music), and ISSN (serials). This module
+is inspired by Garrett A. Wollman's isbn_issn code.
+
+I wanted the database to fully validate numbers and also to use the
+upcoming ISBN-13 and the EAN13 standards, as well as to have it 
+automatically doing hyphenations for ISBN numbers.
+
+This new module validates, and automatically adds the correct 
+hyphenations to the numbers. Also, it supports the new ISBN-13 
+numbers to be used starting in January 2007.
+
+Premises:
+1. ISBN13, ISMN13, ISSN13 numbers are all EAN13 numbers
+2. EAN13 numbers aren't always ISBN13, ISMN13 or ISSN13 (some are)
+3. some ISBN13 numbers can be displayed as ISBN
+4. some ISMN13 numbers can be displayed as ISMN
+5. some ISSN13 numbers can be displayed as ISSN
+6. all UPC, ISBN, ISMN and ISSN can be represented as EAN13 numbers
+
+Note: All types are internally represented as 64 bit integers, 
+      and internally all are consistently interchangeable.
+
+We have the following data types:
+
+ EAN13 for European Article Numbers.
+    This type will always show the EAN13-display format.
+    Te output function for this is -> ean13_out()
+
+ ISBN13 for International Standard Book Numbers to be displayed in 
+  the new EAN13-display format.
+ ISMN13 for International Standard Music Numbers to be displayed in
+  the new EAN13-display format.
+ ISSN13 for International Standard Serial Numbers to be displayed
+  in the new EAN13-display format.
+    These types will always display the long version of the ISxN (EAN13)
+    The output function to do this is -> ean13_out()
+    * The need for these types is just for displaying in different
+      ways the same data:
+      ISBN13 is actually the same as ISBN, ISMN13=ISMN and ISSN13=ISSN.
+  
+ ISBN for International Standard Book Numbers to be displayed in
+  the current short-display format.
+ ISMN for International Standard Music Numbers to be displayed in
+  the current short-display format.
+ ISSN for International Standard Serial Numbers to be displayed
+  in the current short-display format.
+    These types will display the short version of the ISxN (ISxN 10)
+    whenever it's possible, and it will show ISxN 13 when it's
+    impossible to show the short version.
+    The output function to do this is -> isn_out()
+
+ UPC for Universal Product Codes.
+    UPC numbers are a subset of the EAN13 numbers (they are basically
+    EAN13 without the first '0' digit.)
+    The output function to do this is also -> isn_out()
+
+We have the following input functions:
+ To take a string and return an EAN13 -> ean13_in()
+ To take a string and return valid ISBN or ISBN13 numbers -> isbn_in()
+ To take a string and return valid ISMN or ISMN13 numbers -> ismn_in()
+ To take a string and return valid ISSN or ISSN13 numbers -> issn_in()
+ To take a string and return an UPC codes -> upc_in()
+
+We are able to cast from:
+ ISBN13 -> EAN13
+ ISMN13 -> EAN13
+ ISSN13 -> EAN13
+
+ ISBN -> EAN13
+ ISMN -> EAN13
+ ISSN -> EAN13
+ UPC  -> EAN13
+
+ ISBN <-> ISBN13
+ ISMN <-> ISMN13
+ ISSN <-> ISSN13
+
+We have two operator classes (for btree and for hash) so each data type
+can be indexed for faster access.
+
+The C API is implemented as:
+extern Datum isn_out(PG_FUNCTION_ARGS);
+extern Datum ean13_out(PG_FUNCTION_ARGS);
+extern Datum ean13_in(PG_FUNCTION_ARGS);
+extern Datum isbn_in(PG_FUNCTION_ARGS);
+extern Datum ismn_in(PG_FUNCTION_ARGS);
+extern Datum issn_in(PG_FUNCTION_ARGS);
+extern Datum upc_in(PG_FUNCTION_ARGS);
+
+On success:
+ isn_out() takes any of our types and returns a string containing 
+  the shortes possible representation of the number.
+
+ ean13_out() takes any of our types and returns the 
+  EAN13 (long) representation of the number.
+
+ ean13_in() takes a string and return a EAN13. Which, as stated in (2) 
+  could or could not be any of our types, but it certainly is an EAN13 
+  number. Only if the string is a valid EAN13 number, otherwise it fails.
+
+ isbn_in() takes a string and return an ISBN/ISBN13. Only if the string
+  is really a ISBN/ISBN13, otherwise it fails.
+
+ ismn_in() takes a string and return an ISMN/ISMN13. Only if the string
+  is really a ISMN/ISMN13, otherwise it fails.
+
+ issn_in() takes a string and return an ISSN/ISSN13. Only if the string
+  is really a ISSN/ISSN13, otherwise it fails.
+
+ upc_in() takes a string and return an UPC. Only if the string is
+  really a UPC, otherwise it fails.
+
+(on failure, the functions 'ereport' the error)
+
+Testing/Playing Functions
+-------------------------------------------------
+isn_weak(boolean) - Sets the weak input mode. 
+This function is intended for testing use only!
+isn_weak() gets the current status of the weak mode.
+
+"Weak" mode is used to be able to insert "invalid" data to a table. 
+"Invalid" as in the check digit being wrong, not missing numbers.
+
+Why would you want to use the weak mode? well, it could be that
+you have a huge collection of ISBN numbers, and that there are so many of
+them that for weird reasons some have the wrong check digit (perhaps the
+numbers where scanned from a printed list and the OCR got the numbers wrong,
+perhaps the numbers were manually captured... who knows.) Anyway, the thing
+is you might want to clean the mess up, but you still want to be able to have
+all the numbers in your database and maybe use an external tool to access
+the invalid numbers in the database so you can verify the information and
+validate it more easily; as selecting all the invalid numbers in the table.
+
+When you insert invalid numbers in a table using the weak mode, the number
+will be inserted with the corrected check digit, but it will be flagged 
+with an exclamation mark ('!') at the end (i.e. 0-11-000322-5!)
+
+You can also force the insertion of invalid numbers even not in the weak mode,
+appending the '!' character at the end of the number.
+
+To work with invalid numbers, you can use two functions:
+  + make_valid(), which validates an invalid number (deleting the invalid flag)
+  + is_valid(), which checks for the invalid flag presence.
+
+Examples of Use
+-------------------------------------------------
+--Using the types directly:
+	select isbn('978-0-393-04002-9');
+	select isbn13('0901690546');
+	select issn('1436-4522');
+
+--Casting types:
+-- note that you can't cast from ean13 to other type, thus the following
+-- will NOT work: select upc(ean13('0220356483481'));
+	select ean13(upc('220356483481'));
+
+--Create a table with a single column to hold ISBN numbers:
+	create table test ( id isbn );
+	insert into test values('9780393040029');
+
+--Automatically calculating check digits (observe the '?'):
+	insert into test values('220500896?');
+	insert into test values('978055215372?');
+
+	select issn('3251231?');
+  select ismn('979047213542?');	
+
+--Using the weak mode:
+  select isn_weak(true);
+  insert into test values('978-0-11-000533-4');
+  insert into test values('9780141219307');
+  insert into test values('2-205-00876-X');
+  select isn_weak(false);
+  
+  select id from test where not is_valid(id);
+  update test set id=make_valid(id) where id = '2-205-00876-X!';
+  
+  select * from test;
+
+  select isbn13(id) from test;
+
+Contact
+-------------------------------------------------
+Please suggestions or bug reports to kronuz at users.sourceforge.net
+
+Last reviewed on August 23, 2006 by Kronuz.
--- a/contrib/isn/UPC.h
+++ b/contrib/isn/UPC.h
+/* 
+ * ISSN.h
+ *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
+ *
+ * No information available for UPC prefixes
+ * 
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/isn/UPC.h,v 1.1 2006/09/09 04:07:52 tgl Exp $
+ *
+ */
+
+/* where the digit set begins, and how many of them are in the table */
+const unsigned UPC_index[10][2] = {
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+	{0,		0},
+};
+const char *UPC_range[][2] = {
+	{NULL, NULL}
+};
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
--- a/contrib/isn/isn.h
+++ b/contrib/isn/isn.h
+/*-------------------------------------------------------------------------
+ *
+ * isn.h
+ *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
+ *
+ * Copyright (c) 2004-2006, Germn Mndez Bravo (Kronuz)
+ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/isn/isn.h,v 1.1 2006/09/09 04:07:52 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef ISN_H
+#define ISN_H
+
+#include "fmgr.h"
+
+#undef ISN_DEBUG
+#define ISN_WEAK_MODE
+
+/*
+ *	uint64 is the internal storage format for ISNs.
+ */
+typedef uint64 ean13;
+
+#define EAN13_FORMAT UINT64_FORMAT
+
+#define PG_GETARG_EAN13(n) PG_GETARG_INT64(n)
+#define PG_RETURN_EAN13(x) PG_RETURN_INT64(x)
+
+extern Datum isn_out(PG_FUNCTION_ARGS);
+extern Datum ean13_out(PG_FUNCTION_ARGS);
+extern Datum ean13_in(PG_FUNCTION_ARGS);
+extern Datum isbn_in(PG_FUNCTION_ARGS);
+extern Datum ismn_in(PG_FUNCTION_ARGS);
+extern Datum issn_in(PG_FUNCTION_ARGS);
+extern Datum upc_in(PG_FUNCTION_ARGS);
+
+extern Datum ean13_cast_to_text(PG_FUNCTION_ARGS);
+extern Datum isn_cast_to_text(PG_FUNCTION_ARGS);
+extern Datum ean13_cast_from_text(PG_FUNCTION_ARGS);
+extern Datum isbn_cast_from_text(PG_FUNCTION_ARGS);
+extern Datum ismn_cast_from_text(PG_FUNCTION_ARGS);
+extern Datum issn_cast_from_text(PG_FUNCTION_ARGS);
+extern Datum upc_cast_from_text(PG_FUNCTION_ARGS);
+
+extern Datum is_valid(PG_FUNCTION_ARGS);
+extern Datum make_valid(PG_FUNCTION_ARGS);
+
+extern Datum accept_weak_input(PG_FUNCTION_ARGS);
+extern Datum weak_input_status(PG_FUNCTION_ARGS);
+
+extern void initialize(void);
+
+#endif   /* ISN_H */
--- a/contrib/isn/isn.sql.in
+++ b/contrib/isn/isn.sql.in
--- a/contrib/isn/uninstall_isn.sql
+++ b/contrib/isn/uninstall_isn.sql
+--
+--	Drop the actual types (in cascade):
+--
+---------------------------------------------------
+SET search_path = public;
+
+DROP TYPE ean13 CASCADE;
+DROP TYPE isbn13 CASCADE;
+DROP TYPE ismn13 CASCADE;
+DROP TYPE issn13 CASCADE;
+DROP TYPE isbn CASCADE;
+DROP TYPE ismn CASCADE;
+DROP TYPE issn CASCADE;
+DROP TYPE upc CASCADE;
+
+DROP FUNCTION isn_weak();
+DROP FUNCTION isn_weak(boolean);
+