@@ -14,6 +14,7 @@ module Database.CouchDB , Doc , Rev , doc + , rev , isDocString , newNamedDoc , newDoc @@ -21,6 +22,7 @@ module Database.CouchDB , deleteDoc , forceDeleteDoc , getDocPrim + , getDocRaw , getDoc , getAndUpdateDoc , getAllDocIds @@ -113,6 +115,10 @@ instance Read Doc where | otherwise = ("",ch:rest) +-- |Returns a Rev +rev :: String -> Rev +rev = Rev . toJSString + -- |Returns a safe document name. Signals an error if the name is -- invalid. doc :: String -> Doc @@ -202,6 +208,9 @@ getDocPrim db doc = do Nothing -> return Nothing Just (_,rev,obj) -> return $ Just (doc,Rev rev,obj) +getDocRaw :: DB -> Doc -> CouchMonad (Maybe String) +getDocRaw db doc = U.getDocRaw (show db) (show doc) + getAndUpdateDoc :: (JSON a) => DB -- ^database -> Doc -- ^document name src/Database/CouchDB.hs @@ -12,6 +12,7 @@ module Database.CouchDB.Unsafe , deleteDoc , forceDeleteDoc , getDocPrim + , getDocRaw , getDoc , getAndUpdateDoc , getAllDocIds @@ -39,6 +40,7 @@ couchResponse respBody = case decode respBody of Error s -> error s Ok r -> fromJSObject r +request' :: String -> RequestMethod -> CouchMonad (Response String) request' path method = request path [] method [] "" -- |Creates a new database. Throws an exception if the database already @@ -176,6 +178,19 @@ getDocPrim db doc = do (4,0,4) -> return Nothing -- doc does not exist code -> fail $ "getDocPrim: " ++ show code ++ " error" +-- |Gets a document as a Maybe String. Returns the raw result of what +-- couchdb returns. Returns Nothing if the doc does not exist. +getDocRaw :: String -> String -> CouchMonad (Maybe String) +getDocRaw db doc = do + r <- request' (db ++ "/" ++ doc) GET + case rspCode r of + (2,0,0) -> do + return $ Just (rspBody r) + (4,0,4) -> return Nothing -- doc does not exist + code -> fail $ "getDocRaw: " ++ show code ++ " error" + + + getAndUpdateDoc :: (JSON a) => String -- ^database -> String -- ^document name src/Database/CouchDB/Unsafe.hs 171217e0567c02edb32539331ea2f25b9f3acb7e Arjun Guha arjun@cs.brown.edu http://github.com/arjunguha/haskell-couchdb/commit/bdc40c3fcb64b5806f4f12bb1b5e4117633b15f5 bdc40c3fcb64b5806f4f12bb1b5e4117633b15f5 2009-06-21T15:29:02-07:00 2009-06-21T15:29:02-07:00 Henry\'s getDocRaw 6a70801304d8aa9133d3f34a17f7bad7fe38567a Arjun Guha arjun@cs.brown.edu