From 87ea877b26923f310d318b81eabcf3594e0ff4f0 Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 8 Jul 2014 10:07:36 -0400 Subject: [PATCH] naming adjustments --- src/clj_hl7_fhir/core.clj | 2 +- src/clj_hl7_fhir/util.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/clj_hl7_fhir/core.clj b/src/clj_hl7_fhir/core.clj index e08ccf6..b47991f 100644 --- a/src/clj_hl7_fhir/core.clj +++ b/src/clj_hl7_fhir/core.clj @@ -56,7 +56,7 @@ (str (:namespace value) "|" (format-search-value (:value value))) (instance? Date value) - (->iso-timestamp value) + (->timestamp value) :else (-> value str escape-parameter))) diff --git a/src/clj_hl7_fhir/util.clj b/src/clj_hl7_fhir/util.clj index 1a0b619..5f3029d 100644 --- a/src/clj_hl7_fhir/util.clj +++ b/src/clj_hl7_fhir/util.clj @@ -17,19 +17,19 @@ (.setTimeZone df tz) (.format df date)))) -(defn ->iso-timestamp +(defn ->timestamp "returns an ISO8601 formatted date/time string for the given date object" [^Date date] (format-date date iso8601-timestamp)) -(defn ->iso-local-timestamp +(defn ->local-timestamp "returns an ISO8601 formatted date/time string for the given date object. the timestamp will not include any timezone information and so is appropriate for local timezone date/times only." [^Date date] (format-date date iso8601-timestamp)) -(defn ->iso-date +(defn ->date "returns an ISO8601 formatted date string for the given date object" [^Date date] (format-date date iso8601-date))