Changeset 3859

Timestamp:

07/05/08 13:00:10 (11 years ago)

Author:

cbyrom

Message:

Improve exception logging + correct return type for ingest stored procs.

File:

• TI01-discovery/branches/ingestAutomation-upgrade/database/ingest_procedures.sql (modified) (1 diff)

TI01-discovery/branches/ingestAutomation-upgrade/database/ingest_procedures.sql

@@ -42 +42 @@
 
 DROP FUNCTION update_document(original_document_id_in int, filename_in varchar(255), 
-        discovery_id_in varchar(255), doc_type_in text, original_document_in text, scn_int int) CASCADE;
+        discovery_id_in varchar(255), doc_type_in text, original_document_in text, scn_in int) CASCADE;
 CREATE FUNCTION update_document(original_document_id_in int, filename_in varchar(255), 
-        discovery_id_in varchar(255), doc_type_in text, original_document_in text, scn_int int) 
-        RETURNS integer AS 
+        discovery_id_in varchar(255), doc_type_in text, original_document_in text, scn_in int) 
+        RETURNS VOID AS 
 $$
         DECLARE
-                scn_current integer := 1;
+                scn_current integer;
     BEGIN
         -- This updates an existing document
-        
+
                 -- check the scn is valid before an update is done
                 SELECT scn INTO scn_current FROM ORIGINAL_DOCUMENT WHERE 
                         original_document_id = original_document_id_in;
                 IF scn_in <> scn_current THEN
-                        RAISE EXCEPTION 'Invalid SCN specified (current scn=%, specified scn=%) - implies record has been changed during update - exiting...';
+                        RAISE EXCEPTION 'Invalid SCN specified (current scn=%, specified scn=%) - 
+                                implies record has been changed during update - exiting...', scn_current, scn_in;
                 END IF;