Subversion Repositories eFlore/Archives.cel-v2

Rev

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

Rev 18 Rev 22
Line 13... Line 13...
13 
 * plutôt les informations associées ainsi que l'url distante
13 
 * plutôt les informations associées ainsi que l'url distante
14 
 *
14 
 *
15 
 */
 15 
 */
16 
public class ImageCarnet extends HashMap {
 16 
public class ImageCarnet extends HashMap {
Line 17... Line -...
17
- 
 
18 
	/*
 - 
 
19 
	// infos sur l'image
 - 
 
20 
	private String url = " " ;
 - 
 
21 
	private String ordre = " " ;
 - 
 
22 
	private String utilisateur = " " ;
 - 
 
23 
	private boolean publiable = false ;
 - 
 
24 
	private String height = "0" ;
 - 
 
25 
	private String width = "0" ;
 - 
 
26 
	private String make = " " ;
 - 
 
27 
	private String model = " " ;
 - 
 
28 
	private String xResolution = "0" ;
 - 
 
29 
	private String yResolution = "0" ;
 - 
 
30 
	private String date = " " ;
 - 
 
31 
	private String GPS = " " ;
 - 
 
32 
	private String comment = " " ;
 - 
 
33
- 
 
34 
	// metadonnees exif
 - 
 
35 
	private String exifExposureTime = " " ;
 - 
 
36 
	private String exifFNumber = " " ;
 - 
 
37 
	private String exifVersion = " " ;
 - 
 
38 
	private String exifCompressedBitsPerPixel = " " ;
 - 
 
39 
	private String exifShutterSpeedValue = " " ;
 - 
 
40 
	private String exifApertureValue = " " ;
 - 
 
41 
	private String exifExposureBiasValue = " " ;
 - 
 
42 
	private String exifMaxApertureValue = " " ;
 - 
 
43 
	private String exifMeteringMode = " " ;
 - 
 
44 
	private String exifLightSource = " " ;
 - 
 
45 
	private String exifFlash = "  " ;
 - 
 
46 
	private String exifFocalLength = " " ;
 - 
 
47 
	private String exifFlashPixVersion = " " ;
 - 
 
48 
	private String exifColorSpace = " " ;
 - 
 
49 
	private String exifInteroperabilityOffset = " " ;
 - 
 
50 
	private String exifFocalPlaneXResolution = " " ;
 - 
 
51 
	private String exifFocalPlaneYResolution = " " ;
 - 
 
52 
	private String exifFocalPlaneResolutionUnit = " " ;
 - 
 
53 
	private String exifSensingMethod = " " ;
 - 
 
54 
	private String exifFileSource = " " ;
 - 
 
55 
	private String exifCustomRendered = " " ;
 - 
 
56 
	private String exifExposureMode = " " ;
 - 
 
57 
	private String exifWhiteBalance = " " ;
 - 
 
58 
	private String exifDigitalZoomRatio = " " ;
 - 
 
59 
	private String exifSceneCaptureType = " " ;
 - 
 
60 
	private String exifGainControl = " " ;
 - 
 
61 
	private String exifContrast = " " ;
 - 
 
62 
	private String exifSaturation = " " ;
 - 
 
63 
	private String exifSharpness = " " ;
 - 
 
64 
	private String exifSubjectDistanceRange = " " ;
 - 
 
65 
	private String exifAutres = " " ;
 - 
 
66
- 
 
67 
	// metadonnes iptc
 - 
 
68 
	private String iptcMotsCles = " " ;
 - 
 
69 
	private String iptcByLine = " " ;
 - 
 
70 
	private String iptcByLineTitle = " " ;
 - 
 
71 
	private String iptcCity = " " ;
 - 
 
72 
	private String iptcSubLocation = " " ;
 - 
 
73 
	private String iptcProvinceState = " " ;
 - 
 
74 
	private String iptcCountryPrimaryLocationCode = " " ;
 - 
 
75 
	private String iptcHeadline = " " ;
 - 
 
76 
	private String iptcCredit = " " ;
 - 
 
77 
	private String iptcCopyrightNotice = " " ;
 - 
 
78 
	private String iptcContact = " " ;
 - 
 
79 
	private String iptcAutres = " " ;
 - 
 
Line 80... Line 17...
80 
	*/
 17
81 
 
 18 
 
82 
	public ImageCarnet(JSONObject image)
 19 
	public ImageCarnet(JSONObject image)
Line 124... Line 61...
124 
		if(this.containsKey((cle)))
 61 
		if(this.containsKey((cle)))
125 
		{
 62 
		{
126 
			String valeur = (String)this.get(cle) ;
 63 
			String valeur = (String)this.get(cle) ;
127 
			if(valeur.equals("null"))
 64 
			if(valeur.equals("null"))
128 
			{
 65 
			{
129 
				return " " ;
 66 
				return "null" ;
130 
			}
 67 
			}
131 
			else
 68 
			else
132 
			{
 69 
			{
- 
 
 70 
				char nullChar = '\u0000' ;
- 
 
 71 
				String sNull = ""+nullChar ;
- 
 
 72 
				valeur = valeur.replaceAll(sNull, "") ;
133 
				return valeur ;
 73 
				return valeur ;
134 
			}
 74 
			}
135 
		}
 75 
		}
136 
		else
 76 
		else
137 
		{
 77 
		{
138 
			return " " ;
 78 
			return "null" ;
139 
		}
 79 
		}
140 
	}
 80 
	}
Line -... Line 81...
- 
 
 81 
 
- 
 
 82 
	public String getId() {
- 
 
 83
- 
 
 84 
		return renvoyerValeurCorrecte("ci_id_image") ;
Line 141... Line 85...
141 
 
 85 
	}
Line 142... Line 86...
142
86
143 
	public String getOrdre() {
 87 
	public String getOrdre() {
Line 270... Line 214...
270 
		return metaGen ;
 214 
		return metaGen ;
271 
	}
 215 
	}
Line 272... Line 216...
272
216
273 
	public void miseAJourInfoGenerales(String commentaires, String date)
 217 
	public void miseAJourInfoGenerales(String commentaires, String date)
274 
	{
 - 
 
275 
		if(this.containsKey("ci_meta_comment"))
 - 
 
276 
		{
 218 
	{
277 
			put("ci_meta_comment",commentaires) ;
 - 
 
Line 278... Line -...
278 
		}
 - 
 
279
- 
 
280 
		if(this.containsKey("ci_meta_date"))
 219 
			put("ci_meta_comment",commentaires) ;
281 
		{
 - 
 
282 
			put("ci_meta_date",date) ;
 220
283 
		}
 221 
			put("ci_meta_date",date) ;