[Yanel-commits] rev 60307 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

michi at wyona.com michi at wyona.com
Tue Aug 30 10:36:10 CEST 2011


Author: michi
Date: 2011-08-30 10:36:09 +0200 (Tue, 30 Aug 2011)
New Revision: 60307

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
notes about other formats and strpping everything but a specific tag added

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 08:17:30 UTC (rev 60306)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 08:36:09 UTC (rev 60307)
@@ -681,7 +681,11 @@
         String meta = request.getParameter(RESOURCE_META_ID_PARAM_NAME);
         if (meta != null) {
             if (meta.length() > 0) {
-                log.warn("TODO: meta: " + meta);
+                if (meta.equals("annotations")) {
+                    log.warn("TODO: Remove everything from the page meta document except the annotations");
+                } else {
+                    log.warn("Stripping everything from page meta document but '" + meta + "' not supported!");
+                }
             } else {
                 log.debug("Show all meta");
                 appendAnnotations(doc, res);
@@ -1557,14 +1561,20 @@
         
         try {
             String yanelFormat = request.getParameter("yanel.format");
-            if(yanelFormat != null && yanelFormat.equals("xml")) {
-                response.setContentType("application/xml; charset=" + DEFAULT_ENCODING);
-                XMLHelper.writeDocument(doc, response.getOutputStream());
+            if(yanelFormat != null) {
+                if (yanelFormat.equals("xml")) {
+                    response.setContentType("application/xml; charset=" + DEFAULT_ENCODING);
+                    XMLHelper.writeDocument(doc, response.getOutputStream());
 /*
-                OutputStream out = response.getOutputStream();
-                javax.xml.transform.TransformerFactory.newInstance().newTransformer().transform(new javax.xml.transform.dom.DOMSource(doc), new javax.xml.transform.stream.StreamResult(out));
-                out.close();
+                    OutputStream out = response.getOutputStream();
+                    javax.xml.transform.TransformerFactory.newInstance().newTransformer().transform(new javax.xml.transform.dom.DOMSource(doc), new javax.xml.transform.stream.StreamResult(out));
+                    out.close();
 */
+                } else if (yanelFormat.equals("json")) {
+                    log.error("TODO: JSON format not implemented yet!");
+                } else {
+                    log.error("No such format '" + yanelFormat + "' supported!");
+                }
             } else {
                 String mimeType = patchMimeType("application/xhtml+xml", request);
                 // TODO: doLogAccess



More information about the Yanel-commits mailing list