X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Futils.lisp;fp=base%2Futils.lisp;h=3f9ad8a6348862c3dce8723b4cd5dee1d80db835;hp=f123b4feccc885f0ab0ebc2e41b2a2ba01c480b4;hb=67e6b9eaab9c9bcf8b57cbd476581437e4876b26;hpb=70227e5f0b76bb649fc6c1a478d7374953fd815b

diff --git a/base/utils.lisp b/base/utils.lisp
index f123b4f..3f9ad8a 100644
--- a/base/utils.lisp
+++ b/base/utils.lisp
@@ -81,3 +81,34 @@
       procstr)))
 
 
+(defun delimited-string-to-list (string &optional (separator #\space) 
+						  skip-terminal)
+  "Split a string with delimiter, from KMRCL."
+  (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0))
+	   (type string string)
+	   (type character separator))
+  (do* ((len (length string))
+	(output '())
+	(pos 0)
+	(end (position-char separator string pos len)
+	     (position-char separator string pos len)))
+       ((null end)
+	(if (< pos len)
+	    (push (subseq string pos) output)
+	    (when (or (not skip-terminal) (zerop len))
+	      (push "" output)))
+	(nreverse output))
+    (declare (type fixnum pos len)
+	     (type (or null fixnum) end))
+    (push (subseq string pos end) output)
+    (setq pos (1+ end))))
+
+(defun string-to-list-connection-spec (str)
+  (let ((at-pos (position #\@ str)))
+    (cond
+      ((and at-pos (> (length str) at-pos))
+       ;; Connection spec is SQL*NET format
+       (append (delimited-string-to-list (subseq str 0 at-pos) #\/)
+	       (list (subseq str (1+ at-pos)))))
+      (t
+       (delimited-string-to-list str #\/)))))