From f207155bbf9722086c68ab152ebd1d72fa4089c8 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 2 Dec 2015 16:08:34 -0500 Subject: [PATCH] fix some typos, syntax errors, and stray invisible characters Signed-off-by: Galen Charlton Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/040.schema.asset.sql | 22 +++++++++++----------- .../src/sql/Pg/upgrade/XXXX.schema.copy_alerts.sql | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql index 2d8377e4d9..0bf70a5ead 100644 --- a/Open-ILS/src/sql/Pg/040.schema.asset.sql +++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql @@ -987,27 +987,27 @@ CREATE INDEX asset_copy_tag_copy_map_copy_idx CREATE INDEX asset_copy_tag_copy_map_tag_idx ON asset.copy_tag_copy_map (tag); -CREATE OR REPLACE FUNCTION asset.copy_state  (cid BIGINT) RETURNS TEXT AS $$ +CREATE OR REPLACE FUNCTION asset.copy_state (cid BIGINT) RETURNS TEXT AS $$ DECLARE last_circ_stop TEXT; the_copy asset.copy%ROWTYPE; BEGIN SELECT * INTO the_copy FROM asset.copy WHERE id = cid; - RETURN NULL WHEN NOT FOUND; + IF NOT FOUND THEN RETURN NULL; END IF; IF the_copy.status = 3 THEN -- Lost RETURN 'LOST'; - ELIF the_copy.status = 4 THEN -- Missing + ELSIF the_copy.status = 4 THEN -- Missing RETURN 'MISSING'; - ELIF the_copy.status = 14 THEN -- Damaged + ELSIF the_copy.status = 14 THEN -- Damaged RETURN 'DAMAGED'; - END; + END IF; - SELECT stop_fines INTO last_circ_stop -  FROM action.circulation -  WHERE target_copy = cid -  ORDER BY xact_start DESC LIMIT 1; + SELECT stop_fines INTO last_circ_stop + FROM action.circulation + WHERE target_copy = cid + ORDER BY xact_start DESC LIMIT 1; IF FOUND THEN IF last_circ_stop IN ( @@ -1016,8 +1016,8 @@ BEGIN 'LONGOVERDUE' ) THEN RETURN last_circ_stop; - END; - END; + END IF; + END IF; RETURN 'NORMAL'; END; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_alerts.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_alerts.sql index bb67c0c54d..054e365480 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_alerts.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_alerts.sql @@ -1,26 +1,26 @@ BEGIN; -CREATE OR REPLACE FUNCTION asset.copy_state  (cid BIGINT) RETURNS TEXT AS $$ +CREATE OR REPLACE FUNCTION asset.copy_state (cid BIGINT) RETURNS TEXT AS $$ DECLARE last_circ_stop TEXT; the_copy asset.copy%ROWTYPE; BEGIN SELECT * INTO the_copy FROM asset.copy WHERE id = cid; - RETURN NULL WHEN NOT FOUND; + IF NOT FOUND THEN RETURN NULL; END IF; IF the_copy.status = 3 THEN -- Lost RETURN 'LOST'; - ELIF the_copy.status = 4 THEN -- Missing + ELSIF the_copy.status = 4 THEN -- Missing RETURN 'MISSING'; - ELIF the_copy.status = 14 THEN -- Damaged + ELSIF the_copy.status = 14 THEN -- Damaged RETURN 'DAMAGED'; - END; + END IF; - SELECT stop_fines INTO last_circ_stop -  FROM action.circulation -  WHERE target_copy = cid -  ORDER BY xact_start DESC LIMIT 1; + SELECT stop_fines INTO last_circ_stop + FROM action.circulation + WHERE target_copy = cid + ORDER BY xact_start DESC LIMIT 1; IF FOUND THEN IF last_circ_stop IN ( @@ -29,8 +29,8 @@ BEGIN 'LONGOVERDUE' ) THEN RETURN last_circ_stop; - END; - END; + END IF; + END IF; RETURN 'NORMAL'; END; -- 2.11.0