Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java @ 8027:1e327d86c898
Load grain fractions from database only. Do not store new ones.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Thu, 10 Jul 2014 16:11:55 +0200 |
parents | 4c3ccf2b0304 |
children | fd3a24336e6a |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java Thu Jul 10 12:04:56 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java Thu Jul 10 16:11:55 2014 +0200 @@ -8,29 +8,16 @@ package org.dive4elements.river.importer; -import java.util.List; - -import org.apache.log4j.Logger; - -import org.hibernate.Session; -import org.hibernate.Query; - import org.dive4elements.river.model.GrainFraction; public class ImportGrainFraction { - private static final Logger log = - Logger.getLogger(ImportGrainFraction.class); - private String name; private Double lower; private Double upper; - private GrainFraction peer; - - public ImportGrainFraction(String name) { this.name = name; } @@ -48,41 +35,12 @@ public void storeDependencies() { - log.debug("store dependencies"); - - getPeer(); + // Nothing to store because its prefilled in schema. } public GrainFraction getPeer() { - log.debug("get peer"); - - if (peer == null) { - Session session = ImporterSession.getInstance().getDatabaseSession(); - Query query = session.createQuery( - "from GrainFraction where " + - " name=:name and " + - " lower=:lower and " + - " upper=:upper" - ); - - query.setParameter("name", name); - query.setParameter("lower", lower); - query.setParameter("upper", upper); - - List<GrainFraction> fractions = query.list(); - if (fractions.isEmpty()) { - log.info("create new GrainFraction"); - - peer = new GrainFraction(name, lower, upper); - session.save(peer); - } - else { - peer = fractions.get(0); - } - } - - return peer; + return ImporterSession.getInstance().getGrainFraction(name); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :