some small cleanup of ArcologyWeb.OrgController

main
Ryan Rix 2020-08-27 14:10:37 -07:00
parent 6060faff75
commit f45e01b371
2 changed files with 8 additions and 5 deletions

View File

@ -37,7 +37,7 @@ defmodule Arcology.Roam.Keyword do
@doc """
returns a keyword from a particular file
"""
def get_file(file, keyword) do
def from_file(file, keyword) do
Arcology.Repo.one(
Arcology.Roam.Keyword
|> select([keyword], [keyword.value])

View File

@ -38,10 +38,13 @@ defmodule ArcologyWeb.OrgController do
|> URI.decode()
key = "#{site}/#{string_slug}"
cache_entity = Enum.at(Arcology.Roam.Keyword.get("ARCOLOGY_KEY", key), 0)
org_fname = cache_entity["file"]
page = Arcology.Page.get_file(org_fname)
org_fname =
Arcology.Roam.Keyword.get("ARCOLOGY_KEY", key)
|> Enum.at(0)
|> Map.get("file")
page = Arcology.Page.from_file(org_fname)
html =
Arcology.Page.to_html(page)
@ -118,7 +121,7 @@ defmodule ArcologyWeb.OrgController do
defp url_for_file(filename) do
key =
filename
|> Arcology.Roam.Keyword.get_file("ARCOLOGY_KEY")
|> Arcology.Roam.Keyword.from_file("ARCOLOGY_KEY")
"/#{key}.html"
end