[Yanel-commits] rev 22165 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

michi at wyona.com michi at wyona.com
Thu Jan 25 15:28:55 CET 2007


Author: michi
Date: 2007-01-25 15:28:54 +0100 (Thu, 25 Jan 2007)
New Revision: 22165

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
descriptor fixed

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-01-25 14:21:23 UTC (rev 22164)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-01-25 14:28:54 UTC (rev 22165)
@@ -273,7 +273,19 @@
                         log.debug("Resource is viewable V1");
                         Element viewElement = (Element) resourceElement.appendChild(doc.createElement("view"));
                         viewElement.setAttributeNS(NAMESPACE, "version", "1");
-                        viewElement.appendChild(doc.createTextNode("View Descriptors: " + ((ViewableV1) res).getViewDescriptors()));
+
+                        // TODO: The same as for ViewableV2 ...
+                        ViewDescriptor[] vd = ((ViewableV1) res).getViewDescriptors();
+                        if (vd != null) {
+                            for (int i = 0; i < vd.length; i++) {
+                                Element descriptorElement = (Element) viewElement.appendChild(doc.createElement("descriptor"));
+                                descriptorElement.appendChild(doc.createTextNode(vd[i].getMimeType()));
+                                descriptorElement.setAttributeNS(NAMESPACE, "id", vd[i].getId());
+                            }
+                        } else {
+                            viewElement.appendChild(doc.createTextNode("No View Descriptors!"));
+                        }
+
                         String viewId = request.getParameter("yanel.resource.viewid");
                         try {
                             view = ((ViewableV1) res).getView(request, viewId);
@@ -314,6 +326,7 @@
                         } else {
                             viewElement.appendChild(doc.createTextNode("No View Descriptors!"));
                         }
+
                         size = ((ViewableV2) res).getSize();
                         Element sizeElement = (Element) resourceElement.appendChild(doc.createElement("size"));
                         sizeElement.appendChild(doc.createTextNode(String.valueOf(size)));




More information about the Yanel-commits mailing list