Author: fdesbois Date: 2010-01-07 10:21:45 +0000 (Thu, 07 Jan 2010) New Revision: 171 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java Log: Improve queries (add comment code for topia next version in ServiceSampling for getSampleRows query) Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-06 17:18:15 UTC (rev 170) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-07 10:21:45 UTC (rev 171) @@ -109,7 +109,7 @@ // Add join for ElligibleBoat if (sampleRowFiltered) { String elligibleBoatClassName = ElligibleBoat.class.getName(); - query.setSelect("B").addFrom(elligibleBoatClassName + " E").add("E.boat = B"); + query.addFrom(elligibleBoatClassName + " E").add("E.boat = B"); } // SampleRowCode if (sampleRowCodeFiltered) { Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-06 17:18:15 UTC (rev 170) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-07 10:21:45 UTC (rev 171) @@ -402,7 +402,7 @@ int boatImmatriculation = Integer.parseInt(reader.get(BOAT.NAVS_COD.name())); // The boat must be elligible for the row - TopiaQuery<Boat> boatQuery = boatDAO.createQuery("B").setSelect("B"). + TopiaQuery<Boat> boatQuery = boatDAO.createQuery("B"). addFrom(ElligibleBoat.class.getName() + " E"). add("E.sampleRow", row).add("E.boat = B"). add(Boat.IMMATRICULATION, boatImmatriculation); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-06 17:18:15 UTC (rev 170) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-07 10:21:45 UTC (rev 171) @@ -179,11 +179,7 @@ } transaction = rootContext.beginTransaction(); - FishingZoneDAO zoneDAO = SuiviObsmerModelDAOHelper.getFishingZoneDAO(transaction); - List<FishingZone> list = zoneDAO.findAllWithOrder( - FishingZone.FACADE_NAME, - FishingZone.SECTOR_NAME, - FishingZone.DISTRICT_CODE); + // uncomment the query for Topia 2.3.0-beta-4 (manage order and multiple select results, need addSelect method) // SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); // @@ -199,11 +195,17 @@ // periodEnd = DateUtils.setLastDayOfMonth(periodEnd); // query.add("S.program.periodBegin", Op.LT, periodEnd).add("S.program.periodEnd", Op.GT, periodBegin); // -// query.addOrder("F.facadeName, F.sectorName, F.districtCode"); +// String zoneOrder = "F.facadeName, F.sectorName, F.districtCode"; +// query.addOrder(zoneOrder).addOrder("S.code").addSelect(zoneOrder); // // query.addLoad(SampleRow.PROFESSION, SampleRow.PROGRAM, SampleRow.COMPANY); // results = query.executeToEntityList(); + FishingZoneDAO zoneDAO = SuiviObsmerModelDAOHelper.getFishingZoneDAO(transaction); + List<FishingZone> list = zoneDAO.findAllWithOrder( + FishingZone.FACADE_NAME, + FishingZone.SECTOR_NAME, + FishingZone.DISTRICT_CODE); for (FishingZone zone : list) { if (log.isTraceEnabled()) {