From 883b42635f589a05b87c3bdb489078f78833754d Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Sat, 4 Jul 2026 18:31:56 +0000 Subject: [PATCH] Change sdb_gps to sdb_utm --- db/schemas/lib/triggers/create/events.m4 | 2 +- db/schemas/lib/triggers/create/roles.m4 | 4 ++-- db/schemas/sokwedb/indexes/create/events.m4 | 4 ++-- db/schemas/sokwedb/indexes/drop/events.m4 | 2 +- db/schemas/sokwedb/tables/create/events.m4 | 6 +++--- doc/src/tables/events.m4 | 4 ++-- include/global_constants.m4 | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db/schemas/lib/triggers/create/events.m4 b/db/schemas/lib/triggers/create/events.m4 index b19e763..548d4bc 100644 --- a/db/schemas/lib/triggers/create/events.m4 +++ b/db/schemas/lib/triggers/create/events.m4 @@ -137,7 +137,7 @@ CREATE OR REPLACE FUNCTION events_func () END IF; END IF; - IF NEW.behavior = 'sdb_gps' + IF NEW.behavior = 'sdb_utm' OR NEW.behavior = 'sdb_map' OR NEW.behavior = 'sdb_pg_event' OR NEW.behavior = 'sdb_brec_note' THEN diff --git a/db/schemas/lib/triggers/create/roles.m4 b/db/schemas/lib/triggers/create/roles.m4 index c43225f..e1a1048 100644 --- a/db/schemas/lib/triggers/create/roles.m4 +++ b/db/schemas/lib/triggers/create/roles.m4 @@ -226,7 +226,7 @@ CREATE OR REPLACE FUNCTION roles_func () AND (a_behavior = 'sdb_arrival' OR a_behavior = 'sdb_arrival_a' OR a_behavior = 'sdb_food' - OR a_behavior = 'sdb_gps' + OR a_behavior = 'sdb_utm' OR a_behavior = 'sdb_map') THEN DECLARE a_pid roles.pid%TYPE; @@ -436,7 +436,7 @@ CREATE OR REPLACE FUNCTION roles_func () -- IF TG_OP = 'INSERT' AND (a_behavior = 'sdb_food' - OR a_behavior = 'sdb_gps' + OR a_behavior = 'sdb_utm' OR a_behavior = 'sdb_map') THEN DECLARE a_animid watches.animid%TYPE; diff --git a/db/schemas/sokwedb/indexes/create/events.m4 b/db/schemas/sokwedb/indexes/create/events.m4 index 7ee8300..5fe1232 100644 --- a/db/schemas/sokwedb/indexes/create/events.m4 +++ b/db/schemas/sokwedb/indexes/create/events.m4 @@ -22,10 +22,10 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl CREATE UNIQUE INDEX IF NOT EXISTS - "On EVENTS where (Behavior)=(sdb_gps), WID + Start must be unique" + "On EVENTS where (Behavior)=(sdb_utm), WID + Start must be unique" ON events (wid, start) - WHERE behavior = 'sdb_gps'; + WHERE behavior = 'sdb_utm'; CREATE UNIQUE INDEX IF NOT EXISTS "On EVENTS where (Behavior)=(sdb_map), WID + Start must be unique" diff --git a/db/schemas/sokwedb/indexes/drop/events.m4 b/db/schemas/sokwedb/indexes/drop/events.m4 index 3fd9cff..39422cf 100644 --- a/db/schemas/sokwedb/indexes/drop/events.m4 +++ b/db/schemas/sokwedb/indexes/drop/events.m4 @@ -22,7 +22,7 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl DROP INDEX IF EXISTS - "On EVENTS where (Behavior)=(sdb_gps), WID + Start must be unique"; + "On EVENTS where (Behavior)=(sdb_utm), WID + Start must be unique"; DROP INDEX IF EXISTS "On EVENTS where (Behavior)=(sdb_map), WID + Start must be unique"; diff --git a/db/schemas/sokwedb/tables/create/events.m4 b/db/schemas/sokwedb/tables/create/events.m4 index 53d9bd5..0f48690 100644 --- a/db/schemas/sokwedb/tables/create/events.m4 +++ b/db/schemas/sokwedb/tables/create/events.m4 @@ -69,7 +69,7 @@ CREATE TABLE events ( , 'sdb_arrival_a' , 'sdb_brec_note' , 'sdb_food' - , 'sdb_gps' + , 'sdb_utm' , 'sdb_grooming' , 'sdb_groom_scan' , 'sdb_groom_scan_a' @@ -97,7 +97,7 @@ CREATE TABLE events ( _point_behavior_time(`sdb_groom_scan') _point_behavior_time(`sdb_groom_scan_a') _point_behavior_time(`sdb_pg_event') - _point_behavior_time(`sdb_gps') + _point_behavior_time(`sdb_utm') _point_behavior_time(`sdb_map') _point_behavior_time(`sdb_brec_note') _point_behavior_time(`sdb_mating_event') @@ -107,7 +107,7 @@ CREATE TABLE events ( _behavior_certain(`sdb_groom_scan_a') _behavior_certain(`sdb_other_species') _behavior_certain(`sdb_pg_event') - _behavior_certain(`sdb_gps') + _behavior_certain(`sdb_utm') _behavior_certain(`sdb_map') _behavior_certain(`sdb_brec_note') _behavior_certain(`sdb_colobus') diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index df0975e..38afbf4 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -336,7 +336,7 @@ The following table lists these rules and implications: .. _EVENTS_gps_code: -``sdb_gps`` (GPS Location) +``sdb_utm`` (UTM Location) A record of an individual's location recorded in UTM coordinates. @@ -740,7 +740,7 @@ The following list summarizes the available codes: ``sdb_brec_note`` (B-RECord note) A row must exist on |BRECORD_NOTES|. -``sdb_gps`` (GPS Location) +``sdb_utm`` (UTM Location) A row must exist on |LOCATIONS_GPS|. ``sdb_food`` (Food) diff --git a/include/global_constants.m4 b/include/global_constants.m4 index 9f6f642..99d8aa1 100644 --- a/include/global_constants.m4 +++ b/include/global_constants.m4 @@ -128,7 +128,7 @@ define(`sdb_colobus', `COL') dnl The food/eating event define(`sdb_food', `FOOD') dnl The recording of a GPS location -define(`sdb_gps', `GPS') +define(`sdb_utm', `UTM') dnl Grooming interval sampling define(`sdb_groom_scan', `GSCAN') dnl The grooming event -- 2.34.1