contrib/isn updates from Jeremy Kronuz.

contrib/isn/README.isn

 
-EAN13 - UPC - ISBN (books) - ISMN (music) - ISSN (serials)
-----------------------------------------------------------
+-- 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.
@@ -24,7 +24,7 @@ THIS MODULE IS PROVIDED "AS IS" AND WITHOUT ANY WARRANTY
         OF ANY KIND, EXPRESS OR IMPLIED.
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-Content of the Module
+-- Content of the Module
 -------------------------------------------------
 
 This directory contains definitions for a few PostgreSQL
@@ -143,7 +143,7 @@ On success:
 
 (on failure, the functions 'ereport' the error)
 
-Testing/Playing Functions
+-- Testing/Playing Functions
 -------------------------------------------------
 isn_weak(boolean) - Sets the weak input mode. 
 This function is intended for testing use only!
@@ -173,7 +173,7 @@ 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
+-- Examples of Use
 -------------------------------------------------
 --Using the types directly:
 	select isbn('978-0-393-04002-9');
@@ -181,9 +181,12 @@ Examples of Use
 	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'));
+-- note that you can only cast from ean13 to other type when the casted 
+-- number would be valid in the realm of the casted type; 
+-- thus, the following will NOT work: select isbn(ean13('0220356483481')); 
+-- but these will: 
+    select upc(ean13('0220356483481')); 
+    select ean13(upc('220356483481')); 
 
 --Create a table with a single column to hold ISBN numbers:
 	create table test ( id isbn );
@@ -210,7 +213,7 @@ Examples of Use
 
   select isbn13(id) from test;
 
-Contact
+-- Contact
 -------------------------------------------------
 Please suggestions or bug reports to kronuz at users.sourceforge.net
 

contrib/isn/isn.h

@@ -7,7 +7,7 @@
  * 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 $
+ *	  $PostgreSQL: pgsql/contrib/isn/isn.h,v 1.2 2006/09/10 20:45:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,8 +27,8 @@ 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)
+#define PG_GETARG_EAN13(n) PG_GETARG_INT64((int64)n)
+#define PG_RETURN_EAN13(x) PG_RETURN_INT64((int64)x)
 
 extern Datum isn_out(PG_FUNCTION_ARGS);
 extern Datum ean13_out(PG_FUNCTION_ARGS);
@@ -45,6 +45,10 @@ 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 isbn_cast_from_ean13(PG_FUNCTION_ARGS);
+extern Datum ismn_cast_from_ean13(PG_FUNCTION_ARGS);
+extern Datum issn_cast_from_ean13(PG_FUNCTION_ARGS);
+extern Datum upc_cast_from_ean13(PG_FUNCTION_ARGS);
 
 extern Datum is_valid(PG_FUNCTION_ARGS);
 extern Datum make_valid(PG_FUNCTION_ARGS);

contrib/isn/isn.sql.in

@@ -2,7 +2,7 @@
 --	PostgreSQL code for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
 --  Copyright (c) 2004-2006, Germn Mndez Bravo (Kronuz)
 --
---	$PostgreSQL: pgsql/contrib/isn/isn.sql.in,v 1.1 2006/09/09 04:07:52 tgl Exp $
+--	$PostgreSQL: pgsql/contrib/isn/isn.sql.in,v 1.2 2006/09/10 20:45:17 tgl Exp $
 --
 -- Example:
 --   create table test ( id isbn );
@@ -2131,86 +2131,111 @@ CREATE OPERATOR CLASS upc_ops DEFAULT
 -- Type casts:
 --
 ---------------------------------------------------
+CREATE FUNCTION isbn13(ean13)
+RETURNS isbn13
+AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION ismn13(ean13)
+RETURNS ismn13
+AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION issn13(ean13)
+RETURNS issn13
+AS 'MODULE_PATHNAME', 'issn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION isbn(ean13)
+RETURNS isbn
+AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION ismn(ean13)
+RETURNS ismn
+AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION issn(ean13)
+RETURNS issn
+AS 'MODULE_PATHNAME', 'issn_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+CREATE FUNCTION upc(ean13)
+RETURNS upc
+AS 'MODULE_PATHNAME', 'upc_cast_from_ean13'
+LANGUAGE 'C' IMMUTABLE STRICT;
+
+
 CREATE FUNCTION ean13(text)
 RETURNS ean13
 AS 'MODULE_PATHNAME', 'ean13_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION isbn13(text)
 RETURNS isbn13
 AS 'MODULE_PATHNAME', 'isbn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION ismn13(text)
 RETURNS ismn13
 AS 'MODULE_PATHNAME', 'ismn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION issn13(text)
 RETURNS issn13
 AS 'MODULE_PATHNAME', 'issn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION isbn(text)
 RETURNS isbn
 AS 'MODULE_PATHNAME', 'isbn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION ismn(text)
 RETURNS ismn
 AS 'MODULE_PATHNAME', 'ismn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION issn(text)
 RETURNS issn
 AS 'MODULE_PATHNAME', 'issn_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION upc(text)
 RETURNS upc
 AS 'MODULE_PATHNAME', 'upc_cast_from_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
 
+
 CREATE FUNCTION text(ean13)
 RETURNS text
 AS 'MODULE_PATHNAME', 'ean13_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(isbn13)
 RETURNS text
 AS 'MODULE_PATHNAME', 'ean13_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(ismn13)
 RETURNS text
 AS 'MODULE_PATHNAME', 'ean13_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(issn13)
 RETURNS text
 AS 'MODULE_PATHNAME', 'ean13_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(isbn)
 RETURNS text
 AS 'MODULE_PATHNAME', 'isn_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(ismn)
 RETURNS text
 AS 'MODULE_PATHNAME', 'isn_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(issn)
 RETURNS text
 AS 'MODULE_PATHNAME', 'isn_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
-
 CREATE FUNCTION text(upc)
 RETURNS text
 AS 'MODULE_PATHNAME', 'isn_cast_to_text'
 LANGUAGE 'C' IMMUTABLE STRICT;
 
+CREATE CAST (ean13 AS isbn13) WITH FUNCTION isbn13(ean13);
+CREATE CAST (ean13 AS isbn) WITH FUNCTION isbn(ean13);
+CREATE CAST (ean13 AS ismn13) WITH FUNCTION ismn13(ean13);
+CREATE CAST (ean13 AS ismn) WITH FUNCTION ismn(ean13);
+CREATE CAST (ean13 AS issn13) WITH FUNCTION issn13(ean13);
+CREATE CAST (ean13 AS issn) WITH FUNCTION issn(ean13);
+CREATE CAST (ean13 AS upc) WITH FUNCTION upc(ean13);
+
 CREATE CAST (isbn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (isbn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (ismn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
@@ -2218,6 +2243,7 @@ CREATE CAST (ismn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (issn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (issn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (upc AS ean13) WITHOUT FUNCTION AS ASSIGNMENT;
+
 CREATE CAST (isbn AS isbn13) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (isbn13 AS isbn) WITHOUT FUNCTION AS ASSIGNMENT;
 CREATE CAST (ismn AS ismn13) WITHOUT FUNCTION AS ASSIGNMENT;