Subversion Repositories eFlore/Applications.del

Rev

Rev 773 | Rev 843 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 773 Rev 802
Line 24... Line 24...
24 
		nbTotalObservationsPourLaRecherche = (int) total;
 24 
		nbTotalObservationsPourLaRecherche = (int) total;
25 
		JSONObject tableauObs = retourJson.isObject().get("resultats").isObject();
 25 
		JSONObject tableauObs = retourJson.isObject().get("resultats").isObject();
Line 26... Line 26...
26
26
Line -... Line 27...
- 
 
 27 
		observations = new ArrayList<Observation>();
27 
		observations = new ArrayList<Observation>();
 28
28
29 
		if(tableauObs != null) {
29 
		java.util.Iterator<String> it = tableauObs.keySet().iterator();
 - 
 
30 
		while (it.hasNext()) {
 - 
 
31
- 
 
32 
			JSONObject observationJson = tableauObs.get(it.next()).isObject();
 - 
 
33 
			Observation observation = UtilitairesServiceResultat.parserObservationEtCreerPropositionDetermination(observationJson);
 - 
 
34
- 
 
35 
			JSONArray tableauImagesObs = observationJson.get("images").isArray();
 - 
 
36 
			List<Image> imagesPourObs = new ArrayList<Image>();
 - 
 
37
- 
 
38 
			int nbImages = tableauImagesObs.size();
 - 
 
Line -... Line 30...
- 
 
 30 
			java.util.Iterator<String> it = tableauObs.keySet().iterator();
- 
 
 31 
			while (it.hasNext()) {
- 
 
 32
- 
 
 33 
				JSONObject observationJson = tableauObs.get(it.next()).isObject();
- 
 
 34 
				Observation observation = UtilitairesServiceResultat.parserObservationEtCreerPropositionDetermination(observationJson);
- 
 
 35
- 
 
 36 
				JSONArray tableauImagesObs = observationJson.get("images").isArray();
- 
 
 37 
				List<Image> imagesPourObs = new ArrayList<Image>();
- 
 
 38
- 
 
 39 
				int nbImages = tableauImagesObs.size();
39 
			for (int j = 0; j < nbImages; j++) {
 40 
				for (int j = 0; j < nbImages; j++) {
40 
				JSONObject imageJson = tableauImagesObs.get(j).isObject();
 41 
					JSONObject imageJson = tableauImagesObs.get(j).isObject();
41
42
- 
 
 43 
					Image image = UtilitairesServiceResultat.parserImageJSON(imageJson);
- 
 
 44 
					image.setObservation(observation);
- 
 
 45 
					imagesPourObs.add(image);
- 
 
 46 
				}
42 
				Image image = UtilitairesServiceResultat.parserImageJSON(imageJson);
 47
43 
				image.setObservation(observation);
 - 
 
44 
				imagesPourObs.add(image);
 - 
 
45 
			}
 - 
 
46
48 
				observation.setImages(imagesPourObs);
47 
			observation.setImages(imagesPourObs);
 49 
				observations.add(observation);
Line 48... Line 50...
48 
			observations.add(observation);
 50 
			}
49 
		}
 51 
		}