diff flys-backend/src/main/java/de/intevation/flys/importer/ImportWstColumn.java @ 471:3570e4af8cb2

Added 'position' column to wst_columns to allow order them by there column position in the original wst file. flys-backend/trunk@1710 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 15 Apr 2011 16:06:15 +0000
parents 29a408f80a89
children db430bd9e0e0
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportWstColumn.java	Fri Apr 15 15:28:35 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportWstColumn.java	Fri Apr 15 16:06:15 2011 +0000
@@ -17,6 +17,7 @@
     protected ImportWst wst;
     protected String    name;
     protected String    description;
+    protected Integer   position;
 
     protected List<ImportWstColumnQRange> columnQRanges;
     protected List<ImportWstColumnValue>  columnValues;
@@ -31,12 +32,14 @@
     public ImportWstColumn(
         ImportWst wst,
         String    name,
-        String    description
+        String    description,
+        Integer   position
     ) {
         this();
         this.wst         = wst;
         this.name        = name;
         this.description = description;
+        this.position    = position;
     }
 
     public ImportWst getWst() {
@@ -63,6 +66,14 @@
         this.description = description;
     }
 
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
+
     public void addColumnValue(BigDecimal position, BigDecimal w) {
         columnValues.add(
             new ImportWstColumnValue(this, position, w));
@@ -89,13 +100,15 @@
             Session session = Importer.sessionHolder.get();
             Query query = session.createQuery(
                 "from WstColumn where " +
-                "wst=:wst and name=:name and description=:description");
+                "wst=:wst and name=:name and description=:description" +
+                " and position=:position");
             query.setParameter("wst",         w);
             query.setParameter("name",        name);
             query.setParameter("description", description);
+            query.setParameter("position",    position);
             List<WstColumn> columns = query.list();
             if (columns.isEmpty()) {
-                peer = new WstColumn(w, name, description, null);
+                peer = new WstColumn(w, name, description, position, null);
                 session.save(peer);
             }
             else {

http://dive4elements.wald.intevation.org