From f21a6b9ce2b5bea161d890c2a6a651b6e2b130aa Mon Sep 17 00:00:00 2001
From: Taylor Salo <tsalo006@fiu.edu>
Date: Thu, 15 Feb 2024 11:53:59 -0500
Subject: [PATCH] Fix up column names.

---
 src/schema/objects/columns.yaml                     | 13 +++++++++++++
 .../derivatives/common_derivatives.yaml             |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/schema/objects/columns.yaml b/src/schema/objects/columns.yaml
index ba9f86ba31..d9e633c966 100644
--- a/src/schema/objects/columns.yaml
+++ b/src/schema/objects/columns.yaml
@@ -110,6 +110,13 @@ derived_from:
     for example a slice of tissue (`sample-02`) derived from a block of tissue (`sample-01`).
   type: string
   pattern: ^sample-[0-9a-zA-Z]+$
+desc_id:
+  name: desc_id
+  display_name: Description Label
+  description: |
+    A `desc-<label>` entity present in the derivatives dataset.
+  type: string
+  pattern: ^desc-[0-9a-zA-Z]+$
 description:
   name: description
   display_name: Description
@@ -122,6 +129,12 @@ description__optode:
   description: |
     Free-form text description of the optode, or other information of interest.
   type: string
+description__descriptions:
+  name: description
+  display_name: Description
+  description: |
+    Free-form text description of the desc entity's label (defined in `desc_id`).
+  type: string
 dimension:
   name: dimension
   display_name: Dimension
diff --git a/src/schema/rules/tabular_data/derivatives/common_derivatives.yaml b/src/schema/rules/tabular_data/derivatives/common_derivatives.yaml
index b101f314a1..21d8c86b8f 100644
--- a/src/schema/rules/tabular_data/derivatives/common_derivatives.yaml
+++ b/src/schema/rules/tabular_data/derivatives/common_derivatives.yaml
@@ -16,6 +16,6 @@ Descriptions:
     - path == "descriptions.tsv"
   columns:
     desc_id: required
-    description: required
-  index_columns: [desc_id, description]
+    description__descriptions: required
+  index_columns: [desc_id]
   additional_columns: allowed