X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Futils.lisp;h=df3b70581b144c3aca81c1f81649e4aa8da4e50c;hp=a215a446ed31cc903584ffc37cf1b18f275ad073;hb=6ba1e44b4faf89ed2aa0ebdf410eebd65e04b3a5;hpb=43971c970889fee2a4766ff8e33da292a239f1bc

diff --git a/sql/utils.lisp b/sql/utils.lisp
index a215a44..df3b705 100644
--- a/sql/utils.lisp
+++ b/sql/utils.lisp
@@ -375,7 +375,7 @@ list of characters and replacement strings."
   (cdr (assoc (string var) ext:*environment-list* :test #'equalp
               :key #'string))
   #+lispworks (lw:environment-variable (string var))
-  #+mcl (ccl::getenv var)
+  #+ccl (ccl::getenv var)
   #+sbcl (sb-ext:posix-getenv var))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -424,6 +424,26 @@ is replaced with replacement. [FROM http://cl-cookbook.sourceforge.net/strings.h
     (unless stream
       (get-output-stream-string out))))
 
+(defun read-decimal-value (string)
+  (let* ((comma 0)
+         (dot 0)
+         (last))
+    (loop for c across string
+          do (case c
+               (#\. (incf dot) (setf last 'dot))
+               (#\, (incf comma) (setf last 'comma))))
+    (let* ((bag (if (and (eql last 'dot) (eql dot 1))
+                    ".0123456789+-"
+                    ",0123456789+-"))
+           (clean (with-output-to-string (out)
+                    (loop for c across string
+                          do (when (find c bag :test #'char=)
+                               (write-char c out))))))
+      (if (and (eql last 'dot) (eql dot 1))
+          (decimals:parse-decimal-number clean)
+          (decimals:parse-decimal-number
+           clean :decimal-separator #\,)))))
+
 
 (defun filter-plist (plist &rest keys-to-remove)
   "Returns a copy of the given plist with indicated key-value pairs