trans-coord/gnun/server/gnun ChangeLog gnun-val...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/10/18 04:49:36

Modified files:
        gnun/server/gnun: ChangeLog gnun-validate-html.in 
                          validate-html-notify.in 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        Add expanded HTML to validate-html-notify reports.
        Suggested by Jan Owoc.
        
        * gnun-validate-html.in: Add the `-v, --verbose' option;
        append the expanded HTML after xmllint error report (if any)
        in the verbose mode.
        * validate-html-notify.in: Use `gnun-validate-html' in its
        verbose mode.
        * doc/gnun.texi (gnun-validate-html): Document the `-v, --verbose' 
option.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.298&r2=1.299
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/validate-html-notify.in?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- ChangeLog   5 Oct 2012 16:32:18 -0000       1.298
+++ ChangeLog   18 Oct 2012 04:49:36 -0000      1.299
@@ -1,3 +1,16 @@
+2012-10-18  Pavel Kharitonov  <address@hidden>
+
+       Add expanded HTML to validate-html-notify reports.
+       Suggested by Jan Owoc.
+
+       * gnun-validate-html.in: Add the `-v, --verbose' option;
+       append the expanded HTML after xmllint error report (if any)
+       in the verbose mode.
+       * validate-html-notify.in: Use `gnun-validate-html' in its
+       verbose mode.
+       * doc/gnun.texi (gnun-validate-html): Document
+       the `-v, --verbose' option.
+
 2012-10-05  Pavel Kharitonov  <address@hidden>
 
        Make the `<span class="gnun-split"></span>' separator work

Index: gnun-validate-html.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnun-validate-html.in       31 May 2012 04:44:42 -0000      1.16
+++ gnun-validate-html.in       18 Oct 2012 04:49:36 -0000      1.17
@@ -34,6 +34,8 @@
 Options:
       --expand-to=FILE       Specify file to output expanded HTML
       --root=DIRECTORY       Specify top directory for working copy
+  -v, --verbose              Produce more verbose output intended
+                               for email reports
       --version              Display version info and exit
       --help                 Display this help and exit
 
@@ -49,6 +51,7 @@
 params=$#
 ROOT=../..
 OUTPUT=
+verbose=no
 
 while [ ${params} -ge 1 ]; do
   case "$1" in
@@ -60,6 +63,9 @@
          version
          exit 0
          ;;
+      -v | --verbose )
+         verbose=yes
+         ;;
       --root )
          shift
          params=$((${params}-1))
@@ -167,5 +173,12 @@
      e
   }' $TMP2
 
+case $LINTSTATUS-$verbose in
+  0-* ) ;;
+  *-yes )
+    echo Expanded HTML file as it was validated is:
+    cat "${OUTPUT}"
+esac
+
 # Exit with xmlint's original exit status.
 exit $LINTSTATUS

Index: validate-html-notify.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/validate-html-notify.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- validate-html-notify.in     8 Feb 2012 20:29:44 -0000       1.9
+++ validate-html-notify.in     18 Oct 2012 04:49:36 -0000      1.10
@@ -50,4 +50,4 @@
 SUBJ="[GNUN Error] ${FILE#../../} is not valid HTML"
 
 @pkglibexecdir@/mailfail $DRY_RUN "$RCPT" "$SUBJ" \
-  @bindir@/gnun-validate-html "$FILE"
+  @bindir@/gnun-validate-html --verbose "$FILE"

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- doc/gnun.texi       4 Oct 2012 14:43:18 -0000       1.61
+++ doc/gnun.texi       18 Oct 2012 04:49:36 -0000      1.62
@@ -2223,6 +2223,11 @@
 @item address@hidden
 Save the expanded HTML as @var{file}.
 
address@hidden -v, --verbose
+Produce more detailed output intended for automatic email reports;
+essentially, it adds the expanded HTML to facilitate finding errors
+by people who receive the report.
+
 @item --version
 Display copyright and version information and exit.