Merge pull request #554 from HistoryAtState/fix-frus-interior-404

Restore 404s for bad volume interior requests

Author: joewiz

modules/pages.xqm

@@ -114,26 +114,16 @@ declare function pages:load-xml($publication-config as map(*), $document-id as x
 
         return
             if (empty($block) and not($ignore)) then (
-                pages:load-fallback-page($document-id, $section-id)
+                request:set-attribute("hsg-shell.errcode", 404),
+                request:set-attribute("hsg-shell.path", string-join(($document-id, $section-id), "/")),
+                error(QName("http://history.state.gov/ns/site/hsg", "not-found"), "document " || $document-id || " section " || $section-id || " not found")
             ) else (
                 util:log("debug", ("pages:load-xml: Loaded ", document-uri(root($block)), ". Node name: ", node-name($block), ".")),
                 $block
             )
     )
 };
 
-declare function pages:load-fallback-page($document-id as xs:string?, $section-id as xs:string?) {
-    util:log("debug", ("Loading fallback page for ", $document-id)),
-    let $volume := $config:FRUS_COL_VOLUMES/id($document-id)
-    return
-        if (empty($volume)) then (
-            request:set-attribute("hsg-shell.errcode", 404),
-            request:set-attribute("hsg-shell.path", string-join(($document-id, $section-id), "/")),
-            error(QName("http://history.state.gov/ns/site/hsg", "not-found"), "document " || $document-id || " section " || $section-id || " not found")
-        ) else
-            pages:volume-to-tei($volume)
-};
-
 (: TODO delete after completing import of external location data and deciding on whether to keep summary data or not :)
 declare function pages:volume-to-tei($volume as element()) {
     <tei:TEI xmlns:frus="http://history.state.gov/frus/ns/1.0" xml:id="{$volume/@xml:id}">