From 08a07dadc2e0ebed902728eb5736ee78956b0510 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Wed, 20 Aug 2014 14:00:25 -0400
Subject: [PATCH] add support for parsing relative resource urls

---
 src/clj_hl7_fhir/core.clj | 45 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/clj_hl7_fhir/core.clj b/src/clj_hl7_fhir/core.clj
index 48cf061..0c649cb 100644
--- a/src/clj_hl7_fhir/core.clj
+++ b/src/clj_hl7_fhir/core.clj
@@ -164,26 +164,33 @@
     url))
 
 (defn parse-resource-url
-  "given an absolute URL to a FHIR resource and the base URL for the FHIR server, parses the
-   URL returning a map containing the resource type, id and version number (if present). if
-   the URL cannot be parsed, returns nil"
-  [server-url url]
-  (if (and server-url
-           url
-           (.startsWith url server-url))
-    (let [parts (-> (strip-query-params url)
-                    (strip-base-url server-url)
-                    (str/split #"/"))]
-      (cond
-        (= 2 (count parts))
-        {:type (-> parts first ->kebab-case keyword)
-         :id (second parts)}
+  "parses an absolute URL to a FHIR resource or a relative URL to a FHIR resource. if an
+   absolute URL is provided, any present version number will also be parsed. returns a map
+   containing the discrete components of the URL that can be used to identify the resouce.
+   if the URL cannot be parsed, returns nil"
+  ([relative-url]
+   (let [parts (-> (strip-query-params relative-url)
+                   (str/split #"/"))]
+     (if (= 2 (count parts))
+       {:type (-> parts first ->kebab-case keyword)
+        :id (second parts)})))
+  ([server-url absolute-url]
+   (if (and server-url
+            absolute-url
+            (.startsWith absolute-url server-url))
+     (let [parts (-> (strip-query-params absolute-url)
+                     (strip-base-url server-url)
+                     (str/split #"/"))]
+       (cond
+         (= 2 (count parts))
+         {:type (-> parts first ->kebab-case keyword)
+          :id (second parts)}
 
-        (and (= 4 (count parts))
-             (= "_history" (nth parts 2)))
-        {:type (-> parts first ->kebab-case keyword)
-         :id (second parts)
-         :version (last parts)}))))
+         (and (= 4 (count parts))
+              (= "_history" (nth parts 2)))
+         {:type (-> parts first ->kebab-case keyword)
+          :id (second parts)
+          :version (last parts)})))))
 
 (defn collect-resources
   "returns a sequence containing all of the resources contained in the given bundle.