From: Galen Charlton Date: Mon, 23 Sep 2019 21:15:16 +0000 (-0400) Subject: fix issue with nested .xhtml includes X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2fbac228cf82853d203e41e0a0c2d8db56ca580f;p=working%2FEvergreen.git fix issue with nested .xhtml includes This WIP patch fixes an issue where oils_rpt.xhtml fails to get completely loaded due to an XML parsing error thrown by mod_xmlent. The problem appears to be that oils_rpt_param_editor.xhtml gets included via mod_include and processed by mod_xmlent... in the context of an overall chain of mod_include and mod_xmlent that is filtering the overall request for oils_rpt.xhtml. However, if the same Apache backend processes both the main request and a sub-request to fetch the included file, the fact that the Expat parser is shared by all invocations of mod_xmlent for a given Apache backend is somehow leading to chunks of oils_rpt.xhtml and the files it's bringing via mod_include getting processed out of order. Renaming oils_rpt_param_editor.xhtml to /oils_rpt_param_editor.txt means that the sub-request to include that file does _not_ pass it through mod_xmlent, avoiding this problem. Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml index c0e44497ca..ce87872167 100644 --- a/Open-ILS/web/reports/oils_rpt_editor.xhtml +++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml @@ -76,7 +76,7 @@ --> - + + + + + + + + + + + + + + + + + + +
&reports.oils_rpt_param_editor.column;&reports.oils_rpt_param_editor.transform;&reports.oils_rpt_param_editor.action;&reports.oils_rpt_param_editor.user_params;
+ + + +
+ + +
+
+
- &reports.oils_rpt_param_editor.or; -
+ &reports.oils_rpt_param_editor.use_relative_date; +
+
+
+ +
+ + + + + + +
+ + + &reports.oils_rpt_param_editor.ago; +
+
+ + + + + diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml deleted file mode 100644 index 3e5bf197f7..0000000000 --- a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml +++ /dev/null @@ -1,134 +0,0 @@ -
-
- -
- - - - - - - - - - - - - - - - - - - -
&reports.oils_rpt_param_editor.column;&reports.oils_rpt_param_editor.transform;&reports.oils_rpt_param_editor.action;&reports.oils_rpt_param_editor.user_params;
- - - -
- - -
-
-
- &reports.oils_rpt_param_editor.or; -
- &reports.oils_rpt_param_editor.use_relative_date; -
-
-
- -
- - - - - - -
- - - &reports.oils_rpt_param_editor.ago; -
-
- -
- - -