# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1300385233 0
# Node ID ecf90018563b75f725e0a1dc6648abcbcbdd497d
# Parent  cf8cbcb6a10d08c00e62c64c0ed32105dafe91a4
Importer: Bound Attributes and Positions to there backend peers.


flys-backend/trunk@1507 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r cf8cbcb6a10d -r ecf90018563b flys-backend/ChangeLog
--- a/flys-backend/ChangeLog	Thu Mar 17 17:43:57 2011 +0000
+++ b/flys-backend/ChangeLog	Thu Mar 17 18:07:13 2011 +0000
@@ -1,3 +1,13 @@
+2011-03-17	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/model/Attribute.java,
+	  src/main/java/de/intevation/flys/model/Position.java:
+	  Added convinience constructors.
+
+	* src/main/java/de/intevation/flys/importer/ImportPosition.java,
+	  src/main/java/de/intevation/flys/importer/ImportAttribute.java:
+	  Bound them to there backend peers.
+
 2011-03-17	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/importer/AnnotationsParser.java:
diff -r cf8cbcb6a10d -r ecf90018563b flys-backend/src/main/java/de/intevation/flys/importer/ImportAttribute.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportAttribute.java	Thu Mar 17 17:43:57 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportAttribute.java	Thu Mar 17 18:07:13 2011 +0000
@@ -1,10 +1,19 @@
 package de.intevation.flys.importer;
 
+import de.intevation.flys.model.Attribute;
+
+import org.hibernate.Session;
+import org.hibernate.Query;
+
+import java.util.List;
+
 public class ImportAttribute
 implements   Comparable<ImportAttribute>
 {
     protected String value;
 
+    protected Attribute peer;
+
     public ImportAttribute() {
     }
 
@@ -35,5 +44,22 @@
     public int hashCode() {
         return value.hashCode();
     }
+
+    public Attribute getPeer() {
+        if (peer != null) {
+            Session session = Importer.sessionHolder.get();
+            Query query = session.createQuery("from Attribute where value=:value");
+            query.setString("value", value);
+            List<Attribute> attributes = query.list();
+            if (attributes.isEmpty()) {
+                peer = new Attribute(value);
+                session.save(peer);
+            }
+            else {
+                peer = attributes.get(0);
+            }
+        }
+        return peer;
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r cf8cbcb6a10d -r ecf90018563b flys-backend/src/main/java/de/intevation/flys/importer/ImportPosition.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportPosition.java	Thu Mar 17 17:43:57 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportPosition.java	Thu Mar 17 18:07:13 2011 +0000
@@ -1,10 +1,19 @@
 package de.intevation.flys.importer;
 
+import de.intevation.flys.model.Position;
+
+import org.hibernate.Session;
+import org.hibernate.Query;
+
+import java.util.List;
+
 public class ImportPosition
 implements   Comparable<ImportPosition>
 {
     protected String value;
 
+    protected Position peer;
+
     public ImportPosition() {
     }
 
@@ -23,6 +32,23 @@
     public void setValue(String value) {
         this.value = value;
     }
+
+    public Position getPeer() {
+        if (peer != null) {
+            Session session = Importer.sessionHolder.get();
+            Query query = session.createQuery("from Position where value=:value");
+            query.setString("value", value);
+            List<Position> positions = query.list();
+            if (positions.isEmpty()) {
+                peer = new Position(value);
+                session.save(peer);
+            }
+            else {
+                peer = positions.get(0);
+            }
+        }
+        return peer;
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
 
diff -r cf8cbcb6a10d -r ecf90018563b flys-backend/src/main/java/de/intevation/flys/model/Attribute.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/Attribute.java	Thu Mar 17 17:43:57 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/Attribute.java	Thu Mar 17 18:07:13 2011 +0000
@@ -22,6 +22,10 @@
     public Attribute() {
     }
 
+    public Attribute(String value) {
+        this.value = value;
+    }
+
     @Id
     @SequenceGenerator(
         name           = "SEQUENCE_ATTRIBUTES_ID_SEQ",
diff -r cf8cbcb6a10d -r ecf90018563b flys-backend/src/main/java/de/intevation/flys/model/Position.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/Position.java	Thu Mar 17 17:43:57 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/Position.java	Thu Mar 17 18:07:13 2011 +0000
@@ -28,6 +28,10 @@
     public Position() {
     }
 
+    public Position(String value) {
+        this.value = value;
+    }
+
     @Id
     @SequenceGenerator(
         name           = "SEQUENCE_POSITIONS_ID_SEQ",