Thread: [X3d-commits] SF.net SVN: x3d:[10764] www.web3d.org/x3d/tools/X3dQualityAssurance/ X3dValidator

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10764
          http://x3d.svn.sourceforge.net/x3d/?rev=10764&view=rev
Author:   brutzman
Date:     2012-04-06 14:18:41 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
appearance and links

Modified Paths:
--------------
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Index.java
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Validator.java
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/xindex.html

Added Paths:
-----------
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/X3DtextIcon16.png
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/web3d_logo2.png
    www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/x3d2-s.gif

Modified: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Index.java
===================================================================

--- www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Index.java	2012-04-06 13:44:23 UTC (rev 10763)
+++ www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Index.java	2012-04-06 14:18:41 UTC (rev 10764)
@@ -133,6 +133,9 @@
           }
           else {
             tempF = new File(tempDir, fsName);
+            // TODO what is local path on client machine?
+//            String filePath = clientPath + "/" + fsName;
+//            sb.append("URL: ");sb.append("<a href='file:/").append(filePath).append("'>").append(filePath).append("</a>").append("\n");
             doValidate(sb, fsName, tempF);
           }
         }
@@ -154,7 +157,8 @@
           HttpEntity entity = hresp.getEntity();
           if (entity != null) {
             tempF2 = copyFile(entity.getContent(), simpleName);
-            sb.append("URL: ");sb.append(myurl);sb.append("\n");
+//            sb.append("URL: ");
+            sb.append("<a href='").append(myurl).append("'>").append(myurl).append("</a>").append("\n\n");
             doValidate(sb, simpleName, tempF2);
           }
           else {
@@ -192,14 +196,15 @@
 
   private void doValidate(StringBuilder sb, String simpleName, File f) throws Exception
   {
-    sb.append("File: ");
+//    sb.append("File: ");
+    sb.append("<b>");
     sb.append(simpleName);
-    sb.append(" / ");
+    sb.append("</b>  ");
 
-    sb.append("length: ");
+    sb.append("(length: ");
     sb.append(f.length());       
-    sb.append("\n");
-    sb.append(Validator.validate(f));
+    sb.append(" bytes)\n");
+    sb.append(Validator.validate(f)); 
   }
 
   private File copyFile(InputStream inStr, String filename) throws IOException

Modified: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Validator.java
===================================================================
--- www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Validator.java	2012-04-06 13:44:23 UTC (rev 10763)
+++ www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/src/java/edu/nps/moves/x3d/Validator.java	2012-04-06 14:18:41 UTC (rev 10764)
@@ -80,8 +80,22 @@
   }
   private static void appendStart(StringBuilder sb, String passName)
   {
-    sb.append("\n<b>Beginning ");
-    sb.append(passName);
+      appendStart (sb, passName, "");
+  }
+  private static void appendStart(StringBuilder sb, String passName, String referenceUrl)
+  {
+    sb.append("\n<b>Performing ");
+    if (referenceUrl.isEmpty())
+    {
+        sb.append(passName);
+    }
+    else
+    {
+        sb.append("<a href='").append(referenceUrl).append("' target='X3dValidatorReference'>");
+        sb.append(passName.substring(0,passName.indexOf(" check"))); // first part
+        sb.append("</a>");
+        sb.append(passName.substring(passName.indexOf(" check")));   // last part
+    }
     sb.append("...</b>\n");
   }
   
@@ -94,16 +108,21 @@
     
     try {
       String passName;
+      String referenceUrlDoctype       = "http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html#Validation";
+      String referenceUrlWellFormed    = "http://en.wikipedia.org/wiki/XML#Well-formedness_and_error-handling";
+      String referenceUrlDtdSchema     = "http://www.web3d.org/specifications";
+      String referenceUrlDtdSchematron = "http://www.web3d.org/x3d/tools/schematron/X3dSchematron.html";
+      // TODO X3dToClassicVrml, regex
       
       /* DOCTYPE */
-      appendStart(sb, passName="DOCTYPE check");
+      appendStart(sb, passName="DOCTYPE check", referenceUrlDoctype);
       String validationLog = new X3dDoctypeCheckerModified().processScene(f.getAbsolutePath());
       sb.append(escapeHtml(validationLog));
       sb.append("\n");      
       appendResults(sb,passName,validationLog.contains(X3dDoctypeChecker.errorToken) || validationLog.contains(X3dDoctypeChecker.warningToken));
 
       /* Well formed */
-      appendStart(sb, passName="XML well-formed check");
+      appendStart(sb, passName="XML well-formed check", referenceUrlWellFormed);
       SAXParserFactory factory = SAXParserFactory.newInstance();
       factory.setValidating(false);      // Turn off validation
       factory.setSchema(null);
@@ -113,8 +132,8 @@
       parser.parse(f, hand);
       appendResults(sb,passName,hand.error);
 
-      /* DTD validation */
-      appendStart(sb,passName="DTD validation");
+      /* X3D DTD validation */
+      appendStart(sb,passName="X3D DTD validation check", referenceUrlDtdSchema);
       factory.setValidating(true);
       factory.setSchema(null);
       parser = factory.newSAXParser();
@@ -123,7 +142,7 @@
       appendResults(sb,passName,hand.error);
 
       /* Schema validation */
-      appendStart(sb,passName="schema validation");
+      appendStart(sb,passName="X3D schema validation check", referenceUrlDtdSchema);
       factory.setValidating(true);
       factory.setNamespaceAware(true);
       parser = factory.newSAXParser();
@@ -163,7 +182,7 @@
       classicVrmlOutput.delete();
       
       /* schematron */
-      appendStart(sb,passName="X3D Schematron check");
+      appendStart(sb,passName="X3D Schematron check", referenceUrlDtdSchematron);
       xmlSource = new StreamSource(new FileInputStream(f));
       xslSource = new StreamSource(Validator.class.getResourceAsStream("/stylesheets/X3dSchematronValidityChecks.xslt"));
       File schematronOutput = File.createTempFile(f.getName() + "_", "_schematronOutput_1.txt");
@@ -195,7 +214,7 @@
       schematronOutput.delete();
 
       /* regex */
-      appendStart(sb,passName="Integer/float regular expression checker");
+      appendStart(sb,passName="Integer/float regular expression (regex) checker");
       Log4JListener.sb = sb;
       int numMessages = Log4JListener.numMessages;
       

Added: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/X3DtextIcon16.png
===================================================================
(Binary files differ)


Property changes on: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/X3DtextIcon16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/web3d_logo2.png
===================================================================
(Binary files differ)


Property changes on: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/web3d_logo2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/x3d2-s.gif
===================================================================
(Binary files differ)


Property changes on: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/images/x3d2-s.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/xindex.html
===================================================================
--- www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/xindex.html	2012-04-06 13:44:23 UTC (rev 10763)
+++ www.web3d.org/x3d/tools/X3dQualityAssurance/X3dValidator/web/xindex.html	2012-04-06 14:18:41 UTC (rev 10764)
@@ -1,10 +1,15 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel="icon" href="images/X3DtextIcon16.png" title="X3D" type="image/png"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>X3D Validator</title>
-    <meta name="generator" content="Netbeans"/>
+    <meta name="creator" content="Mike Bailey, Don McGregor and Don Brutzman"/>
+    <meta name="created" content="28 Maarch 2012"/>
+    <meta name="generator" content="Netbeans 7.1"/>
     <meta name="reference" content="https://savage.nps.edu/X3dValidator"/>
+    <meta name="reference" content="http://www.web3d.org/x3d/content/examples/X3dResources.html"/>
+    <meta name="reference" content="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html"/>
 
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
     <script type="text/javascript">
@@ -13,27 +18,27 @@
         {
           var fileTF = $("#fileRadio").attr("checked");
           if(fileTF) {
-            $("#browseButt").removeAttr("disabled");
+            $("#browseButton").removeAttr("disabled");
             $("#webUrlTextField").attr('disabled','disabled');
             checkFileNonNull();
           }
           else {
             $("#webUrlTextField").removeAttr("disabled");
-            $("#browseButt").attr('disabled','disabled');
+            $("#browseButton").attr('disabled','disabled');
             checkWebNonNull();
           }
         });
         
-        $("#browseButt").click(function()
+        $("#browseButton").click(function()
         {
-          $("#submitButt").removeAttr("disabled");
+          $("#submitButton").removeAttr("disabled");
           return true;
         });
         
         $("#myform").submit(function()
         {
-          $("#submitButt").attr('disabled', 'disabled');
-          $("#resultsDiv").html('<center>Working.......</center>');
+          $("#submitButton").attr('disabled', 'disabled');
+          $("#resultsDiv").html('<center>Working ...</center>');
           return true;
         });
         
@@ -46,45 +51,74 @@
       function checkWebNonNull()
       {
         if($('#webUrlTextField').val().length > 0)
-          $("#submitButt").removeAttr("disabled");
-        else
-          $("#submitButt").attr('disabled', 'disabled');        
+        {
+          $("#webRadio").attr("checked");
+          $("#submitButton").removeAttr("disabled");
+        }
+        else if($("#browseButton").val().length > 0)
+          $("#submitButton").attr('disabled', 'disabled');        
       }
       
       function checkFileNonNull()
       {
-        if($("#browseButt").val().length > 0)
-         $("#submitButt").removeAttr("disabled");
-        else
-          $("#submitButt").attr('disabled', 'disabled');        
+        if($("#browseButton").val().length > 0)
+        {
+          $("#fileRadio").attr("checked");
+          $("#submitButton").removeAttr("disabled");
+        }
+        else if($('#webUrlTextField').val().length > 0)
+          $("#submitButton").attr('disabled', 'disabled');        
       } 
       
      </script>
   </head>
   <body>
-  <center>
-    <h1>X3D Validator</h1>
-    <p>This site allows checking of X3D scene graphs.</p>
-  <form id="myform" action="<--APP_CONTEXT-->/process" method="post" enctype="multipart/form-data">
+            
+    <table border="0" cellspacing="0" cellpadding="0" summary="" align="center">
+        <tr align="center">
+            <td><a href="http://www.web3d.org/x3d/content/examples/X3dResources.html"><img src="images/x3d2-s.gif" width="154" height="97" border="0" title="to X3D Resources page"></a></td> <!--  alt="to X3D home page" -->
+            <td><pre>   </pre></td>
+            <td><h1>X3D Validator</h1><p align='center'>This site checks X3D scene validity.</p></td>
+            <td><pre>   </pre></td>
+            <td><a href="http://www.web3d.org"><img src="images/web3d_logo2.png" width="120" height="60" border="0" title="to Web3D home page"></a></td> <!--  alt="to X3D home page" -->
+        </tr>
+    </table>
+    
+  <center>  
+  <form id="myform" action="<--APP_CONTEXT-->" method="post" enctype="multipart/form-data">
     <table border="1" rules="none">
-      <tr><td><input id="fileRadio" type="radio" name="method" value="file" checked="checked"/> Choose an X3D file from your local computer:</td></tr>
-      <tr><td><input id="browseButt" type="file" name="filename" size="60"/></td></tr>
-      <tr><td>&nbsp;</td></tr>
-      <tr><td><input id="webRadio" type="radio" name="method" value="web"/> Enter a web url:</td></tr>
-      <tr><td><input id="webUrlTextField" type="text" name="url" size="75" disabled="disabled"/></td></tr>      
+      <tr><td align="left"><input id="fileRadio" type="radio" name="method" value="file" checked="checked"/> Choose a local .x3d file:</td></tr>
+      <tr><td align="full"><input id="browseButton" type="file" name="filename" size="100"/></td></tr>
+      <tr><td align="left">&nbsp;</td></tr>
+      <tr><td align="left"><input id="webRadio" type="radio" name="method" value="web"/> Enter an online .x3d url:</td></tr>
+      <tr><td align="left"><input id="webUrlTextField" type="text" name="url" size="100" disabled="disabled"/></td></tr>      
     </table>
     <br />
     <table>
+        <!--
       <tr><td>Upload the file and begin analysis:<br/></td></tr>
-      <tr><td align="center"><input id="submitButt" disabled="disabled" type="submit" value="Upload and Begin"/></td></tr>
+        -->
+      <tr><td align="center"><input id="submitButton" disabled="disabled" type="submit" value="Upload and Analyze"/></td></tr>
     </table>
   </form>
   </center>
   <br/>
-  <div id="resultsDiv" style="background-color:#eeeeee;margin-left:100px;margin-right:100px;border:1px solid grey;white-space:pre-line;"><pre><!--DELIMITER--></pre></div>
+  
+  <div id="resultsDiv" style="background-color:#eeeeee;margin-left:100px;margin-right:100px;border:1px solid grey;white-space:pre-line;"><p><!--DELIMITER--></p></div>
+  
   <p align='center'>
-      Updated 5 April 2012, available at
+      Updated 5 April 2012, this
+      <a href="https://savage.nps.edu/X3dValidator">X3D Validator</a>
+      is available online at
       <a href="https://savage.nps.edu/X3dValidator">https://savage.nps.edu/X3dValidator</a>
   </p>
+  
+  <p align="center">
+         <a href="http://www.nps.navy.mil/disclaimer" target="disclaimer">Official disclaimer</a>:
+"Material contained herein is made available for the purpose of
+peer review and discussion and does not necessarily reflect the
+views of the Department of the Navy or the Department of Defense."
+  </p>
+  
 </body>
 </html>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [X3d-commits] SF.net SVN: x3d:[10764] www.web3d.org/x3d/tools/X3dQualityAssurance/ X3dValidator

X3D is the open-standard format for 3D graphics scenes on the Web.

x3d-commits