Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Put eoa related xml files into apps collection
  • Loading branch information
kthoden committed Sep 10, 2020
1 parent 41deb3a commit c2f21bc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/eoaauthors2/views.py
Expand Up @@ -96,7 +96,7 @@ def author(request, authorslug):
publications_with_current_author = evaluate_publications_xml(pubs)

# Removing chapters that are part of above publications!
all_publications_query = xsl_lib.get_document("xquery/allpublications.xq").decode("utf-8")
all_publications_query = xsl_lib.get_document("apps/eoa/xml/xquery/allpublications.xq").decode("utf-8")
all_publications = evaluate_publications_xml(all_publications_query)
xquery_string_chapters = xquery_templates.author_is_creator_of_which_other_chapters(ao.authorfirstname, ao.authorlastname)
chaps = xsl_lib.xquery(xquery_string_chapters).data.decode("utf-8")
Expand Down
4 changes: 2 additions & 2 deletions src/eoaseries2/views.py
Expand Up @@ -56,8 +56,8 @@ def evaluate_xml(series_query, translations):
def index(request):
"""Return the publications overview"""

series_query = xsl_lib.get_document("xquery/series-extended.xq").decode("utf-8")
translations = xsl_lib.get_document("aux/translations.xml").decode("utf-8")
series_query = xsl_lib.get_document("apps/eoa/xml/xquery/series.xq").decode("utf-8")
translations = xsl_lib.get_document("apps/eoa/xml/aux/translations.xml").decode("utf-8")
books = evaluate_xml(series_query, translations)

registered_series = Series.objects.all().order_by('name')
Expand Down
6 changes: 3 additions & 3 deletions src/xsl/views.py
Expand Up @@ -14,13 +14,13 @@
def render( request ):
namespace, config = get_app_instance(request)
xml_file = \
"/db" / (Path(config.xml_file) . relative_to( XML_DIR ))
"/db/apps/eoa/xml" / (Path(config.xml_file) . relative_to( XML_DIR ))
stylesheet = \
"/db" / Path(config.stylesheet) . relative_to( XML_DIR )
"/db/apps/eoa/xml" / Path(config.stylesheet) . relative_to( XML_DIR )
params = []
for p in config.xslparam_set.all():
params += [ (p.key, p.value) ]
print( f"xml_file: {xml_file}, stylesheet: {stylesheet}" )
# print( f"xml_file: {xml_file}, stylesheet: {stylesheet}" )
ret_doc = \
xslt(
input = f'doc("{xml_file}")',
Expand Down

0 comments on commit c2f21bc

Please sign in to comment.