Changeset 1035

Timestamp:

06/22/09 12:38:45 (4 years ago)

Author:

buleth

Message:

 

Files:

• trunk/mpdb-server/src/edu/rpi/metpetdb/server/search/SearchIPhone.java (modified) (10 diffs)

trunk/mpdb-server/src/edu/rpi/metpetdb/server/search/SearchIPhone.java

@@ -20 +20 @@
 import edu.rpi.metpetdb.client.model.MetamorphicGrade;
 import edu.rpi.metpetdb.client.model.Sample;
+import edu.rpi.metpetdb.client.model.SampleComment;
 import edu.rpi.metpetdb.client.model.SampleMineral;
 import edu.rpi.metpetdb.client.model.SearchSample;
@@ -45 +46 @@
                 
                 List<Long> sampleIds = new ArrayList<Long>();
+                Session session = DataStore.open();
+                try{
                 
                 // If there is a GET string for latitude and longitude then it is a search
@@ -51 +54 @@
                         double lng = Double.parseDouble(request.getParameterValues(LONG_PARAMETER)[0]);
                         System.out.println("iPhone query: lat = " + lat + "long = " + lng);
-                        outputSearchXML(search(lat,lng),response);
+                        outputSearchXML(search(lat,lng, session),response);
                 } else if (request.getParameter(SEARCH_REGIONS) != null){
                         Set<String> regions = new HashSet<String>();
@@ -59 +62 @@
                                 }
                         }
-                        outputSearchXML(search(regions),response);
+                        outputSearchXML(search(regions, session),response);
                 } else if (request.getParameter(SAMPLE_ID) != null){
                         for (String id : request.getParameterValues(SAMPLE_ID))
@@ -74 +77 @@
                 }
                 return;
+                }
+                catch(Exception e){
+                        throw new IllegalStateException(e.getMessage());
+                } finally {
+                        session.close();
+                }
         }
                 
@@ -83 +92 @@
                 } catch(final Exception ioe){
                         throw new IllegalStateException(ioe.getMessage());
-                }
+                } 
         }
         
@@ -130 +139 @@
                                 x.toXML(sample.getLocation(),response.getWriter());
                                 response.getWriter().write(createXMLElement("owner",x.toXML(sample.getOwner().getName())));
+                                response.getWriter().write("<comments>");
+                                
+                                for (SampleComment sc : sample.getComments())
+                                        x.toXML(sc.getText() , response.getWriter());
+                                response.getWriter().write("</comments>");
                                 response.getWriter().write("</sample>");
                         }
@@ -138 +152 @@
         }
         
-        private Results<Sample> search(final Collection<String> regions){
-                Session session = DataStore.open();
+        private Results<Sample> search(final Collection<String> regions, Session session){
                 try{
                         SearchSample s = new SearchSample();
@@ -145 +158 @@
                                 s.addRegion(r);
                         }       
-                        return search(s);
-                }
-                catch (Exception e){
-                        throw new IllegalStateException(e.getMessage());
-                } finally{
-                        session.close();
-                }
-        }
-        
-        private Results<Sample> search(final SearchSample s){
-                Session session = DataStore.open();
-                try{
-                        return SearchDb.sampleSearch(null, s, null, session);
+                        return search(s, session);
                 }
                 catch(Exception e){
                         throw new IllegalStateException(e.getMessage());
-                } finally {
-                        session.close();
-                }
-        }
-
-        private Results<Sample> search(final Double lat, final Double lng){             
+                }
+                        
+                
+        }
+        
+        private Results<Sample> search(final SearchSample s, Session session){
+                try{
+                        return SearchDb.sampleSearch(null, s, null, session);
+                }
+                catch(Exception e){
+                        throw new IllegalStateException(e.getMessage());
+                }
+        }
+
+        private Results<Sample> search(final Double lat, final Double lng, Session session){            
                 try{
                         SearchSample s = new SearchSample();
@@ -198 +208 @@
                         boundingBox.dimension = 2;
                         s.setBoundingBox(boundingBox);
-                        return search(s);
+                        return search(s, session);
 
                 } catch (final Exception ioe){