@@ -21,7 +21,7 @@ import Text.Parsec ((<?>))
2121import qualified Text.Parsec as P
2222import Text.Parsec.String (Parser)
2323import System.FilePath.Posix
24−import Control.Monad (liftM)
24+import Control.Monad (liftM)
2525
2626
2727--------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ loadMetadata p identifier = do
4444 Nothing -> return M.empty
4545 Just mi' -> loadMetadataFile $ resourceFilePath p mi'
4646
47− gmd <- loadGlobalMetadata p fp
47+ gmd <- loadGlobalMetadata p $ toFilePath identifier
4848
4949 return (M.unions [md, emd, gmd], body)
5050 where
@@ -150,13 +150,13 @@ loadGlobalMetadata p fp = do
150150 loadgm dir | dir == providerDirectory p = return []
151151 | otherwise = do
152152 let mfp = combine dir "metadata"
153− md <- if M.member (fromFilePath $ normalise mfp) (providerFiles p)
153+ md <- if M.member (fromFilePath mfp) (providerFiles p)
154154 then loadOne mfp dir
155155 else return []
156156 others <- loadgm (takeDirectory dir)
157157 return $ others ++ md
158158 loadOne mfp dir = do
159− contents <- IO.readFile mfp
159+ contents <- IO.readFile $ resourceFilePath p $ fromFilePath mfp
160160 return $ case P.parse namedMetadata mfp contents of
161161 Left err -> error (show err)
162162 Right mds -> findMetadata mds dir