[Castore-commits] RechercheAvanceeForm.java 1.7 1.8

[Neman OULD SID'AHMED]

Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/recherches
In directory adullact1:/tmp/cvs-serv22084/src/java/fr/emn/castor/struts/forms/recherches

Modified Files:
	RechercheAvanceeForm.java 
Log Message:
mise en page

Index: RechercheAvanceeForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/recherches/RechercheAvanceeForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RechercheAvanceeForm.java	16 Aug 2006 14:14:34 -0000	1.7
--- RechercheAvanceeForm.java	16 Aug 2006 14:22:06 -0000	1.8
***************
*** 67,255 ****
  public class RechercheAvanceeForm extends ActionForm {
  
!     private Map searchMap;
  
!     private Collection liensAnciennesRequetes;
  
!     private Collection resultat;
!     
!     private String requette ;
  
!     private boolean showResult = false;
  
!     /**
!      * @see org.apache.struts.action.Action#execute(
!      *  org.apache.struts.action.ActionMapping,
!      *  org.apache.struts.action.ActionForm,
!      *  javax.servlet.http.HttpServletRequest,
!      *  javax.servlet.http.HttpServletResponse)
!      */
!     public final void restaurationRequete(final HttpServletRequest request) {
!         int idRequete = Integer.parseInt(request.getParameter("idRequete"));
!         ArrayList searchColl = (ArrayList) request
!             .getSession().getAttribute("requetesAvancees");
!         Map requestMap = (Map) searchColl.get(idRequete - 1);
!         Set keys = requestMap.keySet();
!         for (Iterator iter = keys.iterator(); iter.hasNext();) {
!             String key = (String) iter.next();
!             if (this.searchMap.containsKey(key)) {
!                 String value = (String) requestMap.get(key);
!                 HashMap values = (HashMap) this.searchMap.get(key);
!                 values.put("value", value);
!             }
!         }
!     }
  
!     /**
!      * @see org.apache.struts.action.ActionForm
!      *      #reset(org.apache.struts.action.ActionMapping,
!      *      javax.servlet.http.HttpServletRequest)
!      */
!     public final void reset(
!             final ActionMapping mapping, final HttpServletRequest request) {
  
!         this.searchMap = fr.emn.castor.documents.Facade
!             .getInstance().getRechercheAvanceeMap();
!         // on va rajouter une cle contenant la requete sur ce champ
!         Set keys = this.searchMap.keySet();
!         for (Iterator iter = keys.iterator(); iter.hasNext();) {
!             String key = (String) iter.next();
!             HashMap values = (HashMap) this.searchMap.get(key);
!             values.put("value", "");
!         }
  
!         if (request.getParameter("idRequete") != null) {
!             restaurationRequete(request);
!         }
  
!         this.majListeRequete(request);
  
!     }
  
!     public final void majListeRequete(final HttpServletRequest request) {
  
!         String user = (String) request.getSession().getAttribute(
!             Constants.SESSION_USERONLINE_LOGIN);
!         if (user != null) {
  
!             Map profilMap = Facade.getInstance().getProfilMap(user);
!             if (!profilMap.isEmpty()) {
!                 Iterator lastRequest = ((List) profilMap
!                     .get(UsersConstants.INFO_PROFIL_LAST_REQUEST))
!                     .iterator();
!                 this.liensAnciennesRequetes = new ArrayList();
!                 Collection sauveSession = new ArrayList();
!                 int compteur = 1;
!                 HashMap userRequests = new HashMap();
!                 while (lastRequest.hasNext()) {
!                     HashMap requete = (HashMap) lastRequest.next();
!                     if (requete.get(UsersConstants.TYPE_RECHERCHE).equals(
!                         UsersConstants.TYPE_RECHERCHE_AVANCEE)) {
  
!                         sauveSession.add(requete);
!                         userRequests.put(new Integer(compteur), requete);
  
!                         String aAfficher = "";
!                         for (Iterator keys = requete.keySet().iterator(); keys
!                             .hasNext();) {
!                             String key = (String) keys.next();
!                             if (!key.equals(UsersConstants.TYPE_RECHERCHE)) {
!                                 aAfficher += (String) requete.get(key)
!                                         + ", ";
!                             }
!                         }
  
!                         aAfficher = aAfficher.substring(0, aAfficher
!                             .lastIndexOf(','));
  
!                         this.liensAnciennesRequetes.add(new LabelValueBean(
!                             aAfficher, String.valueOf(compteur)));
!                         compteur++;
  
!                     }
!                 }
  
!                 request.getSession().setAttribute(
!                     "requetesAvancees", sauveSession);
!             }
!         }
!     }
  
!     /**
!      * @return
!      */
!     public Collection getLiensAnciennesRequetes() {
!         return this.liensAnciennesRequetes;
!     }
  
!     /**
!      * @return
!      */
!     public Map getSearchMap() {
!         return this.searchMap;
!     }
  
!     public Object getHelp(String key) {
!         HashMap value = (HashMap) this.searchMap.get(key);
!         return value.get("help");
!     }
  
!     /**
!      * Gets the values of the specified key
!      */
!     public Object getSearch(String key) {
!         HashMap value = (HashMap) this.searchMap.get(key);
!         return value.get("value");
  
!     }
  
!     /**
!      * Gets the values of the specified key
!      */
!     public void setSearch(String key, Object value) {
!         HashMap valueQuery = (HashMap) this.searchMap.get(key);
!         valueQuery.put("value", value);
!         this.searchMap.put(key, valueQuery);
!     }
  
!     /**
!      * @return
!      */
!     public Collection getResultat() {
!         return this.resultat;
!     }
  
!     /**
!      * @param collection
!      */
!     public void setResultat(Collection collection) {
!         this.resultat = collection;
!         this.showResult = true;
!     }
  
!     /**
!      * @return
!      */
!     public String getShowResult() {
!         return String.valueOf(this.showResult);
!     }
  
!     /**
!      * Permet de savoir s'il faut ou non afficher la legende qu iindique qu'un
!      * document n'est pas consultable.
!      *
!      * @return "true" ou "false"
!      */
!     public String getAfficheLegende() {
!         Iterator iterResultat = this.resultat.iterator();
!         while (iterResultat.hasNext()) {
!             DocumentBean doc = (DocumentBean) iterResultat.next();
!             if (!doc.canSeeDocument()) {
!                 return String.valueOf(true);
!             }
!         }
!         return String.valueOf(false);
!     }
!     
!     public String getRequette() {
  		return requette;
  	}
--- 67,254 ----
  public class RechercheAvanceeForm extends ActionForm {
  
! 	private Map searchMap;
  
! 	private Collection liensAnciennesRequetes;
  
! 	private Collection resultat;
  
! 	private String requette;
  
! 	private boolean showResult = false;
  
! 	/**
! 	 * @see org.apache.struts.action.Action#execute(
! 	 *      org.apache.struts.action.ActionMapping,
! 	 *      org.apache.struts.action.ActionForm,
! 	 *      javax.servlet.http.HttpServletRequest,
! 	 *      javax.servlet.http.HttpServletResponse)
! 	 */
! 	public final void restaurationRequete(final HttpServletRequest request) {
! 		int idRequete = Integer.parseInt(request.getParameter("idRequete"));
! 		ArrayList searchColl = (ArrayList) request.getSession().getAttribute(
! 				"requetesAvancees");
! 		Map requestMap = (Map) searchColl.get(idRequete - 1);
! 		Set keys = requestMap.keySet();
! 		for (Iterator iter = keys.iterator(); iter.hasNext();) {
! 			String key = (String) iter.next();
! 			if (this.searchMap.containsKey(key)) {
! 				String value = (String) requestMap.get(key);
! 				HashMap values = (HashMap) this.searchMap.get(key);
! 				values.put("value", value);
! 			}
! 		}
! 	}
  
! 	/**
! 	 * @see org.apache.struts.action.ActionForm
! 	 *      #reset(org.apache.struts.action.ActionMapping,
! 	 *      javax.servlet.http.HttpServletRequest)
! 	 */
! 	public final void reset(final ActionMapping mapping,
! 			final HttpServletRequest request) {
  
! 		this.searchMap = fr.emn.castor.documents.Facade.getInstance()
! 				.getRechercheAvanceeMap();
! 		// on va rajouter une cle contenant la requete sur ce champ
! 		Set keys = this.searchMap.keySet();
! 		for (Iterator iter = keys.iterator(); iter.hasNext();) {
! 			String key = (String) iter.next();
! 			HashMap values = (HashMap) this.searchMap.get(key);
! 			values.put("value", "");
! 		}
  
! 		if (request.getParameter("idRequete") != null) {
! 			restaurationRequete(request);
! 		}
  
! 		this.majListeRequete(request);
  
! 	}
  
! 	public final void majListeRequete(final HttpServletRequest request) {
  
! 		String user = (String) request.getSession().getAttribute(
! 				Constants.SESSION_USERONLINE_LOGIN);
! 		if (user != null) {
  
! 			Map profilMap = Facade.getInstance().getProfilMap(user);
! 			if (!profilMap.isEmpty()) {
! 				Iterator lastRequest = ((List) profilMap
! 						.get(UsersConstants.INFO_PROFIL_LAST_REQUEST))
! 						.iterator();
! 				this.liensAnciennesRequetes = new ArrayList();
! 				Collection sauveSession = new ArrayList();
! 				int compteur = 1;
! 				HashMap userRequests = new HashMap();
! 				while (lastRequest.hasNext()) {
! 					HashMap requete = (HashMap) lastRequest.next();
! 					if (requete.get(UsersConstants.TYPE_RECHERCHE).equals(
! 							UsersConstants.TYPE_RECHERCHE_AVANCEE)) {
  
! 						sauveSession.add(requete);
! 						userRequests.put(new Integer(compteur), requete);
  
! 						String aAfficher = "";
! 						for (Iterator keys = requete.keySet().iterator(); keys
! 								.hasNext();) {
! 							String key = (String) keys.next();
! 							if (!key.equals(UsersConstants.TYPE_RECHERCHE)) {
! 								aAfficher += (String) requete.get(key) + ", ";
! 							}
! 						}
  
! 						aAfficher = aAfficher.substring(0, aAfficher
! 								.lastIndexOf(','));
  
! 						this.liensAnciennesRequetes.add(new LabelValueBean(
! 								aAfficher, String.valueOf(compteur)));
! 						compteur++;
  
! 					}
! 				}
  
! 				request.getSession().setAttribute("requetesAvancees",
! 						sauveSession);
! 			}
! 		}
! 	}
  
! 	/**
! 	 * @return
! 	 */
! 	public Collection getLiensAnciennesRequetes() {
! 		return this.liensAnciennesRequetes;
! 	}
  
! 	/**
! 	 * @return
! 	 */
! 	public Map getSearchMap() {
! 		return this.searchMap;
! 	}
  
! 	public Object getHelp(String key) {
! 		HashMap value = (HashMap) this.searchMap.get(key);
! 		return value.get("help");
! 	}
  
! 	/**
! 	 * Gets the values of the specified key
! 	 */
! 	public Object getSearch(String key) {
! 		HashMap value = (HashMap) this.searchMap.get(key);
! 		return value.get("value");
  
! 	}
  
! 	/**
! 	 * Gets the values of the specified key
! 	 */
! 	public void setSearch(String key, Object value) {
! 		HashMap valueQuery = (HashMap) this.searchMap.get(key);
! 		valueQuery.put("value", value);
! 		this.searchMap.put(key, valueQuery);
! 	}
  
! 	/**
! 	 * @return
! 	 */
! 	public Collection getResultat() {
! 		return this.resultat;
! 	}
  
! 	/**
! 	 * @param collection
! 	 */
! 	public void setResultat(Collection collection) {
! 		this.resultat = collection;
! 		this.showResult = true;
! 	}
  
! 	/**
! 	 * @return
! 	 */
! 	public String getShowResult() {
! 		return String.valueOf(this.showResult);
! 	}
! 
! 	/**
! 	 * Permet de savoir s'il faut ou non afficher la legende qu iindique qu'un
! 	 * document n'est pas consultable.
! 	 * 
! 	 * @return "true" ou "false"
! 	 */
! 	public String getAfficheLegende() {
! 		Iterator iterResultat = this.resultat.iterator();
! 		while (iterResultat.hasNext()) {
! 			DocumentBean doc = (DocumentBean) iterResultat.next();
! 			if (!doc.canSeeDocument()) {
! 				return String.valueOf(true);
! 			}
! 		}
! 		return String.valueOf(false);
! 	}
! 
! 	public String getRequette() {
  		return requette;
  	}
***************
*** 258,262 ****
  		this.requette = requette;
  	}
-     
  
  }
\ No newline at end of file
--- 257,260 ----