diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-11-18 14:28:06 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-11-18 14:37:38 +0100 |
| commit | 7c09ead7cc72922b8fb65dc68c4f69689c22fd28 (patch) | |
| tree | 2c6e0084c5e4def2efcd4f12cca27795ce8d4cd4 /main/src/cgeo/geocaching/export/FieldnoteExport.java | |
| parent | 1bc74962a353b9af126706ef2dc1968ce878d464 (diff) | |
| download | cgeo-7c09ead7cc72922b8fb65dc68c4f69689c22fd28.zip cgeo-7c09ead7cc72922b8fb65dc68c4f69689c22fd28.tar.gz cgeo-7c09ead7cc72922b8fb65dc68c4f69689c22fd28.tar.bz2 | |
fix #2173: GSAK field notes export
GSAK requires the log type to be capitalized, e.g., "Found it", while we
were generating "found it" instead.
Some code has been factored out to be more easily testable.
Diffstat (limited to 'main/src/cgeo/geocaching/export/FieldnoteExport.java')
| -rw-r--r-- | main/src/cgeo/geocaching/export/FieldnoteExport.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java index 465641f..11214db 100644 --- a/main/src/cgeo/geocaching/export/FieldnoteExport.java +++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java @@ -135,20 +135,13 @@ class FieldnoteExport extends AbstractExport { @Override protected Boolean doInBackground(Void... params) { final StringBuilder fieldNoteBuffer = new StringBuilder(); + final cgeoapplication app = cgeoapplication.getInstance(); try { int i = 0; for (cgCache cache : caches) { if (cache.isLogOffline()) { - final LogEntry log = cgeoapplication.getInstance().loadLogOffline(cache.getGeocode()); - fieldNoteBuffer.append(cache.getGeocode()) - .append(',') - .append(fieldNoteDateFormat.format(new Date(log.date))) - .append(',') - .append(log.type.type) - .append(",\"") - .append(StringUtils.replaceChars(log.log, '"', '\'')) - .append("\"\n"); + appendFieldNote(fieldNoteBuffer, cache, app.loadLogOffline(cache.getGeocode())); publishProgress(++i); } } @@ -270,4 +263,15 @@ class FieldnoteExport extends AbstractExport { } } } + + static void appendFieldNote(final StringBuilder fieldNoteBuffer, final cgCache cache, final LogEntry log) { + fieldNoteBuffer.append(cache.getGeocode()) + .append(',') + .append(fieldNoteDateFormat.format(new Date(log.date))) + .append(',') + .append(StringUtils.capitalize(log.type.type)) + .append(",\"") + .append(StringUtils.replaceChars(log.log, '"', '\'')) + .append("\"\n"); + } } |
