From 451bfbeefa3268e07a34821d6dea8caddff26cd5 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Sat, 4 Jul 2026 18:38:10 +0000 Subject: [PATCH] Change sdb_map to sdb_paper --- 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 | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db/schemas/lib/triggers/create/events.m4 b/db/schemas/lib/triggers/create/events.m4 index 548d4bc..7f1552b 100644 --- a/db/schemas/lib/triggers/create/events.m4 +++ b/db/schemas/lib/triggers/create/events.m4 @@ -138,7 +138,7 @@ CREATE OR REPLACE FUNCTION events_func () END IF; IF NEW.behavior = 'sdb_utm' - OR NEW.behavior = 'sdb_map' + OR NEW.behavior = 'sdb_paper' OR NEW.behavior = 'sdb_pg_event' OR NEW.behavior = 'sdb_brec_note' THEN -- The WATCHES row must be for a follow, if there is one, and if not diff --git a/db/schemas/lib/triggers/create/roles.m4 b/db/schemas/lib/triggers/create/roles.m4 index e1a1048..51672e8 100644 --- a/db/schemas/lib/triggers/create/roles.m4 +++ b/db/schemas/lib/triggers/create/roles.m4 @@ -227,7 +227,7 @@ CREATE OR REPLACE FUNCTION roles_func () OR a_behavior = 'sdb_arrival_a' OR a_behavior = 'sdb_food' OR a_behavior = 'sdb_utm' - OR a_behavior = 'sdb_map') THEN + OR a_behavior = 'sdb_paper') THEN DECLARE a_pid roles.pid%TYPE; a_role roles.role%TYPE; @@ -437,7 +437,7 @@ CREATE OR REPLACE FUNCTION roles_func () IF TG_OP = 'INSERT' AND (a_behavior = 'sdb_food' OR a_behavior = 'sdb_utm' - OR a_behavior = 'sdb_map') THEN + OR a_behavior = 'sdb_paper') THEN DECLARE a_animid watches.animid%TYPE; a_date watches.date%TYPE; diff --git a/db/schemas/sokwedb/indexes/create/events.m4 b/db/schemas/sokwedb/indexes/create/events.m4 index 5fe1232..61367f5 100644 --- a/db/schemas/sokwedb/indexes/create/events.m4 +++ b/db/schemas/sokwedb/indexes/create/events.m4 @@ -28,10 +28,10 @@ CREATE UNIQUE INDEX IF NOT EXISTS WHERE behavior = 'sdb_utm'; CREATE UNIQUE INDEX IF NOT EXISTS - "On EVENTS where (Behavior)=(sdb_map), WID + Start must be unique" + "On EVENTS where (Behavior)=(sdb_paper), WID + Start must be unique" ON events (wid, start) - WHERE behavior = 'sdb_map'; + WHERE behavior = 'sdb_paper'; CREATE INDEX IF NOT EXISTS events_wid ON events (wid); diff --git a/db/schemas/sokwedb/indexes/drop/events.m4 b/db/schemas/sokwedb/indexes/drop/events.m4 index 39422cf..2a03203 100644 --- a/db/schemas/sokwedb/indexes/drop/events.m4 +++ b/db/schemas/sokwedb/indexes/drop/events.m4 @@ -24,7 +24,7 @@ include(`indexmacros.m4')dnl DROP INDEX IF EXISTS "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"; + "On EVENTS where (Behavior)=(sdb_paper), WID + Start must be unique"; DROP INDEX IF EXISTS events_wid; diff --git a/db/schemas/sokwedb/tables/create/events.m4 b/db/schemas/sokwedb/tables/create/events.m4 index 0f48690..54420bb 100644 --- a/db/schemas/sokwedb/tables/create/events.m4 +++ b/db/schemas/sokwedb/tables/create/events.m4 @@ -73,7 +73,7 @@ CREATE TABLE events ( , 'sdb_grooming' , 'sdb_groom_scan' , 'sdb_groom_scan_a' - , 'sdb_map' + , 'sdb_paper' , 'sdb_mating_event' , 'sdb_other_species' , 'sdb_pg_event')) @@ -98,7 +98,7 @@ CREATE TABLE events ( _point_behavior_time(`sdb_groom_scan_a') _point_behavior_time(`sdb_pg_event') _point_behavior_time(`sdb_utm') - _point_behavior_time(`sdb_map') + _point_behavior_time(`sdb_paper') _point_behavior_time(`sdb_brec_note') _point_behavior_time(`sdb_mating_event') @@ -108,7 +108,7 @@ CREATE TABLE events ( _behavior_certain(`sdb_other_species') _behavior_certain(`sdb_pg_event') _behavior_certain(`sdb_utm') - _behavior_certain(`sdb_map') + _behavior_certain(`sdb_paper') _behavior_certain(`sdb_brec_note') _behavior_certain(`sdb_colobus') _behavior_certain(`sdb_mating_event') diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index 38afbf4..0dd9edc 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -497,7 +497,7 @@ The following table lists these rules and implications: .. _EVENTS_map_code: -``sdb_map`` (Map Location) +``sdb_paper`` (PAPER map location) A record of an individual's location recorded using map sequence numbers. @@ -755,7 +755,7 @@ The following list summarizes the available codes: ``sdb_mating_event`` (Mating) A row must exist on |MATINGS|. -``sdb_map`` (Map Location) +``sdb_paper`` (PAPER map location) A row must exist on |LOCATIONS_MAP|. ``sdb_other_species`` (Other Species) diff --git a/include/global_constants.m4 b/include/global_constants.m4 index 99d8aa1..7e24788 100644 --- a/include/global_constants.m4 +++ b/include/global_constants.m4 @@ -133,8 +133,8 @@ dnl Grooming interval sampling define(`sdb_groom_scan', `GSCAN') dnl The grooming event define(`sdb_grooming', `GROOM') -dnl The recording of a map location -define(`sdb_map', `MAP') +dnl The recording of a paper map location +define(`sdb_paper', `PAPER') dnl The mating event define(`sdb_mating_event', `MATE') dnl The other species is present event -- 2.34.1