Updates for appspot

[zxing.git] / zxingorg / web / decoderesult.jspx
diff --git a/zxingorg/web/decoderesult.jspx b/zxingorg/web/decoderesult.jspx

index df90640..2f525af 100644 (file)
--- a/zxingorg/web/decoderesult.jspx
+++ b/zxingorg/web/decoderesult.jspx
@@ -14,17 +14,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<!-- Author: Sean Owen (srowen@google.com) -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<!-- Author: Sean Owen -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
    <jsp:output
            omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
-          doctype-system="http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"/>
-  <jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:directive.page contentType="text/html" session="false"/>
    <jsp:scriptlet>response.setHeader("Cache-Control", "no-cache");</jsp:scriptlet>
    <jsp:useBean id="result" scope="request" type="com.google.zxing.Result"/>
    <jsp:useBean id="parsedResult" scope="request" type="com.google.zxing.client.result.ParsedResult"/>
    <jsp:useBean id="rawBytesString" scope="request" type="java.lang.String"/>
+  <jsp:useBean id="text" scope="request" type="java.lang.String"/>
+  <jsp:useBean id="displayResult" scope="request" type="java.lang.String"/>  
    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
      <head>
        <title>Decode Succeeded</title>
@@ -37,7 +39,7 @@
        <table>
          <tr>
            <td>Raw text</td>
-          <td>${result.text}</td>
+          <td>${text}</td>
          </tr>
          <tr>
            <td>Raw bytes</td>
@@ -49,11 +51,11 @@
          </tr>
          <tr>
            <td>Parsed Result Type</td>
-          <td>${parsedReaderResult.type}</td>
+          <td>${parsedResult.type}</td>
          </tr>
          <tr>
            <td>Parsed Result</td>
-          <td>${parsedReaderResult.displayResult}</td>
+          <td>${displayResult}</td>
          </tr>
        </table>
        <p>Copyright 2008 ZXing authors</p>