From 718518ab723933f8ab9992939aff0bde4049ed6a Mon Sep 17 00:00:00 2001
From: Jacob Mims <122570226+jtmims@users.noreply.github.com>
Date: Wed, 15 May 2024 16:27:45 -0500
Subject: [PATCH] add logic to format method of DateFrequency object (#564)

* add logic to format method of DateFrequency object

* cleanup
---
 src/preprocessor.py   | 2 +-
 src/util/datelabel.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/preprocessor.py b/src/preprocessor.py
index 595e8ef49..938a5825d 100644
--- a/src/preprocessor.py
+++ b/src/preprocessor.py
@@ -855,7 +855,7 @@ def query_catalog(self,
             # path_regex = re.compile(r'(?i)(?<!\\S){}(?!\\S+)'.format(case_name))
             path_regex = re.compile(r'({})'.format(case_name))
             # path_regex = '*' + case_name + '*'
-            freq = case_d.varlist.T.frequency
+            freq = case_d.varlist.T.frequency.format()
 
             for v in case_d.varlist.iter_vars():
                 realm_regex = v.realm + '*'
diff --git a/src/util/datelabel.py b/src/util/datelabel.py
index 948824755..219ddcb68 100644
--- a/src/util/datelabel.py
+++ b/src/util/datelabel.py
@@ -1148,7 +1148,10 @@ def format(self):
         if self.unit == 'fx':
             return 'fx'
         else:
-            return "{}{}".format(self.quantity, self.unit)
+            if self.quantity == '1':
+                return self.unit
+            else:
+                return "{}{}".format(self.quantity, self.unit)
 
     __str__ = format