diff --git a/src/eoaauthors2/views.py b/src/eoaauthors2/views.py index 1e8d658..02f1514 100644 --- a/src/eoaauthors2/views.py +++ b/src/eoaauthors2/views.py @@ -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") diff --git a/src/eoaseries2/views.py b/src/eoaseries2/views.py index a8cb2d6..0220a2a 100644 --- a/src/eoaseries2/views.py +++ b/src/eoaseries2/views.py @@ -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') diff --git a/src/xsl/views.py b/src/xsl/views.py index 5753961..25d3bc2 100644 --- a/src/xsl/views.py +++ b/src/xsl/views.py @@ -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}")',