From f13e5696c1e690fc568b62d5ddecaf0e7d0266cc Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Thu, 28 May 2026 00:53:15 +0000 Subject: [PATCH] Change table name GROOM_SCANS -> GROOM_SCANS_B --- db/schemas/lib/triggers/Makefile | 2 +- .../{groom_scans.m4 => groom_scans_b.m4} | 22 +++++----- .../drop/{groom_scans.m4 => groom_scans_b.m4} | 4 +- db/schemas/sokwedb/indexes/Makefile | 2 +- .../{groom_scans.m4 => groom_scans_b.m4} | 4 +- .../drop/{groom_scans.m4 => groom_scans_b.m4} | 2 +- db/schemas/sokwedb/tables/Makefile | 2 +- .../{groom_scans.m4 => groom_scans_b.m4} | 6 +-- doc/diagrams/events.svg | 2 +- doc/src/epilog.inc.m4 | 22 +++++----- doc/src/tables.m4 | 2 +- doc/src/tables/events.m4 | 8 ++-- .../{groom_scans.m4 => groom_scans_b.m4} | 42 +++++++++---------- 13 files changed, 60 insertions(+), 60 deletions(-) rename db/schemas/lib/triggers/create/{groom_scans.m4 => groom_scans_b.m4} (89%) rename db/schemas/lib/triggers/drop/{groom_scans.m4 => groom_scans_b.m4} (90%) rename db/schemas/sokwedb/indexes/create/{groom_scans.m4 => groom_scans_b.m4} (91%) rename db/schemas/sokwedb/indexes/drop/{groom_scans.m4 => groom_scans_b.m4} (93%) rename db/schemas/sokwedb/tables/create/{groom_scans.m4 => groom_scans_b.m4} (91%) rename doc/src/tables/{groom_scans.m4 => groom_scans_b.m4} (81%) diff --git a/db/schemas/lib/triggers/Makefile b/db/schemas/lib/triggers/Makefile index 9265fe2..60476bf 100644 --- a/db/schemas/lib/triggers/Makefile +++ b/db/schemas/lib/triggers/Makefile @@ -37,7 +37,7 @@ ORDER := comm_ids \ sightings \ food_events \ groomings \ - groom_scans \ + groom_scans_b \ attendance DROP_EXISTING := true diff --git a/db/schemas/lib/triggers/create/groom_scans.m4 b/db/schemas/lib/triggers/create/groom_scans_b.m4 similarity index 89% rename from db/schemas/lib/triggers/create/groom_scans.m4 rename to db/schemas/lib/triggers/create/groom_scans_b.m4 index 369a8f3..6c82493 100644 --- a/db/schemas/lib/triggers/create/groom_scans.m4 +++ b/db/schemas/lib/triggers/create/groom_scans_b.m4 @@ -13,7 +13,7 @@ dnl dnl You should have received a copy of the GNU Affero General Public License dnl along with this program. If not, see . dnl -dnl Triggers for the groom_scans table +dnl Triggers for the groom_scans_b table dnl dnl Karl O. Pinc @@ -23,20 +23,20 @@ include(`constants.m4')dnl include(`macros.m4')dnl -RAISE INFO 'groom_scans_func'; -CREATE OR REPLACE FUNCTION groom_scans_func () +RAISE INFO 'groom_scans_b_func'; +CREATE OR REPLACE FUNCTION groom_scans_b_func () RETURNS trigger LANGUAGE plpgsql sdb_function_set_search_path AS $$ BEGIN - -- Function for groom_scans insert and update triggers + -- Function for groom_scans_b insert and update triggers -- -- AGPL_notice(` --', `2026', `The Meme Factory, Inc., www.karlpinc.com') IF TG_OP = 'UPDATE' THEN - cannot_change(`GROOM_SCANS', `GrID') + cannot_change(`GROOM_SCANS_B', `GrID') END IF; -- The EVENTS.Behavior must be sdb_groom_scan @@ -70,8 +70,8 @@ CREATE OR REPLACE FUNCTION groom_scans_func () AND events.behavior <> 'sdb_groom_scan'; IF FOUND THEN RAISE EXCEPTION integrity_constraint_violation USING - MESSAGE = 'Error on ' || TG_OP || ' of GROOM_SCANS' - , DETAIL = 'Groom_Scans can only be related to an event with an' + MESSAGE = 'Error on ' || TG_OP || ' of GROOM_SCANS_B' + , DETAIL = 'Groom_Scans_B can only be related to an event with an' || ' EVENTS.Behavior value of (sdb_groom_scan)' || ': Key (GrID = (' || NEW.grid @@ -113,8 +113,8 @@ CREATE OR REPLACE FUNCTION groom_scans_func () $$; -RAISE INFO 'groom_scans_trigger'; -CREATE TRIGGER groom_scans_trigger +RAISE INFO 'groom_scans_b_trigger'; +CREATE TRIGGER groom_scans_b_trigger AFTER INSERT OR UPDATE - ON groom_scans FOR EACH ROW - EXECUTE PROCEDURE groom_scans_func(); + ON groom_scans_b FOR EACH ROW + EXECUTE PROCEDURE groom_scans_b_func(); diff --git a/db/schemas/lib/triggers/drop/groom_scans.m4 b/db/schemas/lib/triggers/drop/groom_scans_b.m4 similarity index 90% rename from db/schemas/lib/triggers/drop/groom_scans.m4 rename to db/schemas/lib/triggers/drop/groom_scans_b.m4 index 6990cca..209b88b 100644 --- a/db/schemas/lib/triggers/drop/groom_scans.m4 +++ b/db/schemas/lib/triggers/drop/groom_scans_b.m4 @@ -13,11 +13,11 @@ dnl dnl You should have received a copy of the GNU Affero General Public License dnl along with this program. If not, see . dnl -dnl Drop triggers for groom_scans table +dnl Drop triggers for groom_scans_b table dnl dnl Karl O. Pinc dnl m4 includes include(`copyright.m4')dnl -DROP FUNCTION IF EXISTS groom_scans_func() CASCADE; +DROP FUNCTION IF EXISTS groom_scans_b_func() CASCADE; diff --git a/db/schemas/sokwedb/indexes/Makefile b/db/schemas/sokwedb/indexes/Makefile index 626b568..c78464f 100644 --- a/db/schemas/sokwedb/indexes/Makefile +++ b/db/schemas/sokwedb/indexes/Makefile @@ -22,7 +22,7 @@ ORDER := biography_data biography_log comm_membs comm_memb_log \ follows follow_observers follow_studies events roles arrivals \ swelling_sources swelling_states aggression_event_log sightings \ - aggressions food_events groomings groom_scans attendance + aggressions food_events groomings groom_scans_b attendance ## ## CAUTION: This Makefile is not designed to be run directly. It is normally diff --git a/db/schemas/sokwedb/indexes/create/groom_scans.m4 b/db/schemas/sokwedb/indexes/create/groom_scans_b.m4 similarity index 91% rename from db/schemas/sokwedb/indexes/create/groom_scans.m4 rename to db/schemas/sokwedb/indexes/create/groom_scans_b.m4 index 3e7f143..cf041df 100644 --- a/db/schemas/sokwedb/indexes/create/groom_scans.m4 +++ b/db/schemas/sokwedb/indexes/create/groom_scans_b.m4 @@ -22,8 +22,8 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl CREATE UNIQUE INDEX IF NOT EXISTS - "GROOM_SCANS has, at most, a 1-to-1 releationship with EVENTS" - ON groom_scans + "GROOM_SCANS_B has, at most, a 1-to-1 releationship with EVENTS" + ON groom_scans_b (eid); -- We won't index ExtractedBy because this is not expected to be -- frequently searched. diff --git a/db/schemas/sokwedb/indexes/drop/groom_scans.m4 b/db/schemas/sokwedb/indexes/drop/groom_scans_b.m4 similarity index 93% rename from db/schemas/sokwedb/indexes/drop/groom_scans.m4 rename to db/schemas/sokwedb/indexes/drop/groom_scans_b.m4 index 7d24017..9fe5fd2 100644 --- a/db/schemas/sokwedb/indexes/drop/groom_scans.m4 +++ b/db/schemas/sokwedb/indexes/drop/groom_scans_b.m4 @@ -22,4 +22,4 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl DROP INDEX IF EXISTS - "GROOM_SCANS has, at most, a 1-to-1 releationship with EVENTS"; + "GROOM_SCANS_B has, at most, a 1-to-1 releationship with EVENTS"; diff --git a/db/schemas/sokwedb/tables/Makefile b/db/schemas/sokwedb/tables/Makefile index 9dc7e52..d4bfe6c 100644 --- a/db/schemas/sokwedb/tables/Makefile +++ b/db/schemas/sokwedb/tables/Makefile @@ -40,7 +40,7 @@ ORDER := biography_data \ non_brec_sighting_sources \ food_events \ groomings \ - groom_scans \ + groom_scans_b \ attendance ## ## CAUTION: This Makefile is not designed to be run directly. It is normally diff --git a/db/schemas/sokwedb/tables/create/groom_scans.m4 b/db/schemas/sokwedb/tables/create/groom_scans_b.m4 similarity index 91% rename from db/schemas/sokwedb/tables/create/groom_scans.m4 rename to db/schemas/sokwedb/tables/create/groom_scans_b.m4 index a7390ca..52f3558 100644 --- a/db/schemas/sokwedb/tables/create/groom_scans.m4 +++ b/db/schemas/sokwedb/tables/create/groom_scans_b.m4 @@ -23,8 +23,8 @@ include(`tablemacros.m4')dnl include(`grants.m4')dnl dnl -CREATE TABLE groom_scans ( - key_column(`GROOM_SCANS', `GSID', INTEGER) +CREATE TABLE groom_scans_b ( + key_column(`GROOM_SCANS_B', `GSID', INTEGER) ,eid INTEGER NOT NULL REFERENCES events ,others BOOLEAN NOT NULL @@ -33,4 +33,4 @@ CREATE TABLE groom_scans ( REFERENCES people ); -grant_priv(`GROOM_SCANS') +grant_priv(`GROOM_SCANS_B') diff --git a/doc/diagrams/events.svg b/doc/diagrams/events.svg index a057050..2220c5c 100644 --- a/doc/diagrams/events.svg +++ b/doc/diagrams/events.svg @@ -1803,7 +1803,7 @@ id="tspan2062-9-9-6" x="40.162823" y="54.840057" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82223px;font-family:Sans;-inkscape-font-specification:'Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583px">GROOM_SCANS + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82223px;font-family:Sans;-inkscape-font-specification:'Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583px">GROOM_SCANS_B ` -.. |GROOM_SCANS| replace:: :ref:`GROOM_SCANS ` -.. |GROOM_SCANS.GSID| replace:: - :ref:`GSID ` -.. |GROOM_SCANS.EID| replace:: - :ref:`EID ` -.. |GROOM_SCANS.Others| replace:: - :ref:`Others ` -.. |GROOM_SCANS.Duplicate| replace:: - :ref:`Duplicate ` -.. |GROOM_SCANS.ExtractedBy| replace:: - :ref:`ExtractedBy ` +.. |GROOM_SCANS_B| replace:: :ref:`GROOM_SCANS_B ` +.. |GROOM_SCANS_B.GSID| replace:: + :ref:`GSID ` +.. |GROOM_SCANS_B.EID| replace:: + :ref:`EID ` +.. |GROOM_SCANS_B.Others| replace:: + :ref:`Others ` +.. |GROOM_SCANS_B.Duplicate| replace:: + :ref:`Duplicate ` +.. |GROOM_SCANS_B.ExtractedBy| replace:: + :ref:`ExtractedBy ` .. |GROOMINGS| replace:: :ref:`GROOMINGS ` .. |GROOMINGS.GrID| replace:: diff --git a/doc/src/tables.m4 b/doc/src/tables.m4 index ff4219e..1a4c6c7 100644 --- a/doc/src/tables.m4 +++ b/doc/src/tables.m4 @@ -46,7 +46,7 @@ and are therefore the result of at least a rudimentary analytical process. tables/follow_observers.rst tables/follow_studies.rst tables/food_events.rst - tables/groom_scans.rst + tables/groom_scans_b.rst tables/groomings.rst tables/humans.rst tables/roles.rst diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index da28e9f..6b8010b 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -193,11 +193,11 @@ The following table lists these rules and implications: .. _EVENTS_groom_scan_code: ``sdb_groom_scan`` (SCAN interval Groomings) - A related row should exist on |GROOM_SCANS|; there should be a row - on |GROOM_SCANS| with an |GROOM_SCANS|.\ |GROOM_SCANS.EID| value of + A related row should exist on |GROOM_SCANS_B|; there should be a row + on |GROOM_SCANS_B| with an |GROOM_SCANS_B|.\ |GROOM_SCANS_B.EID| value of the event's |EVENTS.EID|. - There may be at most one of these related |GROOM_SCANS| rows. - The system will generate a warning when there is no |GROOM_SCANS| + There may be at most one of these related |GROOM_SCANS_B| rows. + The system will generate a warning when there is no |GROOM_SCANS_B| row related to the grooming event. The |ROLES| rows related to the event, the rows with a |ROLES|.\ diff --git a/doc/src/tables/groom_scans.m4 b/doc/src/tables/groom_scans_b.m4 similarity index 81% rename from doc/src/tables/groom_scans.m4 rename to doc/src/tables/groom_scans_b.m4 index 24eea19..e7b5131 100644 --- a/doc/src/tables/groom_scans.m4 +++ b/doc/src/tables/groom_scans_b.m4 @@ -19,26 +19,26 @@ include(macros.m4)dnl sdb_rst_quotes(`on')dnl sdb_generated_rst()dnl -.. _GROOM_SCANS: +.. _GROOM_SCANS_B: -GROOM_SCANS ------------ +GROOM_SCANS_B +------------- -.. |GROOM_SCANS_summary| replace:: +.. |GROOM_SCANS_B_summary| replace:: Each row, taken together with the related |EVENTS| row, represents a grooming event recorded during a follow, over a regular, periodic, sampling interval, during which period all observed grooming pairs were recorded. Groomings are recorded as dyadic pairs. -|GROOM_SCANS_summary| +|GROOM_SCANS_B_summary| In this data set, all groomings observed in periodic 5 minute intervals were recorded. Should there be multiple individuals, whether groomer or recipient, involved in simultaneous grooming behavior, there should be multiple -rows in the GROOM_SCANS table. +rows in the GROOM_SCANS_B table. There should be one row for each dyad. @@ -64,68 +64,68 @@ table. :depth: 2 -.. _GROOM_SCANS.GSID: +.. _GROOM_SCANS_B.GSID: GSID (Grooming Scan ID) ``````````````````````` -.. |GROOM_SCANS.GSID_summary| replace:: |idcol| +.. |GROOM_SCANS_B.GSID_summary| replace:: |idcol| -|GROOM_SCANS.GSID_summary| |notnull| +|GROOM_SCANS_B.GSID_summary| |notnull| -.. _GROOM_SCANS.EID: +.. _GROOM_SCANS_B.EID: EID (Event ID) `````````````` -.. |GROOM_SCANS.EID_summary| replace:: +.. |GROOM_SCANS_B.EID_summary| replace:: The |EVENTS|.\ |EVENTS.EID| identifying the groom sampling event. -|GROOM_SCANS.EID_summary| +|GROOM_SCANS_B.EID_summary| The related event contains information on the time of the grooming and is related to the participants in the groom sampling event. |notnull| -.. _GROOM_SCANS.Others: +.. _GROOM_SCANS_B.Others: Others `````` -.. |GROOM_SCANS.Others_summary| replace:: +.. |GROOM_SCANS_B.Others_summary| replace:: A |boolean| value indicating whether others participated in the grooming. -|GROOM_SCANS.Others_summary| +|GROOM_SCANS_B.Others_summary| |notnull| -.. _GROOM_SCANS.Duplicate: +.. _GROOM_SCANS_B.Duplicate: Duplicate ````````` -.. |GROOM_SCANS.Duplicate_summary| replace:: +.. |GROOM_SCANS_B.Duplicate_summary| replace:: A |boolean| value indicating whether the grooming is duplicated due to overlapping follows of different focals. -|GROOM_SCANS.Duplicate_summary| +|GROOM_SCANS_B.Duplicate_summary| When there are duplicates only one of the duplicates is so marked. |notnull| -.. _GROOM_SCANS.Extractedby: +.. _GROOM_SCANS_B.Extractedby: Extractedby ``````````` -.. |GROOM_SCANS.Extractedby_summary| replace:: +.. |GROOM_SCANS_B.Extractedby_summary| replace:: The person who extracted the grooming information from the written records and prepared it for data entry into the database. -|GROOM_SCANS.Extractedby_summary| |notnull| +|GROOM_SCANS_B.Extractedby_summary| |notnull| .. ::rubric:: Footnotes -- 2.34.1