# HG changeset patch # User Sascha L. Teichmann # Date 1367520908 -7200 # Node ID f59ff0ddc00486365f69b1123382f6e6cd8ab9db # Parent 6ea004d512032606fe548fa6cda34299c1165a97# Parent 65ebae00fb76efd1ecfe8d4a3bed4050be931f0d Merged diff -r 6ea004d51203 -r f59ff0ddc004 backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java --- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Thu May 02 20:52:18 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Thu May 02 20:55:08 2013 +0200 @@ -136,11 +136,10 @@ Session session = ImporterSession.getInstance().getDatabaseSession(); Query query = session.createQuery( "from WstColumn where " + - "wst=:wst and name=:name and description=:description" + + "wst=:wst and name=:name " + " and position=:position"); query.setParameter("wst", w); query.setParameter("name", name); - query.setParameter("description", description); query.setParameter("position", position); TimeInterval ti = timeInterval != null