OpenMRS

Timestamp:

08/18/08 18:57:52 (5 months ago)

Author:

TorLye

Message:

gmapsimageviewer: Some cleaning up and removal of commented out code.

Files:

• openmrs-modules/gmapsimageviewer/web/src/org/openmrs/module/gmapsimageviewer/web/servlet/ImageAnnotationServlet.java (modified) (5 diffs)

openmrs-modules/gmapsimageviewer/web/src/org/openmrs/module/gmapsimageviewer/web/servlet/ImageAnnotationServlet.java

@@ -95 +95 @@
-        }
-
-        // File imageFile = ImageHandler.getComplexDataFile(complexObs);
-        // File metadataFile = new File(imageFile.getCanonicalPath() + ".xml");
-        //
-        // if (!metadataFile.exists()) {
-        // // Do something clever
-        // return;
-        // }
-        //
-        // if (!metadataFile.canRead()) {
-        // // do something clever
-        // return;
-        // }
-        //
-        // try {
-        //
-        //                        
-        // JSONArray jsonarray = new JSONArray();
-        //
-        // for (int i = 0; i < annotation.getLength(); i++) {
-        // JSONObject element = new JSONObject();
-        // Node node = annotation.item(i);
-        // NamedNodeMap attributes = node.getAttributes();
-        // String text = node.getTextContent();
-        // String date = attributes.getNamedItem("date").getNodeValue();
-        // String user = attributes.getNamedItem("userid").getNodeValue();
-        // String xcoordinate =
-        // attributes.getNamedItem("xcoordinate").getNodeValue();
-        // String ycoordinate =
-        // attributes.getNamedItem("ycoordinate").getNodeValue();
-        // 
-        // Pixel original = new Pixel(Integer.parseInt(xcoordinate),
-        // Integer.parseInt(ycoordinate));
-        // Pixel relative = original.convertFromOriginalSizeToZoomlevel(zoom,
-        // Pixel.getDimensionsFromImageFile(imageFile));
-        //                
-        // element.put("x", relative.x);
-        // element.put("y", relative.y);
-        // date = Context.getDateFormat().format(new
-        // Date(Long.parseLong(date)));
-        // user =
-        // Context.getUserService().getUser(Integer.parseInt(user)).getGivenName
-        // ();
-        // element.put("text", text + "<br/>Date: "+date+"<br/>User: "+user);
-        // jsonarray.put(element);
-        // }
-        //            
-        // JSONObject json = new JSONObject();
-        // json.put("annotation", jsonarray);
-        // log.info(json.toString(2));
-        // response.setContentType("text/json;charset=UTF-8");
-        // response.getOutputStream().println(json.toString());
-        // response.getOutputStream().close();
-        //
-        // } catch (JSONException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e);
-        // } catch (ParserConfigurationException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e);
-        // } catch (SAXException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e);
-        // }
-
-        log.info("gmapsimageviewer: Loading annotations complete");
-    }
@@ -196 +132 @@
-        }
-
-        //
-        // // Get the obs and open the xml metadata file
-
@@ -202 +137 @@
-        AnnotatedImage image = (AnnotatedImage) complexObs.getComplexData()
-                .getData();
-        // File imageFile = ImageHandler.getComplexDataFile(complexObs);
-        // File metadataFile = new File(imageFile.getCanonicalPath() + ".xml");
-
-        Pixel coordinate = new Pixel(x, y);
@@ -218 +151 @@
-                image.removeAnnotation(complexObs, annotation);
-            } else {
-                /*
-                 * AnnotatedImageHandler handler = (AnnotatedImageHandler)
-                 * Context .getObsService().getHandler("ImageHandler");
-                 * handler.saveAnnotation(complexObs, annotation, false);
-                 */
-                image.saveAnnotation(complexObs, annotation);
-            }
@@ -231 +159 @@
-        }
-
-        //
-        // DocumentBuilderFactory factory = DocumentBuilderFactory
-        // .newInstance();
-        // DocumentBuilder builder = factory.newDocumentBuilder();
-        // Document xmldoc;
-        //
-        // if (!metadataFile.exists()) {
-        // metadataFile.createNewFile();
-        // DOMImplementation domImpl = builder.getDOMImplementation();
-        // xmldoc = domImpl.createDocument(null, "Annotations", null);
-        // } else {
-        // xmldoc = builder.parse(metadataFile);
-        // }
-        // if (!metadataFile.canWrite() || !metadataFile.canRead())
-        // throw new IOException("Insufficient R/W permissions");
-        //
-        // Element root = xmldoc.getDocumentElement();
-        // Element e = xmldoc.createElementNS(null, "Annotation");
-        // Node n = xmldoc.createTextNode(message);
-        // e.setAttributeNS(null, "xcoordinate", coordinate.x + "");
-        // e.setAttributeNS(null, "ycoordinate", coordinate.y + "");
-        // e.setAttributeNS(null, "userid", Context.getUserContext()
-        // .getAuthenticatedUser().getUserId()
-        // + "");
-        // e.setAttributeNS(null, "date", new Date().getTime() + "");
-        // e.appendChild(n);
-        // root.appendChild(e);
-        //
-        // Transformer transformer = TransformerFactory.newInstance()
-        // .newTransformer();
-        // transformer.setOutputProperty(OutputKeys.ENCODING, "UTF8");
-        // transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-        // transformer.transform(new DOMSource(xmldoc), new StreamResult(
-        // metadataFile));
-        //
-        response.setStatus(HttpServletResponse.SC_OK);
-        response.getOutputStream().println("OK");
-        log.info("gmapsimageviewer: Saving annotation complete");
-        // } catch (ParserConfigurationException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e.getMessage(), e);
-        // } catch (TransformerConfigurationException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e.getMessage(), e);
-        // } catch (TransformerFactoryConfigurationError e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e.getMessage(), e);
-        // } catch (TransformerException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e.getMessage(), e);
-        // } catch (SAXException e) {
-        // log.error(e.getMessage(), e);
-        // throw new ServletException(e.getMessage(), e);
-        // }
-    }
-}