trans-coord/gnun/server/gnun expand-ssi.awk.in ...

[Ineiev]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Ineiev <ineiev> 21/11/30 02:55:14

Modified files:
        gnun/server/gnun: expand-ssi.awk.in NEWS ChangeLog 

Log message:
        Expand variables in 'include' directives.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/expand-ssi.awk.in?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.499&r2=1.500

Patches:
Index: expand-ssi.awk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/expand-ssi.awk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- expand-ssi.awk.in   31 Mar 2021 16:38:54 -0000      1.2
+++ expand-ssi.awk.in   30 Nov 2021 07:55:14 -0000      1.3
@@ -398,7 +398,7 @@
           pattern[1] = substr(pattern[2], 1, 1)
           idx1 = index(substr(pattern[2], 2), pattern[1])
           if(idx1 > 1)
-            name = substr(pattern[2], 2, idx1 - 1)
+            name = expand_var_value(substr(pattern[2], 2, idx1 - 1))
           else
             name = ""
           # Construct the real path to the file.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- NEWS        10 Sep 2021 18:25:47 -0000      1.153
+++ NEWS        30 Nov 2021 07:55:14 -0000      1.154
@@ -1,5 +1,11 @@
 GNUnited Nations NEWS - User visible changes.
 
+* Changes in GNUnited Nations 1.2 (????-??-??)
+
+* When validating HTML, expand variables in 'include' directives.
+  Both Apache 2.2 and 2.4 work this way, though the documentation
+  isn't clear on that.
+
 * Changes in GNUnited Nations 1.1 (2021-09-10)
 
 * When reporting unGNUNified translations, 'reports-summary' target

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -b -r1.499 -r1.500
--- ChangeLog   10 Sep 2021 18:17:55 -0000      1.499
+++ ChangeLog   30 Nov 2021 07:55:14 -0000      1.500
@@ -1,3 +1,8 @@
+2021-11-30  Pavel Kharitonov  <ineiev@gnu.org>
+
+       * expand-ssi.awk.in: Expand variables in 'include' directives.
+       * NEWS: Update.
+
 2021-09-10  Pavel Kharitonov  <ineiev@gnu.org>
 
        Release 1.1.