# HG changeset patch
# User mschaefer
# Date 1525236981 -7200
# Node ID 4c5eeaff554cabd93fa4abc6732ccbb25906096c
# Parent  1574ce45c98dce26ec95a1d659db88f13116275d
Database column "comment" renamed to "notes" (restrictions in Oracle)

diff -r 1574ce45c98d -r 4c5eeaff554c backend/doc/schema/oracle-sinfo-uinfo.sql
--- a/backend/doc/schema/oracle-sinfo-uinfo.sql	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/doc/schema/oracle-sinfo-uinfo.sql	Wed May 02 06:56:21 2018 +0200
@@ -9,14 +9,14 @@
 COMMENT ON COLUMN wsts.sinfo_selection IS 'Whether and how the WST series is selected within S-INFO calculation types ("W"=without-Q-group, "Q"=with-Q-group, NULL=not-selectable)' ;
 
 
---Add new columns bed_height.sounding_width_info and bed_height.comment
+--Add new columns bed_height.sounding_width_info and bed_height.notes
 
 ALTER TABLE bed_height ADD (
   sounding_width_info VARCHAR2(256),
-  "comment" VARCHAR2(256)
+  notes VARCHAR2(256)
 );
 COMMENT ON COLUMN bed_height.sounding_width_info IS 'File header line info "ausgewertete Peilbreite"' ;
-COMMENT ON COLUMN bed_height."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN bed_height.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 
 --Add new columns bed_height_values.min_height (Talweg) and bed_height_values.max_height (Kammlage) (same type as existing height column)
@@ -56,12 +56,12 @@
     river_id  NUMBER(38,0) NOT NULL CONSTRAINT cBedMobilityRivers REFERENCES rivers(id) ON DELETE CASCADE,
     kmrange_info  VARCHAR2(32),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 COMMENT ON TABLE bed_mobility IS 'Longitudinal section of the bed mobility of a river' ;
 COMMENT ON COLUMN bed_mobility.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN bed_mobility.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN bed_mobility."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN bed_mobility.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE BED_MOBILITY_ID_SEQ ;
 
@@ -90,7 +90,7 @@
     evaluation_by  VARCHAR2(256),
     kmrange_info  VARCHAR2(32),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 COMMENT ON TABLE infrastructure IS 'Longitudinal section of infrastructures of a river and a type' ;
 COMMENT ON COLUMN infrastructure.year IS 'File header line info "Stand"' ;
@@ -98,7 +98,7 @@
 COMMENT ON COLUMN infrastructure.evaluation_by IS 'File header line info "Auswerter"' ;
 COMMENT ON COLUMN infrastructure.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN infrastructure.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN infrastructure."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN infrastructure.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE INFRASTRUCTURE_ID_SEQ ;
 
@@ -124,14 +124,14 @@
     river_id  NUMBER(38,0) NOT NULL CONSTRAINT cChannelRivers REFERENCES rivers(id) ON DELETE CASCADE,
     kmrange_info  VARCHAR2(32),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256),
+    notes  VARCHAR2(256),
     year_from  NUMBER(4,0),
     year_to  NUMBER(4,0)
 );
 COMMENT ON TABLE channel IS 'Longitudinal section of the navigable channel of a river' ;
 COMMENT ON COLUMN channel.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN channel.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN channel."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN channel.notes IS 'File header line info "weitere Bemerkungen"' ;
 COMMENT ON COLUMN channel.year_from IS 'Start year of the period for which the channel values are valid, NULL when valid for the whole past';
 COMMENT ON COLUMN channel.year_to IS 'End year of the period for which the channel values are valid, NULL when unlimited';
 
@@ -172,13 +172,13 @@
     year  NUMBER(4,0) NOT NULL,
     kmrange_info  VARCHAR2(32),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 COMMENT ON TABLE collision IS 'Longitudinal section of ship collisions with the river bed' ;
 COMMENT ON COLUMN collision.year IS 'File header line info "Jahr"' ;
 COMMENT ON COLUMN collision.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN collision.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN collision."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN collision.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE COLLISION_ID_SEQ ;
 
@@ -212,7 +212,7 @@
     groupname  VARCHAR2(32) NOT NULL CHECK(groupname IN ('messung','berechnung')),
     sounding_info  VARCHAR2(64),
     evaluation_by  VARCHAR2(256),
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 COMMENT ON TABLE tkh IS 'Longitudinal section of computed Transportkoerperhoehe of a river' ;
 COMMENT ON COLUMN tkh.day IS 'File header line info "Datum"' ;
@@ -221,7 +221,7 @@
 COMMENT ON COLUMN tkh.groupname IS 'Group the file belongs to' ;
 COMMENT ON COLUMN tkh.sounding_info IS 'File header line info "Peilung"' ;
 COMMENT ON COLUMN tkh.evaluation_by IS 'File header line info "Auswerter"' ;
-COMMENT ON COLUMN tkh."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN tkh.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE TKH_ID_SEQ ;
 
@@ -260,7 +260,7 @@
     filename  VARCHAR2(256) NOT NULL,
     sounding_info  VARCHAR2(64),
     evaluation_by  VARCHAR2(255),
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 
 COMMENT ON TABLE flow_depth IS 'Longitudinal section of computed flow depth of a river' ;
@@ -269,7 +269,7 @@
 COMMENT ON COLUMN flow_depth.filename IS 'Name without type extension of the imported file' ;
 COMMENT ON COLUMN flow_depth.sounding_info IS 'File header line info "Peilung"' ;
 COMMENT ON COLUMN flow_depth.evaluation_by IS 'File header line info "Auswerter"' ;
-COMMENT ON COLUMN flow_depth."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN flow_depth.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE FLOW_DEPTH_ID_SEQ ;
 
@@ -314,7 +314,7 @@
     old_glw  VARCHAR2(64) NOT NULL,
     filename  VARCHAR2(256) NOT NULL,
     groupname  VARCHAR2(32) NOT NULL CHECK(groupname IN ('aktuell','etappe')),
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 COMMENT ON TABLE depth_evolution IS 'Longitudinal section of the evolution of the flow depth of a river' ;
 COMMENT ON COLUMN depth_evolution.reference_year IS 'File header line info "Bezugsjahr" (GlW)' ;
@@ -326,7 +326,7 @@
 COMMENT ON COLUMN depth_evolution.old_glw IS 'File header line info "Historische Wasserspiegellage"' ;
 COMMENT ON COLUMN depth_evolution.filename IS 'Name without type extension of the imported file' ;
 COMMENT ON COLUMN depth_evolution.groupname IS 'Group the file belongs to' ;
-COMMENT ON COLUMN depth_evolution."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN depth_evolution.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE DEPTH_EVOLUTION_ID_SEQ ;
 
@@ -382,14 +382,14 @@
     evaluation_by  VARCHAR2(255),
     kmrange_info  VARCHAR2(32),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 
 COMMENT ON TABLE salix IS 'Longitudinal section of the salix line parameters of a river' ;
 COMMENT ON COLUMN salix.evaluation_by IS 'File header line info "Auswerter"' ;
 COMMENT ON COLUMN salix.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN salix.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN salix."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN salix.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE SALIX_ID_SEQ ;
 
@@ -445,13 +445,13 @@
     river_id  NUMBER(38,0) NOT NULL CONSTRAINT cVegetationRivers REFERENCES rivers(id) ON DELETE CASCADE,
     name  VARCHAR2(256),
     filename  VARCHAR2(256) NOT NULL,
-    "comment"  VARCHAR2(256)
+    notes  VARCHAR2(256)
 );
 
 COMMENT ON TABLE vegetation IS 'Classification of the vegetation of a river' ;
 COMMENT ON COLUMN vegetation.name IS 'File header line info "Einteilung"' ;
 COMMENT ON COLUMN vegetation.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN vegetation."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN vegetation.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE VEGETATION_ID_SEQ ;
 
diff -r 1574ce45c98d -r 4c5eeaff554c backend/doc/schema/postgresql-sinfo-uinfo.sql
--- a/backend/doc/schema/postgresql-sinfo-uinfo.sql	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/doc/schema/postgresql-sinfo-uinfo.sql	Wed May 02 06:56:21 2018 +0200
@@ -11,9 +11,9 @@
 
 ALTER TABLE bed_height
   ADD sounding_width_info VARCHAR(256),
-  ADD "comment" VARCHAR(256);
+  ADD notes VARCHAR(256);
 COMMENT ON COLUMN bed_height.sounding_width_info IS 'File header line info "ausgewertete Peilbreite"' ;
-COMMENT ON COLUMN bed_height."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN bed_height.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 
 --Add new columns bed_height_values.min_height (Talweg) and bed_height_values.max_height (Kammlage) (same type as existing height column)
@@ -52,12 +52,12 @@
     river_id  integer NOT NULL CONSTRAINT cBedMobilityRivers REFERENCES rivers(id) ON DELETE CASCADE,
     kmrange_info  VARCHAR(32),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 COMMENT ON TABLE bed_mobility IS 'Longitudinal section of the bed mobility of a river' ;
 COMMENT ON COLUMN bed_mobility.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN bed_mobility.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN bed_mobility."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN bed_mobility.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE BED_MOBILITY_ID_SEQ ;
 
@@ -86,7 +86,7 @@
     evaluation_by  VARCHAR(256),
     kmrange_info  VARCHAR(32),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 COMMENT ON TABLE infrastructure IS 'Longitudinal section of infrastructures of a river and a type' ;
 COMMENT ON COLUMN infrastructure.year IS 'File header line info "Stand"' ;
@@ -94,7 +94,7 @@
 COMMENT ON COLUMN infrastructure.evaluation_by IS 'File header line info "Auswerter"' ;
 COMMENT ON COLUMN infrastructure.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN infrastructure.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN infrastructure."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN infrastructure.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE INFRASTRUCTURE_ID_SEQ ;
 
@@ -120,14 +120,14 @@
     river_id  integer NOT NULL CONSTRAINT cChannelRivers REFERENCES rivers(id) ON DELETE CASCADE,
     kmrange_info  VARCHAR(32),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256),
+    notes  VARCHAR(256),
     year_from  NUMERIC(4,0),
     year_to  NUMERIC(4,0)
 );
 COMMENT ON TABLE channel IS 'Longitudinal section of the navigable channel of a river' ;
 COMMENT ON COLUMN channel.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN channel.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN channel."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN channel.notes IS 'File header line info "weitere Bemerkungen"' ;
 COMMENT ON COLUMN channel.year_from IS 'Start year of the period for which the channel values are valid, NULL when valid for the whole past';
 COMMENT ON COLUMN channel.year_to IS 'End year of the period for which the channel values are valid, NULL when unlimited';
 
@@ -168,13 +168,13 @@
     year  NUMERIC(4,0) NOT NULL,
     kmrange_info  VARCHAR(32),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 COMMENT ON TABLE collision IS 'Longitudinal section of ship collisions with the river bed' ;
 COMMENT ON COLUMN collision.year IS 'File header line info "Jahr"' ;
 COMMENT ON COLUMN collision.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN collision.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN collision."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN collision.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE COLLISION_ID_SEQ ;
 
@@ -208,7 +208,7 @@
     groupname  VARCHAR(32) NOT NULL CHECK(groupname IN ('messung','berechnung')),
     sounding_info  VARCHAR(64),
     evaluation_by  VARCHAR(256),
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 COMMENT ON TABLE tkh IS 'Longitudinal section of computed Transportkörperhöhe of a river' ;
 COMMENT ON COLUMN tkh.day IS 'File header line info "Datum"' ;
@@ -217,7 +217,7 @@
 COMMENT ON COLUMN tkh.groupname IS 'Group the file belongs to' ;
 COMMENT ON COLUMN tkh.sounding_info IS 'File header line info "Peilung"' ;
 COMMENT ON COLUMN tkh.evaluation_by IS 'File header line info "Auswerter"' ;
-COMMENT ON COLUMN tkh."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN tkh.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE TKH_ID_SEQ ;
 
@@ -256,7 +256,7 @@
     filename  VARCHAR(256) NOT NULL,
     sounding_info  VARCHAR(64),
     evaluation_by  VARCHAR(255),
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 
 COMMENT ON TABLE flow_depth IS 'Longitudinal section of computed flow depth of a river' ;
@@ -265,7 +265,7 @@
 COMMENT ON COLUMN flow_depth.filename IS 'Name without type extension of the imported file' ;
 COMMENT ON COLUMN flow_depth.sounding_info IS 'File header line info "Peilung"' ;
 COMMENT ON COLUMN flow_depth.evaluation_by IS 'File header line info "Auswerter"' ;
-COMMENT ON COLUMN flow_depth."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN flow_depth.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE FLOW_DEPTH_ID_SEQ ;
 
@@ -310,7 +310,7 @@
     old_glw  VARCHAR(64) NOT NULL,
     filename  VARCHAR(256) NOT NULL,
     groupname  VARCHAR(32) NOT NULL CHECK(groupname IN ('aktuell','etappe')),
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 COMMENT ON TABLE depth_evolution IS 'Longitudinal section of the evolution of the flow depth of a river' ;
 COMMENT ON COLUMN depth_evolution.reference_year IS 'File header line info "Bezugsjahr" (GlW)' ;
@@ -322,7 +322,7 @@
 COMMENT ON COLUMN depth_evolution.old_glw IS 'File header line info "Historische Wasserspiegellage"' ;
 COMMENT ON COLUMN depth_evolution.filename IS 'Name without type extension of the imported file' ;
 COMMENT ON COLUMN depth_evolution.groupname IS 'Group the file belongs to' ;
-COMMENT ON COLUMN depth_evolution."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN depth_evolution.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE DEPTH_EVOLUTION_ID_SEQ ;
 
@@ -378,14 +378,14 @@
     evaluation_by  VARCHAR(255),
     kmrange_info  VARCHAR(32),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 
 COMMENT ON TABLE salix IS 'Longitudinal section of the salix line parameters of a river' ;
 COMMENT ON COLUMN salix.evaluation_by IS 'File header line info "Auswerter"' ;
 COMMENT ON COLUMN salix.kmrange_info IS 'File header line info "Strecke"' ;
 COMMENT ON COLUMN salix.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN salix."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN salix.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE SALIX_ID_SEQ ;
 
@@ -441,13 +441,13 @@
     river_id  integer NOT NULL CONSTRAINT cVegetationRivers REFERENCES rivers(id) ON DELETE CASCADE,
     name  VARCHAR(256),
     filename  VARCHAR(256) NOT NULL,
-    "comment"  VARCHAR(256)
+    notes  VARCHAR(256)
 );
 
 COMMENT ON TABLE vegetation IS 'Classification of the vegetation of a river' ;
 COMMENT ON COLUMN vegetation.name IS 'File header line info "Einteilung"' ;
 COMMENT ON COLUMN vegetation.filename IS 'Name without type extension of the imported file' ;
-COMMENT ON COLUMN vegetation."comment" IS 'File header line info "weitere Bemerkungen"' ;
+COMMENT ON COLUMN vegetation.notes IS 'File header line info "weitere Bemerkungen"' ;
 
 CREATE SEQUENCE VEGETATION_ID_SEQ ;
 
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java	Wed May 02 06:56:21 2018 +0200
@@ -37,7 +37,7 @@
     protected ImportElevationModel curElevationModel;
     protected ImportElevationModel oldElevationModel;
     protected String sounding_width_info;
-    protected String comment;
+    protected String notes;
 
     protected List<ImportBedHeightValue> values;
 
@@ -102,8 +102,8 @@
         this.sounding_width_info = sounding_width_info;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     public void addValue(final ImportBedHeightValue value) {
@@ -180,7 +180,7 @@
             log.info("Create new BedHeight DB instance.");
             this.peer = new BedHeight(river, this.year, theType, this.locationSystem.getPeer(), theCurModel,
                     (this.oldElevationModel != null) ? this.oldElevationModel.getPeer() : null, this.range.getPeer(river),
-                            this.evaluationBy, this.description, this.sounding_width_info, this.comment);
+                            this.evaluationBy, this.description, this.sounding_width_info, this.notes);
             session.save(this.peer);
             this.storeMode = StoreMode.INSERT;
         }
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/common/AbstractParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/common/AbstractParser.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/common/AbstractParser.java	Wed May 02 06:56:21 2018 +0200
@@ -357,7 +357,7 @@
         final Matcher m = META_COMMENTS.matcher(this.currentLine);
         if (m.matches()) {
             this.metaPatternsMatched.add(META_COMMENTS);
-            this.seriesHeader.setComment(parseMetaInfo(m.group(1)));
+            this.seriesHeader.setNotes(parseMetaInfo(m.group(1)));
             return true;
         }
         return false;
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/common/AbstractSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -37,7 +37,7 @@
 
     protected String kmrange_info;
 
-    protected String comment;
+    protected String notes;
 
     protected final List<KMLINE> values;
 
@@ -87,12 +87,12 @@
         this.kmrange_info = kmrange_info;
     }
 
-    public String getComment() {
-        return this.comment;
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     public int getValueCount() {
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Wed May 02 06:56:21 2018 +0200
@@ -275,7 +275,7 @@
         final Matcher m = META_COMMENTS.matcher(line);
         if (m.matches()) {
             final String tmp = m.group(1).replace(SEPERATOR_CHAR, "").trim();
-            obj.setComment(tmp);
+            obj.setNotes(tmp);
             return true;
         }
         return false;
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/BedMobilitySeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/BedMobilitySeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/BedMobilitySeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -57,6 +57,6 @@
 
     @Override
     public BedMobility createSeriesItem(final River river) {
-        return new BedMobility(river, this.filename, this.kmrange_info, this.comment);
+        return new BedMobility(river, this.filename, this.kmrange_info, this.notes);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/ChannelSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -69,6 +69,6 @@
 
     @Override
     public Channel createSeriesItem(final River river) {
-        return new Channel(river, this.filename, this.kmrange_info, this.comment, this.year_from, this.year_to);
+        return new Channel(river, this.filename, this.kmrange_info, this.notes, this.year_from, this.year_to);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/CollisionSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/CollisionSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/CollisionSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -64,6 +64,6 @@
 
     @Override
     public Collision createSeriesItem(final River river) {
-        return new Collision(river, this.filename, this.kmrange_info, this.comment, this.year);
+        return new Collision(river, this.filename, this.kmrange_info, this.notes, this.year);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DailyDischargeSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DailyDischargeSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DailyDischargeSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -88,6 +88,6 @@
 
     @Override
     public DailyDischarge createSeriesItem(final River river) {
-        return new DailyDischarge(this.gauge, this.filename, this.comment);
+        return new DailyDischarge(this.gauge, this.filename, this.notes);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/DepthEvolutionSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -106,7 +106,7 @@
 
     @Override
     public DepthEvolution createSeriesItem(final River river) {
-        return new DepthEvolution(river, this.filename, this.kmrange_info, this.comment, this.start_year, this.reference_year, this.curr_sounding,
+        return new DepthEvolution(river, this.filename, this.kmrange_info, this.notes, this.start_year, this.reference_year, this.curr_sounding,
                 this.old_sounding, this.curr_glw, this.old_glw, this.group);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/FlowDepthSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/FlowDepthSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/FlowDepthSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -39,7 +39,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private int year;
 
@@ -73,12 +73,12 @@
         this.kmrange_info = kmrange_info;
     }
 
-    public String getComment() {
-        return this.comment;
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     public int getYear() {
@@ -140,6 +140,6 @@
     }
 
     private FlowDepth createSeriesItem(final River river) {
-        return new FlowDepth(river, this.filename, this.kmrange_info, this.comment, this.year, this.sounding_info, this.evaluation_by);
+        return new FlowDepth(river, this.filename, this.kmrange_info, this.notes, this.year, this.sounding_info, this.evaluation_by);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/InfrastructureSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/InfrastructureSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/InfrastructureSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -83,6 +83,6 @@
 
     @Override
     public Infrastructure createSeriesItem(final River river) {
-        return new Infrastructure(river, this.filename, this.kmrange_info, this.comment, this.type.getPeer(), this.year, this.provider, this.evaluation_by);
+        return new Infrastructure(river, this.filename, this.kmrange_info, this.notes, this.type.getPeer(), this.year, this.provider, this.evaluation_by);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -43,7 +43,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private Date day;
 
@@ -85,12 +85,12 @@
         this.kmrange_info = kmrange_info;
     }
 
-    public String getComment() {
-        return this.comment;
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     public Date getDay() {
@@ -152,6 +152,6 @@
     }
 
     private Tkh createSeriesItem(final River river) {
-        return new Tkh(river, this.filename, this.kmrange_info, this.comment, this.day, this.sounding_info, this.evaluation_by, this.group);
+        return new Tkh(river, this.filename, this.kmrange_info, this.notes, this.day, this.sounding_info, this.evaluation_by, this.group);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/FlowDepthParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/FlowDepthParser.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/FlowDepthParser.java	Wed May 02 06:56:21 2018 +0200
@@ -188,7 +188,7 @@
         if (!super.handleMetaColumnTitles())
             return false;
         this.tkhGroup.setKmrange_info(this.seriesHeader.getKmrange_info());
-        this.tkhGroup.setComment(this.seriesHeader.getComment());
+        this.tkhGroup.setNotes(this.seriesHeader.getNotes());
         for (int i = 1; i <= this.columnTitles.size() - 1; i++) {
             final Matcher m = COLUMN_TITLE.matcher(this.columnTitles.get(i));
             if (m.matches())
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/TkhParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/TkhParser.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/TkhParser.java	Wed May 02 06:56:21 2018 +0200
@@ -235,7 +235,7 @@
         if (!super.handleMetaColumnTitles())
             return false;
         this.tkhGroup.setKmrange_info(this.seriesHeader.getKmrange_info());
-        this.tkhGroup.setComment(this.seriesHeader.getComment());
+        this.tkhGroup.setNotes(this.seriesHeader.getNotes());
         for (int i = 1; i <= this.columnTitles.size() - 1; i++) {
             final Matcher m = COLUMN_TITLE.matcher(this.columnTitles.get(i));
             if (m.matches())
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/SalixSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/SalixSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/SalixSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -64,6 +64,6 @@
 
     @Override
     public Salix createSeriesItem(final River river) {
-        return new Salix(river, this.filename, this.kmrange_info, this.comment, this.evaluation_by);
+        return new Salix(river, this.filename, this.kmrange_info, this.notes, this.evaluation_by);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/importitem/VegetationSeriesImport.java	Wed May 02 06:56:21 2018 +0200
@@ -64,6 +64,6 @@
 
     @Override
     public Vegetation createSeriesItem(final River river) {
-        return new Vegetation(river, this.filename, this.name, this.comment);
+        return new Vegetation(river, this.filename, this.name, this.notes);
     }
 }
\ No newline at end of file
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/BedHeight.java
--- a/backend/src/main/java/org/dive4elements/river/model/BedHeight.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/BedHeight.java	Wed May 02 06:56:21 2018 +0200
@@ -51,7 +51,7 @@
     private Range range;
 
     private String sounding_width_info;
-    private String comment;
+    private String notes;
 
     private List<BedHeightValue> values;
 
@@ -68,9 +68,8 @@
 
 
     public BedHeight(final River river, final Integer year, final BedHeightType type, final LocationSystem locationSystem,
-            final ElevationModel curElevationModel,
-            final ElevationModel oldElevationModel, final Range range, final String evaluationBy, final String description, final String sounding_width_info,
-            final String comment) {
+            final ElevationModel curElevationModel, final ElevationModel oldElevationModel, final Range range, final String evaluationBy,
+            final String description, final String sounding_width_info, final String notes) {
         this.river             = river;
         this.year              = year;
         this.type              = type;
@@ -81,7 +80,7 @@
         this.evaluationBy      = evaluationBy;
         this.description       = description;
         this.sounding_width_info = sounding_width_info;
-        this.comment = comment;
+        this.notes = notes;
     }
 
 
@@ -193,13 +192,13 @@
         this.sounding_width_info = sounding_width_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @OneToMany
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/BedMobility.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/BedMobility.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/BedMobility.java	Wed May 02 06:56:21 2018 +0200
@@ -52,7 +52,7 @@
 
     private String filename;
 
-    private String comment;
+    private String notes;
 
     private River river;
 
@@ -65,11 +65,11 @@
     }
 
 
-    public BedMobility(final River river, final String filename, final String kmrange_info, final String comment) {
+    public BedMobility(final River river, final String filename, final String kmrange_info, final String notes) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.values = new ArrayList<>();
     }
 
@@ -115,13 +115,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @OneToMany
@@ -143,7 +143,7 @@
      */
     public static BedMobility queryForRiver(final River river) {
         final Session session = SessionHolder.HOLDER.get();
-        final Query query = session.createQuery("FROM BedMobilty WHERE river=:river");
+        final Query query = session.createQuery("FROM BedMobility WHERE river=:river");
         query.setParameter("river", river);
         final List<BedMobility> rows = query.list();
         if (rows != null)
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/Channel.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/Channel.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/Channel.java	Wed May 02 06:56:21 2018 +0200
@@ -51,7 +51,7 @@
 
     private String filename;
 
-    private String comment;
+    private String notes;
 
     private Integer year_from;
 
@@ -65,11 +65,11 @@
     public Channel() {
     }
 
-    public Channel(final River river, final String filename, final String kmrange_info, final String comment, final Integer year_from, final Integer year_to) {
+    public Channel(final River river, final String filename, final String kmrange_info, final String notes, final Integer year_from, final Integer year_to) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.setYear_from(year_from);
         this.setYear_to(year_to);
         this.values = new ArrayList<>();
@@ -117,13 +117,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "year_from")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/Collision.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/Collision.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/Collision.java	Wed May 02 06:56:21 2018 +0200
@@ -50,7 +50,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private Integer year;
 
@@ -63,11 +63,11 @@
     }
 
 
-    public Collision(final River river, final String filename, final String kmrange_info, final String comment, final Integer year) {
+    public Collision(final River river, final String filename, final String kmrange_info, final String notes, final Integer year) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.year = year;
         this.values = new ArrayList<>();
     }
@@ -114,13 +114,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "year")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/DailyDischarge.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/DailyDischarge.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/DailyDischarge.java	Wed May 02 06:56:21 2018 +0200
@@ -49,7 +49,7 @@
 
     private String filename;
 
-    // private String comment;
+    // private String notes;
 
     private Gauge gauge;
 
@@ -62,11 +62,11 @@
     }
 
 
-    public DailyDischarge(final Gauge gauge, final String filename, final String comment) {
+    public DailyDischarge(final Gauge gauge, final String filename, final String notes) {
         this.gauge = gauge;
         // this.river = river;
         this.filename = filename;
-        // this.comment = comment;
+        // this.notes = notes;
         this.values = new ArrayList<>();
     }
 
@@ -122,13 +122,13 @@
     // this.kmrange_info = kmrange_info;
     // }
 
-    // @Column(name = "comment")
-    // public String getComment() {
-    // return this.comment;
+    // @Column(name = "notes")
+    // public String getNotes() {
+    // return this.notes;
     // }
 
-    // public void setComment(final String comment) {
-    // this.comment = comment;
+    // public void setNotes(final String notes) {
+    // this.notes = notes;
     // }
 
     @OneToMany
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/DepthEvolution.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/DepthEvolution.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/DepthEvolution.java	Wed May 02 06:56:21 2018 +0200
@@ -91,7 +91,7 @@
 
     private transient Group group;
 
-    private String comment;
+    private String notes;
 
     private Integer start_year;
 
@@ -113,13 +113,13 @@
     public DepthEvolution() {
     }
 
-    public DepthEvolution(final River river, final String filename, final String kmrange_info, final String comment, final Integer start_year,
+    public DepthEvolution(final River river, final String filename, final String kmrange_info, final String notes, final Integer start_year,
             final Integer reference_year, final String curr_sounding, final String old_sounding, final String curr_glw, final String old_glw,
             final Group group) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.setStart_year(start_year);
         this.setReference_year(reference_year);
         this.curr_sounding = curr_sounding;
@@ -190,13 +190,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "start_year")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/FlowDepth.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/FlowDepth.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/FlowDepth.java	Wed May 02 06:56:21 2018 +0200
@@ -50,7 +50,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private Integer year;
 
@@ -67,12 +67,12 @@
     }
 
 
-    public FlowDepth(final River river, final String filename, final String kmrange_info, final String comment, final Integer year, final String sounding_info,
+    public FlowDepth(final River river, final String filename, final String kmrange_info, final String notes, final Integer year, final String sounding_info,
             final String evaluation_by) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.year = year;
         this.setSounding_info(sounding_info);
         this.setEvaluation_by(evaluation_by);
@@ -121,13 +121,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "year")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/Infrastructure.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/Infrastructure.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/Infrastructure.java	Wed May 02 06:56:21 2018 +0200
@@ -51,7 +51,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private AnnotationType type;
 
@@ -70,12 +70,13 @@
     }
 
 
-    public Infrastructure(final River river, final String filename, final String kmrange_info, final String comment, final AnnotationType type, final Integer year,
+    public Infrastructure(final River river, final String filename, final String kmrange_info, final String notes, final AnnotationType type,
+            final Integer year,
             final String dataprovider, final String evaluation_by) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.type = type;
         this.year = year;
         this.dataprovider = dataprovider;
@@ -125,13 +126,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @OneToOne
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/sinfo/Tkh.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/Tkh.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/Tkh.java	Wed May 02 06:56:21 2018 +0200
@@ -89,7 +89,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private Date day;
 
@@ -106,12 +106,12 @@
     }
 
 
-    public Tkh(final River river, final String filename, final String kmrange_info, final String comment, final Date day, final String sounding_info,
+    public Tkh(final River river, final String filename, final String kmrange_info, final String notes, final Date day, final String sounding_info,
             final String evaluation_by, final Group group) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.day = day;
         this.setSounding_info(sounding_info);
         this.setEvaluation_by(evaluation_by);
@@ -179,13 +179,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "day")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/uinfo/Salix.java
--- a/backend/src/main/java/org/dive4elements/river/model/uinfo/Salix.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/uinfo/Salix.java	Wed May 02 06:56:21 2018 +0200
@@ -50,7 +50,7 @@
 
     private String kmrange_info;
 
-    private String comment;
+    private String notes;
 
     private String evaluation_by;
 
@@ -63,11 +63,11 @@
     }
 
 
-    public Salix(final River river, final String filename, final String kmrange_info, final String comment, final String evaluation_by) {
+    public Salix(final River river, final String filename, final String kmrange_info, final String notes, final String evaluation_by) {
         this.river = river;
         this.filename = filename;
         this.kmrange_info = kmrange_info;
-        this.comment = comment;
+        this.notes = notes;
         this.evaluation_by = evaluation_by;
         this.values = new ArrayList<>();
     }
@@ -114,13 +114,13 @@
         this.kmrange_info = kmrange_info;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @Column(name = "evaluation_by")
diff -r 1574ce45c98d -r 4c5eeaff554c backend/src/main/java/org/dive4elements/river/model/uinfo/Vegetation.java
--- a/backend/src/main/java/org/dive4elements/river/model/uinfo/Vegetation.java	Mon Apr 30 18:06:31 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/uinfo/Vegetation.java	Wed May 02 06:56:21 2018 +0200
@@ -50,7 +50,7 @@
 
     private String name;
 
-    private String comment;
+    private String notes;
 
     private List<VegetationZone> values;
 
@@ -61,11 +61,11 @@
     }
 
 
-    public Vegetation(final River river, final String filename, final String name, final String comment) {
+    public Vegetation(final River river, final String filename, final String name, final String notes) {
         this.river = river;
         this.filename = filename;
         this.name = name;
-        this.comment = comment;
+        this.notes = notes;
         this.values = new ArrayList<>();
     }
 
@@ -111,13 +111,13 @@
         this.name = name;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return this.comment;
+    @Column(name = "notes")
+    public String getNotes() {
+        return this.notes;
     }
 
-    public void setComment(final String comment) {
-        this.comment = comment;
+    public void setNotes(final String notes) {
+        this.notes = notes;
     }
 
     @OneToMany