[PATCH] merged changes from default into double-precision branch

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1372434484 -7200
# Branch double-precision
# Node ID f4fb7e38a288b008993f62bfbec9fb02351f299f
# Parent  128ab9169db1f9cc0d4d8d75db1cd1360c09abb8
# Parent  1c68d4b2a1c0ba258cc7306068e12aa4e14768c2
merged changes from default into double-precision branch

diff -r 128ab9169db1 -r f4fb7e38a288 backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java	Fri Jun 28 17:03:48 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java	Fri Jun 28 17:48:04 2013 +0200
@@ -169,6 +169,7 @@
 
             List<WstColumn> columns = query.list();
             if (columns.isEmpty()) {
+		log.debug("source: " + source);
                 peer = new WstColumn(
                     w, name, description, source, position, ti);
                 session.save(peer);
diff -r 128ab9169db1 -r f4fb7e38a288 backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java	Fri Jun 28 17:03:48 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java	Fri Jun 28 17:48:04 2013 +0200
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Arrays;
 
 import java.io.File;
 import java.io.IOException;
@@ -217,10 +218,12 @@
                         }
                     }
                     else if (spezial.startsWith(COLUMN_QUELLE)) {
+                        spezial = spezial.substring(COLUMN_QUELLE.length()).trim();
                         if (spezial.length() == 0) {
                             continue;
                         }
                         quellen = StringUtil.splitQuoted(spezial, '"');
+			log.debug("sources: " + Arrays.toString(quellen));
                     }
                     else if (spezial.startsWith(COLUMN_DATUM)) {
                         spezial = spezial.substring(COLUMN_DATUM.length()).trim();
diff -r 128ab9169db1 -r f4fb7e38a288 backend/src/main/java/org/dive4elements/river/model/WstColumn.java
--- a/backend/src/main/java/org/dive4elements/river/model/WstColumn.java	Fri Jun 28 17:03:48 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/WstColumn.java	Fri Jun 28 17:48:04 2013 +0200
@@ -96,7 +96,7 @@
 
     @Column(name = "source")
     public String getSource() {
-        return description;
+        return source;
     }
 
     public void setSource(String source) {