From 64569d7b724add2c30ee233a1b73703d0e25a8f0 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Wed, 14 Aug 2013 00:18:10 +0200 Subject: Fix versions & metadata loading issue Closes #171 --- src/Hakyll/Core/Provider/Internal.hs | 2 +- src/Hakyll/Core/Provider/Metadata.hs | 5 +++-- src/Hakyll/Core/Store.hs | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Hakyll/Core/Provider/Internal.hs b/src/Hakyll/Core/Provider/Internal.hs index 583c665..d566f3a 100644 --- a/src/Hakyll/Core/Provider/Internal.hs +++ b/src/Hakyll/Core/Provider/Internal.hs @@ -98,7 +98,7 @@ data Provider = Provider providerOldFiles :: Map Identifier ResourceInfo , -- | Underlying persistent store for caching providerStore :: Store - } + } deriving (Show) -------------------------------------------------------------------------------- diff --git a/src/Hakyll/Core/Provider/Metadata.hs b/src/Hakyll/Core/Provider/Metadata.hs index fe2857a..7e4d7ed 100644 --- a/src/Hakyll/Core/Provider/Metadata.hs +++ b/src/Hakyll/Core/Provider/Metadata.hs @@ -44,8 +44,9 @@ loadMetadata p identifier = do return (M.union md emd, body) where - fp = resourceFilePath p identifier - mi = M.lookup identifier (providerFiles p) >>= resourceInfoMetadata + normal = setVersion Nothing identifier + fp = resourceFilePath p identifier + mi = M.lookup normal (providerFiles p) >>= resourceInfoMetadata -------------------------------------------------------------------------------- diff --git a/src/Hakyll/Core/Store.hs b/src/Hakyll/Core/Store.hs index 74d9d2f..5c3667d 100644 --- a/src/Hakyll/Core/Store.hs +++ b/src/Hakyll/Core/Store.hs @@ -49,6 +49,11 @@ data Store = Store } +-------------------------------------------------------------------------------- +instance Show Store where + show _ = "" + + -------------------------------------------------------------------------------- -- | Result of a store query data Result a -- cgit v1.2.3 From 5679681ac15de8b3b7d1cc0db6745f6787141e23 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Fri, 16 Aug 2013 11:48:05 +0200 Subject: Change type: metadataField :: Context a Closes #175 --- src/Hakyll/Web/Template/Context.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs index 98662dd..cd52eb0 100644 --- a/src/Hakyll/Web/Template/Context.hs +++ b/src/Hakyll/Web/Template/Context.hs @@ -130,7 +130,7 @@ bodyField key = field key $ return . itemBody -------------------------------------------------------------------------------- -- | Map any field to its metadata value, if present -metadataField :: Context String +metadataField :: Context a metadataField = Context $ \k i -> do value <- getMetadataField (itemIdentifier i) k maybe empty (return . StringField) value -- cgit v1.2.3