Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 444 → Rev 445

/trunk/src/org/tela_botanica/del/client/services/rest/ObservationServiceConcret.java
1,6 → 1,8
package org.tela_botanica.del.client.services.rest;
 
import org.tela_botanica.del.client.cache.CacheClient;
import org.tela_botanica.del.client.modeles.InformationsRecherche;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.ObservationServiceResultat;
import org.tela_botanica.del.client.services.rest.async.ObservationsCallback;
 
7,13 → 9,12
import com.google.gwt.http.client.RequestBuilder;
 
public class ObservationServiceConcret implements ObservationService {
 
private String serverUrl = "/del/jrest/";
 
@Override
public ObservationServiceResultat getObservations(
InformationsRecherche infos, int debut, int fin, ObservationsCallback callback) {
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl+"Observations"+assemblerChaineRequete(infos, debut, fin));
public ObservationServiceResultat getObservations(InformationsRecherche infos, int debut, int fin, ObservationsCallback callback) {
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl + "Observations" + assemblerChaineRequete(infos, debut, fin));
try {
rb.sendRequest(null, callback);
} catch (Exception e) {
21,14 → 22,14
}
return null;
}
 
private String assemblerChaineRequete(InformationsRecherche infos, int debut, int fin) {
String chaineRequete = "?debut="+debut+"&limite="+(fin-debut);
if(infos != null && infos.getTaxon() != null && !infos.getTaxon().trim().isEmpty()) {
chaineRequete += "nom_taxon="+infos.getTaxon()+chaineRequete;
 
String chaineRequete = "?debut=" + debut + "&limite=" + (fin - debut);
if (infos != null && infos.getTaxon() != null && !infos.getTaxon().trim().isEmpty()) {
chaineRequete += "nom_taxon=" + infos.getTaxon() + chaineRequete;
}
 
return chaineRequete;
}
 
/trunk/src/org/tela_botanica/del/client/services/rest/ObservationService.java
1,6 → 1,7
package org.tela_botanica.del.client.services.rest;
 
import org.tela_botanica.del.client.modeles.InformationsRecherche;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.ObservationServiceResultat;
import org.tela_botanica.del.client.services.rest.async.ObservationsCallback;
 
/trunk/src/org/tela_botanica/del/client/services/rest/ImageServiceConcret.java
6,15 → 6,17
import com.google.gwt.http.client.RequestBuilder;
 
public class ImageServiceConcret implements ImageService {
 
private String serverUrl = "/del/jrest/";
 
@Override
public void getImagesEfloreParTaxon(String taxon, ImagesParTaxonCallback callback) {
//RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl+"ImagesEflore");
//adresse ajoutee temporairement le temps de faire fonctionner le service d'images eflore
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl+"Images?nom_taxon="+taxon);
 
// RequestBuilder rb = new RequestBuilder(RequestBuilder.GET,
// serverUrl+"ImagesEflore");
// adresse ajoutee temporairement le temps de faire fonctionner le
// service d'images eflore
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl + "Images?nom_taxon=" + taxon);
try {
rb.sendRequest(null, callback);
} catch (Exception e) {
24,7 → 26,7
 
@Override
public void getImagesParTaxon(InformationsRecherche infos, int debut, int fin, ImagesParTaxonCallback callback) {
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl+"Images"+assemblerChaineRequete(infos, debut, fin));
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, serverUrl + "Images" + assemblerChaineRequete(infos, debut, fin));
try {
rb.sendRequest(null, callback);
} catch (Exception e) {
31,14 → 33,19
// TODO: handle exception
}
}
 
public void getImagesParObservation(String observationId, ImagesParTaxonCallback callback) {
// TODO implementer avec une methode realiste
getImagesEfloreParTaxon("", callback);
}
 
private String assemblerChaineRequete(InformationsRecherche infos, int debut, int fin) {
String chaineRequete = "?debut="+debut+"&limite="+(fin-debut);
if(infos != null && infos.getTaxon() != null && !infos.getTaxon().trim().isEmpty()) {
chaineRequete += "nom_taxon="+infos.getTaxon()+chaineRequete;
 
String chaineRequete = "?debut=" + debut + "&limite=" + (fin - debut);
if (infos != null && infos.getTaxon() != null && !infos.getTaxon().trim().isEmpty()) {
chaineRequete += "nom_taxon=" + infos.getTaxon() + chaineRequete;
}
 
return chaineRequete;
}
}
/trunk/src/org/tela_botanica/del/client/services/rest/ImageService.java
5,8 → 5,10
 
public interface ImageService {
 
public abstract void getImagesEfloreParTaxon(String nomTaxon, ImagesParTaxonCallback callback);
public void getImagesEfloreParTaxon(String nomTaxon, ImagesParTaxonCallback callback);
 
public abstract void getImagesParTaxon(InformationsRecherche informationsRecherche, int debut, int fin, ImagesParTaxonCallback callback);
public void getImagesParTaxon(InformationsRecherche informationsRecherche, int debut, int fin, ImagesParTaxonCallback callback);
 
public void getImagesParObservation(String observationId, ImagesParTaxonCallback callback);
 
}