diff options
Diffstat (limited to 'scripts/metadata_filter.lua')
-rw-r--r-- | scripts/metadata_filter.lua | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua index 7823130..499cf3e 100644 --- a/scripts/metadata_filter.lua +++ b/scripts/metadata_filter.lua | |||
@@ -260,8 +260,14 @@ function Meta(meta) | |||
260 | 260 | ||
261 | meta.file_out = get_file_out(meta.rewrites, meta.content_dir, | 261 | meta.file_out = get_file_out(meta.rewrites, meta.content_dir, |
262 | meta.output_dir, meta.file_in) | 262 | meta.output_dir, meta.file_in) |
263 | if meta.relative_to == nil then | ||
264 | meta.relative_to = meta.file_in | ||
265 | end | ||
266 | meta.relative_to_out = get_file_out(meta.rewrites, meta.content_dir, | ||
267 | meta.output_dir, meta.relative_to) | ||
263 | 268 | ||
264 | meta.url = resolve_url(meta.site.url, meta.output_dir, meta.file_out, meta.file_out) | 269 | meta.url = resolve_url(meta.site.url, meta.output_dir, meta.relative_to_out, |
270 | meta.file_out) | ||
265 | 271 | ||
266 | meta.date = format_date(meta.date) | 272 | meta.date = format_date(meta.date) |
267 | if meta.last_update ~= nil then | 273 | if meta.last_update ~= nil then |
@@ -276,14 +282,16 @@ function Meta(meta) | |||
276 | 282 | ||
277 | if meta.page_type == "feed" then | 283 | if meta.page_type == "feed" then |
278 | meta.page = pandoc.MetaMap({ | 284 | meta.page = pandoc.MetaMap({ |
279 | url = resolve_url(meta.site.url, meta.output_dir, meta.file_out, | 285 | url = resolve_url(meta.site.url, meta.output_dir, |
286 | meta.relative_to_out, | ||
280 | meta.file_out:gsub("%.xml$", ".html")) | 287 | meta.file_out:gsub("%.xml$", ".html")) |
281 | }) | 288 | }) |
282 | end | 289 | end |
283 | 290 | ||
284 | if meta.create_feed then | 291 | if meta.create_feed then |
285 | meta.feed = pandoc.MetaMap({ | 292 | meta.feed = pandoc.MetaMap({ |
286 | url = resolve_url(meta.site.url, meta.output_dir, meta.file_out, | 293 | url = resolve_url(meta.site.url, meta.output_dir, |
294 | meta.relative_to_out, | ||
287 | meta.file_out:gsub("%.html$", ".xml")) | 295 | meta.file_out:gsub("%.html$", ".xml")) |
288 | }) | 296 | }) |
289 | end | 297 | end |
@@ -296,7 +304,8 @@ function Meta(meta) | |||
296 | if meta.pages then | 304 | if meta.pages then |
297 | local pages, categories = organize_subpages(meta.site.url, | 305 | local pages, categories = organize_subpages(meta.site.url, |
298 | meta.output_dir, | 306 | meta.output_dir, |
299 | meta.file_out, meta.pages) | 307 | meta.relative_to_out, |
308 | meta.pages) | ||
300 | meta.pages = pages | 309 | meta.pages = pages |
301 | meta.categories = categories | 310 | meta.categories = categories |
302 | end | 311 | end |