maven-xsddoc-plugin/src/plugin-resources xsddoc-report.jsl,1.8,1.9

Kurt Riede <[email protected]> Tue, 17 May 2005 22:11:20 +0000
Newsgroups gmane.text.xml.xframe.xsddoc.devel
Message-ID <[email protected]>
Update of /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/src/plugin-resources

Modified Files:
	xsddoc-report.jsl 
Log Message:
improved reporting of errors/warnings/broken links

Index: xsddoc-report.jsl
===================================================================
RCS file: /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources/xsddoc-report.jsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xsddoc-report.jsl	10 May 2005 16:21:44 -0000	1.8
--- xsddoc-report.jsl	17 May 2005 22:11:18 -0000	1.9
***************
*** 39,44 ****
              <j:set var="files"><x:expr select="count(xsddoc)"/></j:set>
              <j:set var="success"><x:expr select="count(xsddoc[@result = 'success' and @linkcheck = 'OK'])"/></j:set>
!             <j:set var="linkcheck"><x:expr select="count(xsddoc[@linkcheck != 'OK'])"/></j:set>
!             <j:set var="errors"><x:expr select="${files} - ${success}"/></j:set>
              <j:set var="percentage"><x:expr select="(${success} div ${files}) * 100"/></j:set>
              <a name="summary"></a>
--- 39,45 ----
              <j:set var="files"><x:expr select="count(xsddoc)"/></j:set>
              <j:set var="success"><x:expr select="count(xsddoc[@result = 'success' and @linkcheck = 'OK'])"/></j:set>
!             <j:set var="broken"><x:expr select="count(xsddoc[@linkcheck != 'OK'])"/></j:set>
!             <j:set var="errors"><x:expr select="count(xsddoc[@result = 'failed'])"/></j:set>
!             <j:set var="warnings"><x:expr select="count(xsddoc[@result = 'warning'])"/></j:set>
              <j:set var="percentage"><x:expr select="(${success} div ${files}) * 100"/></j:set>
              <a name="summary"></a>
***************
*** 49,55 ****
                    <th>Files</th>
                    <th>
!                     <a href="#errors">Errors</a>
                    </th>
-                   <th>with broken links</th>
                    <th>success</th>
                    <th>success [%]</th>
--- 50,76 ----
                    <th>Files</th>
                    <th>
!                     <j:choose>
!                       <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}">
!                         <a href="#errors">errors</a>
!                       </j:when>
!                       <j:otherwise>errors</j:otherwise>
!                     </j:choose>
!                   </th>
!                   <th>
!                     <j:choose>
!                       <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}">
!                         <a href="#errors">warnings</a>
!                       </j:when>
!                       <j:otherwise>warnings</j:otherwise>
!                     </j:choose>
!                   </th>
!                   <th>
!                     <j:choose>
!                       <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}">
!                         <a href="#errors">with broken links</a>
!                       </j:when>
!                       <j:otherwise>with broken links</j:otherwise>
!                     </j:choose>
                    </th>
                    <th>success</th>
                    <th>success [%]</th>
***************
*** 60,64 ****
                    <td>${files}</td>
                    <td>${errors}</td>
!                   <td>${linkcheck}</td>
                    <td>${success}</td>
                    <td>${percentage}</td>
--- 81,86 ----
                    <td>${files}</td>
                    <td>${errors}</td>
!                   <td>${warnings}</td>
!                   <td>${broken}</td>
                    <td>${success}</td>
                    <td>${percentage}</td>
***************
*** 81,88 ****
                  <tr>
                    <td>
!                     <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a>
                    </td>
                    <td>
!                     <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a>
                    </td>
                  </tr>
--- 103,110 ----
                  <tr>
                    <td>
!                     <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a>
                    </td>
                    <td>
!                     <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a>
                    </td>
                  </tr>
***************
*** 90,96 ****
              </tbody>
            </table>
!           <a name="errors"></a>
!           <h2>xsddoc errors</h2>
!           <j:if test="${errors != 0}">
              <table>
                <thead>
--- 112,118 ----
              </tbody>
            </table>
!           <j:if test="${(errors != 0) or (warnings != 0) or (broken != 0)}">
!             <a name="errors"></a>
!             <h2>Files with Errors, Warnings or Broken Links</h2>
              <table>
                <thead>
***************
*** 103,120 ****
                </thead>
                <tbody>
!                 <x:set var="docs" select="xsddoc[@result != 'success']"/>
                  <j:forEach var="doc" items="${docs}">
                    <tr>
                      <td>
!                       <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a>
                      </td>
                      <td>
!                       <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a>
                      </td>
                      <td>
!                       <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a>
                      </td>
                      <td>
!                       <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a>
                      </td>
                    </tr>
--- 125,142 ----
                </thead>
                <tbody>
!                 <x:set var="docs" select="xsddoc[(@result != 'success') or (@linkcheck != 'OK')]"/>
                  <j:forEach var="doc" items="${docs}">
                    <tr>
                      <td>
!                       <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a>
                      </td>
                      <td>
!                       <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a>
                      </td>
                      <td>
!                       <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a>
                      </td>
                      <td>
!                       <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a>
                      </td>
                    </tr>



-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click