Changeset 405 for ether_ndacc
- Timestamp:
- 03/09/12 13:18:57 (12 years ago)
- Location:
- ether_ndacc/trunk
- Files:
-
- 11 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
ether_ndacc/trunk/persistence/implementation/com/ether/dao/plot/PlotDAOImpl.java
r105 r405 41 41 return selectAllByCriteria(String.class, criteria); 42 42 } 43 44 @Nullable 45 public List<String> getPlotsByDateByInstrumentByStationByType(@NotNull final String instrument, @NotNull final Date pFormatDate_deb, @NotNull final Date pFormatDate_fin, @NotNull final String station, @NotNull final String type) 46 throws PersistenceException 47 { 48 String vtype = type; 49 50 final DetachedCriteria criteria = DetachedCriteria.forClass(Plot.class,"plot") 51 .addOrder(Order.asc("plot.name")) 52 .add(Restrictions.ge("datedeb", pFormatDate_deb)) 53 .add(Restrictions.lt("datedeb", pFormatDate_fin)) 54 .createCriteria("instrument","instrument").add(Restrictions.ilike("instrument.name",instrument,MatchMode.ANYWHERE)) 55 .createCriteria("station","station").add(Restrictions.ilike("station.name",station,MatchMode.ANYWHERE)) 56 .add(Restrictions.ilike("plot.name",vtype,MatchMode.ANYWHERE)); 57 58 59 //select pl_name de nd_plot 60 criteria.setProjection(Projections.property("plot.name")); 61 62 return selectAllByCriteria(String.class, criteria); 63 } 43 64 44 65 @Nullable … … 86 107 } 87 108 88 @Nullable 109 110 @Nullable 89 111 public List<Date> getListeDistinctDates() 90 112 throws PersistenceException -
ether_ndacc/trunk/persistence/interface/com/ether/dao/plot/PlotDAO.java
r105 r405 22 22 @Nullable 23 23 public List<String> getPlotsByDateByInstrumentByStation(@NotNull final String instrument, @NotNull final Date pFormatDate_deb, @NotNull final Date pFormatDate_fin, @NotNull final String station) throws PersistenceException; 24 25 @Nullable 26 public List<String> getPlotsByDateByInstrumentByStationByType(@NotNull final String instrument, @NotNull final Date pFormatDate_deb, @NotNull final Date pFormatDate_fin, @NotNull final String station, @NotNull final String type) throws PersistenceException; 24 27 } -
ether_ndacc/trunk/service/implementation/com/ether/PlotServiceImpl.java
r106 r405 68 68 } 69 69 } 70 71 @Transactional(readOnly = true) 70 71 @Nullable 72 @Transactional(readOnly = true) 73 public List<String> getPlotsByDateByInstrumentByStationByType(@NotNull final String instrument, @NotNull String pdate, @NotNull String ft, @NotNull String station, @NotNull String type) 74 throws ServiceException 75 { 76 try { 77 78 final DateFormat pFormatDate = new SimpleDateFormat(ft); 79 String fdate; 80 final String tt="yyyyMMdd"; 81 if (ft.compareTo(tt) == 0) fdate="19700101"; 82 else fdate = "1970"; 83 84 if (pdate.compareTo(fdate) == 0 ) { 85 final Date ldate = _plotDAO.getLastDateByInstrumentByStation(instrument,station); 86 87 //ldate="20070101"; 88 //ldate="20060101"; 89 90 String s1="-", s2="", d1="01"; 91 fdate=ldate.toString().replaceAll(s1,s2); 92 93 s1=" 00:00:00.0"; 94 fdate=fdate.replaceAll(s1,s2); 95 fdate=fdate.substring(0,6); 96 97 fdate=fdate.concat(d1); 98 pdate=fdate; 99 } 100 else { 101 fdate=pdate; 102 } 103 104 final Date pFormatDate_deb = pFormatDate.parse(fdate); 105 Date pFormatDate_fin; 106 if (ft.compareTo(tt) == 0) pFormatDate_fin = DateUtils.datesAddMonth(pFormatDate_deb,1); 107 else pFormatDate_fin = DateUtils.datesAddYear(pFormatDate_deb,1); 108 109 return _plotDAO.getPlotsByDateByInstrumentByStationByType(instrument, pFormatDate_deb, pFormatDate_fin, station, type); 110 111 } catch (ParseException e) { 112 throw new ServiceException(ServiceException.ServiceCode.DATES_PARSE_ERROR, e); 113 } catch (PersistenceException e) { 114 throw new ServiceException(ServiceException.ServiceCode.INSTRUMENT_ERROR, e); 115 } 116 } 117 118 119 @Transactional(readOnly = true) 72 120 public List<String> getPlotsByDateByInstrument(@NotNull final String instrument, @NotNull String pdate, @NotNull String ft) 73 121 throws ServiceException -
ether_ndacc/trunk/service/interface/com/ether/PlotService.java
r106 r405 17 17 List<String> getPlotsByDateByInstrumentByStation(@NotNull final String instrument, String pdate, String ft, String station) throws ServiceException; 18 18 // List<String> getLastDate(@NotNull final String instrument) throws ServiceException; 19 @Nullable 20 List<String> getPlotsByDateByInstrumentByStationByType(@NotNull final String instrument, String pdate, String ft, String station, String type) throws ServiceException; 19 21 20 22 } -
ether_ndacc/trunk/web/about.jsp
r183 r405 23 23 24 24 <p> 25 <img border=1 src="resources/images/fr.jpg" alt="French version"> <a href="#en"><img border=1 src="resources/images/en.jpg" alt="English version"></a>25 <img border=1 src="resources/images/fr.jpg" alt="French version"> 26 26 <br> 27 27 … … 48 48 des profils de vapeur dâeau par radiométrie micro-ondes et lidar Raman ; 49 49 des mesures de CH4, HCl, HF, CO, N2O par spectromÚtre FTIR (instrument IASB à lâîle de La Réunion). 50 <br> 50 <br> 51 <br> 52 <b><A HREF="mailto:Renaud.Bodichon@ipsl.jussieu.fr">Contact webmaster</A></b> 51 53 52 54 <p id="en"> -
ether_ndacc/trunk/web/data_ddu.jsp
r364 r405 30 30 31 31 <a class="onglet" href="station?methodName=viewDataOhp" title="Observatoire de Haute Provence">OHP</a> 32 <a class="onglet" href="station?methodName=viewDataO mp" title="Observatoire de physique de l'atmosphère de La Réunion">La Réunion</a>32 <a class="onglet" href="station?methodName=viewDataOpar" title="Observatoire de physique de l'atmosphère de La Réunion">La Réunion</a> 33 33 <span class="onglet-actif" title="Dumont d'Urville">Dumont d'Urville</span> 34 34 <a class="onglet" href="station?methodName=viewDataOmp">OMP</a> … … 63 63 <td height="10" valign="top" width=170 class="cielb"><spring:message code="Logistique"/></td> 64 64 <td width="" class="cielbp"><a class="cielbp" href="http://www.institut-polaire.fr/" target="_blank">IPEV</a></td> 65 <td align=center rowspan=5 class="ciel"><img border=1 src="resources/images/ddu.jpg" width="340" height=""></td>65 <td align=center rowspan=5 class="ciel"><img border=1 src="resources/images/ddu.jpg" width="340" height=""></td> 66 66 </tr> 67 67 <tr> … … 141 141 <td class="blanc2" width="15%"><a href="" onclick="openW ('./aerosols.jsp', NWIN1, WCONF1);">Aerosols</a> and PSC profiles</td> 142 142 <td class="blanc2" width="15%">J. Jumelet and M. Snels (CNR/ISAC, Italy)</td> 143 <td class="blanc2" width="22%"><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/dumont/ames/lidar/')">1989-1998, 2006-20 08</a>143 <td class="blanc2" width="22%"><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/dumont/ames/lidar/')">1989-1998, 2006-2010</a> 144 144 <br><i>pattern files : duae[yy][mm].dal</i></td> 145 145 -
ether_ndacc/trunk/web/data_ohp.jsp
r364 r405 169 169 <br><span class="itap"><i>(10-50 km)</i></span></td> 170 170 <td class="blanc2" width="">S. Godin-Beekmann</td> 171 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/lidar/')">1985-201 0</a>171 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/lidar/')">1985-2011</a> 172 172 <br><i>pattern files : oho3[yy][mm].gol</i></td> 173 173 <td class="orange" nowrap align="center"> … … 205 205 <td class="blanc2" width=""><a href="" onclick="openW ('./aerosols.jsp', NWIN1, WCONF1);">Aerosols</a> profiles</td> 206 206 <td class="blanc2" width="">J. Jumelet et P. Keckhut</td> 207 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/lidar/')">1991-1994, 1999-20 08/04</a>207 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/lidar/')">1991-1994, 1999-2010/08</a> 208 208 <br><i>pattern files : ohae[yy][mm].dal</i></td> 209 209 … … 232 232 </td> 233 233 234 <td class="orange" nowrap> </td> 234 <td class="orange" nowrap> 235 <a href="" title="Results" onclick="OuvrirFeuilleDynW ('instrument?methodName=selectEccRT&instrument=ECC&dateinf=19700101&station=OHP&type=rt#','700','650')"> 236 <img border=1 src="resources/images/results.jpg" width="60px"></img> 237 </a> 238 239 </td> 235 240 <td class="vert" width=""><spring:message code="courant"/></td> 236 241 </tr> … … 250 255 <td class="blanc2" width=""><a href="" onclick="openW ('./ozone.jsp', NWIN1, WCONF1);">O3</a> column</td> 251 256 <td class="blanc2" width="">R. Evans and M-R Debacker (NOAA)</td> 252 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/dobson/')">1983-201 0</a>257 <td class="blanc2" width=""><a href="" title="Data access" onclick="OuvrirPageWD ('./disclaimer.jsp','ftp://ftp.cpc.ncep.noaa.gov/ndacc/station/ohp/ames/dobson/')">1983-2011</a> 253 258 <br><i>pattern files : ohtc[yy][mm].evd</i></td> 254 259 <td class="orange" align="center" width=11%><a href="" title="Results" onclick="OuvrirFeuilleDyn ('visus_dobson.jsp?station=ohp')"> -
ether_ndacc/trunk/web/dobson.jsp
r183 r405 21 21 <a id="c6752"></a> <h1 align=center><font color="#0066FF">Dobson</font></h1> 22 22 23 23 <table width="100%" border="0" align="center" bordercolor="#FFFFFF"> 24 24 <tr> 25 25 <td width="100%"><div align="justify"><p>Le spectrophotomÚtre de Dobson doit son nom au chercheur de l'Université d'Oxford, … … 33 33 valeur nulle sur l'ampÚre-mÚtre : la position lue sur le disque est enregistrée. Elle est ensuite 34 34 introduite dans une équation qui permet de déterminer la quantité de molécules d'ozone dans 35 la colonne verticale située au dessus de l'instrument.</p><br><br><br><br><br><br><br><br><br><br></div></td> 36 </tr> 35 la colonne verticale située au dessus de l'instrument.</p><br><br> 36 37 <img src="resources/images/dobson.jpg" width="400" height=""> 38 <br><br><br><br><br><br><br><br></div></td> 39 37 40 </div></td> 41 </tr> 38 42 39 43 </table> -
ether_ndacc/trunk/web/src/com/ether/Controller.java
r364 r405 237 237 } 238 238 239 @ControllerMethod(view = VIEW_ECC_RT) 240 public Map<String, Object> selectEccRT( @ParamName("dateinf") final String dateinf, 241 @ParamName("station") String station, 242 @ParamName("instrument") final String instrument, 243 @ParamName("type") final String type ) 244 throws WebException 245 { 246 try 247 { 248 249 final List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStationByType( instrument, dateinf, "yyyyMMdd", station, type ); 250 251 //dateinf="02021980"; 252 //List<String> ListDates = _plotService.getLastDate(instrument); 253 final List<String> listeDates = _serviceTools.getListeDates(); 254 String rep = ""; 255 String year = dateinf.substring( 0, 4 ); 256 257 if( station.compareTo( "OHP" ) == 0 || station.compareTo( "ohp" ) == 0 ) 258 { 259 rep = "./resources/visu/ohp/ecc"; 260 station = "OHP"; 261 if( year.compareTo( "1970" ) == 0 ) year = "2012"; 262 } 263 else if( station.compareTo( "LA REUNION" ) == 0 || station.compareTo( "reunion" ) == 0 ) 264 { 265 rep = "./resources/visu/reu/ecc"; 266 //rep="./resources/visu/ohp/lidar/o3_strato"; 267 station = "LA REUNION"; 268 if( year.compareTo( "1970" ) == 0 ) year = "2006"; 269 //year="2006"; 270 } 271 else if( station.compareTo( "DDU" ) == 0 || station.compareTo( "ddu" ) == 0 ) 272 { 273 rep = "./resources/visu/ddu/ecc"; 274 //rep="./resources/visu/ohp/lidar/o3_strato"; 275 station = "DDU"; 276 if( year.compareTo( "1970" ) == 0 ) year = "1991"; 277 //year="2006"; 278 } 279 280 final Map<String, Object> model = new HashMap<String, Object>(); 281 model.put( "plotsList", plotsList ); 282 model.put( "listeDates", listeDates ); 283 model.put( "firstDate", dateinf ); 284 final String month = dateinf.substring( 4, 6 ); 285 model.put( "month", month ); 286 model.put( "year", year ); 287 model.put( "station", station ); 288 model.put( "rep", rep ); 289 return model; 290 } 291 catch( ServiceException e ) 292 { 293 throw new WebException( WebException.WebCode.SERVICE_PROBLEM, e ); 294 } 295 } 296 239 297 public ModelAndView viewLidarO3s( final HttpServletRequest request, final HttpServletResponse response ) 240 298 throws WebException … … 546 604 { 547 605 year = "2010"; 548 month = " 01";606 month = "11"; 549 607 } 550 608 } … … 747 805 private static final String VIEW_UMK = "visus_umk"; 748 806 private static final String VIEW_ECC = "visus_ecc"; 807 private static final String VIEW_ECC_RT = "visus_ecc_realtime"; 749 808 private static final String VIEW_SPECTRO_UV = "visus_spectro"; 750 809 private static final String VIEW_LIDAR_TEMP = "visus_lidar_temp"; -
ether_ndacc/trunk/web/visus_ecc.jsp
r364 r405 14 14 15 15 16 <title>OHP LIDARPLOTS</title>16 <title>OHP ECC PLOTS</title> 17 17 18 18 <meta name="generator" content="TYPO3 4.1 CMS" /> … … 35 35 <td width=50px class=blanc2 align=right><spring:message code="annee"/> 36 36 <select id="year" onChange='loadVisus()'> 37 37 <option value='2011' <c:if test="${year == '2011'}">selected</c:if> >2011</option> 38 38 <option value='2010' <c:if test="${year == '2010'}">selected</c:if> >2010</option> 39 39 <option value='2009' <c:if test="${year == '2009'}">selected</c:if> >2009</option> -
ether_ndacc/trunk/web/visus_ecc_realtime.jsp
r364 r405 14 14 15 15 16 <title>OHP LIDARPLOTS</title>16 <title>OHP ECC REALTIME PLOTS</title> 17 17 18 18 <meta name="generator" content="TYPO3 4.1 CMS" /> … … 25 25 <form name="thisForm"> 26 26 <table cellpadding="2" cellspacing="2" border=0 width=100%> 27 <input type="hidden" value="selectEcc " name="methodName">27 <input type="hidden" value="selectEccRT" name="methodName"> 28 28 <input type="hidden" value="ECC" name="instrument"> 29 29 <input type="hidden" value="${station}" name="station"> 30 <input type="hidden" value="rt" name="type"> 30 31 <input type="hidden" value="${firstDate}" id="di" name="dateinf"> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 31 32 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 32 33 <tr> 33 34 34 <td width=90px height=5 class=blanc1>${station} OZONE SONDE </td>35 <td width=90px height=5 class=blanc1>${station} OZONE SONDE REALTIME</td> 35 36 <td width=50px class=blanc2 align=right><spring:message code="annee"/> 36 37 <select id="year" onChange='loadVisus()'> 37 38 <option value='2010' <c:if test="${year == '2010'}">selected</c:if> >2010</option> 39 <option value='2009' <c:if test="${year == '2009'}">selected</c:if> >2009</option> 40 <option value='2008' <c:if test="${year == '2008'}">selected</c:if> >2008</option> 41 <option value='2007' <c:if test="${year == '2007'}">selected</c:if> >2007</option> 42 <option value='2006' <c:if test="${year == '2006'}">selected</c:if> >2006</option> 43 <option value='2005' <c:if test="${year == '2005'}">selected</c:if> >2005</option> 44 <option value='2004' <c:if test="${year == '2004'}">selected</c:if> >2004</option> 45 <option value='2003' <c:if test="${year == '2003'}">selected</c:if> >2003</option> 46 <option value='2002' <c:if test="${year == '2002'}">selected</c:if> >2002</option> 47 <option value='2001' <c:if test="${year == '2001'}">selected</c:if> >2001</option> 48 <option value='2000' <c:if test="${year == '2000'}">selected</c:if> >2000</option> 49 <option value='1999' <c:if test="${year == '1999'}">selected</c:if> >1999</option> 50 <option value='1998' <c:if test="${year == '1998'}">selected</c:if> >1998</option> 51 <option value='1997' <c:if test="${year == '1997'}">selected</c:if> >1997</option> 52 <option value='1996' <c:if test="${year == '1996'}">selected</c:if> >1996</option> 53 <option value='1995' <c:if test="${year == '1995'}">selected</c:if> >1995</option> 54 <option value='1994' <c:if test="${year == '1994'}">selected</c:if> >1994</option> 55 <option value='1993' <c:if test="${year == '1993'}">selected</c:if> >1993</option> 56 <option value='1992' <c:if test="${year == '1992'}">selected</c:if> >1992</option> 57 <option value='1991' <c:if test="${year == '1991'}">selected</c:if> >1991</option> 58 38 <option value='2012' <c:if test="${year == '2012'}">selected</c:if> >2012</option> 39 <option value='2011' <c:if test="${year == '2011'}">selected</c:if> >2011</option> 59 40 </select> 60 41 </td> -
ether_ndacc/trunk/web/visus_lidar_o3s.jsp
r364 r405 35 35 <td width=50px class=blanc2 align=right><spring:message code="annee"/> 36 36 <select id="year" onChange='loadVisus()'> 37 37 <option value='2011' <c:if test="${year == '2011'}">selected</c:if> >2011</option> 38 38 <option value='2010' <c:if test="${year == '2010'}">selected</c:if> >2010</option> 39 39 <option value='2009' <c:if test="${year == '2009'}">selected</c:if> >2009</option> … … 62 62 <option value='1986' <c:if test="${year == '1986'}">selected</c:if> >1986</option> 63 63 <option value='1985' <c:if test="${year == '1985'}">selected</c:if> >1985</option> 64 65 64 </select> 66 65 </td>
Note: See TracChangeset
for help on using the changeset viewer.