escaping double quotes in literals

robstewart57 · Oct 24, 2012 · f95df42 · f95df42
1 parent c47d65c
commit f95df42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Database/HSparql/QueryGenerator.hs b/Database/HSparql/QueryGenerator.hs
@@ -71,6 +71,7 @@ where
 
 import Control.Monad.State
 import Data.List (intercalate)
+import Data.String.Utils
 
 
 -- State monads
@@ -498,9 +499,9 @@ instance QueryShow (Maybe IRIRef) where
   qshow Nothing = ""
 
 instance QueryShow RDFLiteral where
-  qshow (RDFLiteral s)           = "\"" ++ s ++ "\""
-  qshow (RDFLiteralLang s lang')  = "\"" ++ s ++ "\"@" ++ lang'
-  qshow (RDFLiteralIRIRef s ref) = "\"" ++ s ++ "\"^^" ++ qshow ref
+  qshow (RDFLiteral s)           = "\"" ++ escapeQuotes s ++ "\""
+  qshow (RDFLiteralLang s lang')  = "\"" ++ escapeQuotes s ++ "\"@" ++ lang'
+  qshow (RDFLiteralIRIRef s ref) = "\"" ++ escapeQuotes s ++ "\"^^" ++ qshow ref
 
 instance QueryShow GraphTerm where
   qshow (IRIRefTerm ref)           = qshow ref
@@ -610,3 +611,9 @@ instance QueryShow QueryData where
                            , qshow (AskForm qd)
                            ]
              in query
+
+
+-- Internal utilities
+
+escapeQuotes :: String -> String
+escapeQuotes s = replace "\"" "\\\"" s
diff --git a/hsparql.cabal b/hsparql.cabal
@@ -29,6 +29,7 @@ library
                , xml
                , rdf4h >= 1.0.0
                , bytestring
+               , MissingH
                , network
                , text
   extensions:  RankNTypes FlexibleInstances
@@ -45,6 +46,7 @@ test-suite test-hsparql
                  , HUnit
                  , test-framework
                  , test-framework-hunit
+                 , MissingH
                  , wai
                  , warp
   hs-source-dirs: Database, tests