Changeset 29298 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2013-03-02T00:32:50+01:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] better handling of .ods files (management of repeated cells)

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java

@@ -24 +24 @@
 import org.jopendocument.model.office.OfficeSpreadsheet;
 import org.jopendocument.model.table.TableTable;
+import org.jopendocument.model.table.TableTableCell;
 import org.jopendocument.model.table.TableTableRow;
+import org.jopendocument.model.text.TextP;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -36 +38 @@
         private int rowIndex;
         
-        private static final String SEP = "TextP:\\[";
+        private static final String SEP = "TextP:[";
         
         public OdsReader(SpreadSheetHandler handler) {
@@ -79 +81 @@
                         List<String> result = new ArrayList<String>();
                         boolean allFieldsBlank = true;
-                        for (String text : row.getText().replaceFirst(SEP, "").replaceAll("\\]", "").replaceAll("null", SEP).split(SEP)) {
-                                result.add(text);
-                                if (allFieldsBlank && !text.isEmpty()) {
-                                        allFieldsBlank = false;
-                                }
+                        for (TableTableCell cell : row.getAllCells()) {
+                            TextP textP = cell.getTextP();
+                            String text = textP == null ? "" : textP.toString().replace(SEP, "").replace("]", "").replace("null", "").trim();
+                result.add(text);
+                if (allFieldsBlank && !text.isEmpty()) {
+                    allFieldsBlank = false;
+                }
                         }