From 2033b358a9e28168d847ff3ae860eb6b31ce0ab8 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Wed, 27 May 2026 23:53:02 +0000 Subject: [PATCH] Change global constant name sdb_manual_estrus -> sdb_manual_swelling --- db/schemas/sokwedb/tables/create/swelling_sources.m4 | 8 ++++---- doc/src/analyzed/estrus_states.m4 | 2 +- doc/src/code_tables.m4 | 2 +- doc/src/tables/swelling_sources.m4 | 4 ++-- include/global_constants.m4 | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db/schemas/sokwedb/tables/create/swelling_sources.m4 b/db/schemas/sokwedb/tables/create/swelling_sources.m4 index cc7ed67..365df7a 100644 --- a/db/schemas/sokwedb/tables/create/swelling_sources.m4 +++ b/db/schemas/sokwedb/tables/create/swelling_sources.m4 @@ -34,15 +34,15 @@ CREATE TABLE swelling_sources ( ,swellingmin TEXT REFERENCES cycle_states CONSTRAINT - "SwellingMin may be NULL only when Source = sdb_manual_estrus" + "SwellingMin may be NULL only when Source = sdb_manual_swelling" CHECK(swellingmin IS NOT NULL - OR source = 'sdb_manual_estrus') + OR source = 'sdb_manual_swelling') ,swellingmax TEXT REFERENCES cycle_states CONSTRAINT - "SwellingMax may be NULL only when Source = sdb_manual_estrus" + "SwellingMax may be NULL only when Source = sdb_manual_swelling" CHECK(swellingmax IS NOT NULL - OR source = 'sdb_manual_estrus') + OR source = 'sdb_manual_swelling') ,notes TEXT NOT NULL notonlyspaces_check(`Notes') -- Table constraints diff --git a/doc/src/analyzed/estrus_states.m4 b/doc/src/analyzed/estrus_states.m4 index ae2b03f..54523c3 100644 --- a/doc/src/analyzed/estrus_states.m4 +++ b/doc/src/analyzed/estrus_states.m4 @@ -83,7 +83,7 @@ associated with non-|null| |CYCLE_STATES.AsNum| values appear as There is a mechanism for ignoring the above minimum and maximum calculations and manually specifying a daily estrus state value. To do this, create a row in |SWELLING_SOURCES| with the special -|SWELLING_SOURCES.Source| value of ``sdb_manual_estrus``. +|SWELLING_SOURCES.Source| value of ``sdb_manual_swelling``. The |SWELLING_SOURCES.SwellingMin| and SWELLING_SOURCES.SwellingMax| values in the row you create then become the values used in the ESTRUS_STATES.\ |ESTRUS_STATES.EstrusMin| and |ESTRUS_STATES.EstrusMax| columns for diff --git a/doc/src/code_tables.m4 b/doc/src/code_tables.m4 index d004840..a4ae70c 100644 --- a/doc/src/code_tables.m4 +++ b/doc/src/code_tables.m4 @@ -857,7 +857,7 @@ The following |SIGHTING_RECORDS.Code| values are special: due to data held in SokweDB (aside from the |NON_BREC_SIGHTING_SOURCES| and |SWELLING_SOURCES| tables). -``sdb_manual_estrus`` +``sdb_manual_swelling`` Indicates that the sexual swelling values given in the |SWELLING_SOURCES| table are to be used in instead of any other value. diff --git a/doc/src/tables/swelling_sources.m4 b/doc/src/tables/swelling_sources.m4 index 93dfb43..20877c1 100644 --- a/doc/src/tables/swelling_sources.m4 +++ b/doc/src/tables/swelling_sources.m4 @@ -131,7 +131,7 @@ SwellingMin (MINimum sexual SWELLING) |SWELLING_SOURCES.SwellingMin_summary| This value may only be |null| when the |SWELLING_SOURCES.Source| value -is ``sdb_manual_estrus``. +is ``sdb_manual_swelling``. .. _SWELLING_SOURCES.SwellingMax: @@ -147,7 +147,7 @@ SwellingMax (MAXimum sexual SWELLING) |SWELLING_SOURCES.SwellingMax_summary| This value may only be |null| when the |SWELLING_SOURCES.Source| value -is ``sdb_manual_estrus``. +is ``sdb_manual_swelling``. .. _SWELLING_SOURCES.Notes: diff --git a/include/global_constants.m4 b/include/global_constants.m4 index a893f09..56898f4 100644 --- a/include/global_constants.m4 +++ b/include/global_constants.m4 @@ -149,8 +149,8 @@ dnl SIGHTING_RECORDS dnl dnl Value used when the SokweDB tables indicate a sighting define(`sdb_sokwedb_source', `SOKWEDB') -dnl Value used to manually override all other estrus values -define(`sdb_manual_estrus', `MANUAL') +dnl Value used to manually override all other sexual swelling values +define(`sdb_manual_swelling', `MANUAL') dnl dnl Special sexual cycle values -- 2.34.1