Remove final remnants of 'exported'

GPSBabel · Jul 24, 2023 · 6996e4d · 6996e4d
1 parent 4ff119c
commit 6996e4d
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 56 deletions.
diff --git a/duplicate.cc b/duplicate.cc
@@ -81,11 +81,6 @@ void DuplicateFilter::process()
 
   auto wptlist = *global_waypoint_list;
 
-  auto compare_lambda = [](const Waypoint* wa, const Waypoint* wb)->bool {
-    return wa->gc_data->exported > wb->gc_data->exported;
-  };
-  std::stable_sort(wptlist.begin(), wptlist.end(), compare_lambda);
-
   QMultiHash<QString, Waypoint*> wpthash;
   for (Waypoint* waypointp : wptlist) {
     waypointp->extra_data = nullptr;

diff --git a/geocache.h b/geocache.h
@@ -114,7 +114,6 @@ class Geocache
   status_t is_available:2;
   status_t is_memberonly:2;
   status_t has_customcoords:2;
-  gpsbabel::DateTime exported;
   gpsbabel::DateTime last_found;
   QString placer; /* Placer name */
   int placer_id; /* Placer id */

diff --git a/gpx.cc b/gpx.cc
@@ -1080,11 +1080,6 @@ GpxFormat::fprint_xml_chain(XmlTag* tag, const Waypoint* wpt) const
       if (tag->child) {
         fprint_xml_chain(tag->child, wpt);
       }
-      if (wpt && wpt->gc_data->exported.isValid() &&
-          tag->tagname.compare(u"groundspeak:cache") == 0) {
-        writer->writeTextElement(QStringLiteral("time"),
-                                 wpt->gc_data->exported.toPrettyString());
-      }
       writer->writeEndElement();
     }
     if (!tag->parentcdata.isEmpty()) {

diff --git a/reference/duplicate_exported_1.csv b/reference/duplicate_exported_1.csv
diff --git a/reference/duplicate_exported_1~csv.csv b/reference/duplicate_exported_1~csv.csv
diff --git a/reference/duplicate_exported_2.csv b/reference/duplicate_exported_2.csv
diff --git a/reference/duplicate_exported_2~csv.csv b/reference/duplicate_exported_2~csv.csv
diff --git a/testo.d/duplicate.test b/testo.d/duplicate.test
@@ -7,8 +7,3 @@ gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -o csv -F ${TMPDIR}/filterdupe.cs
 gpsbabel -i geo -f ${REFERENCE}/geocaching.loc -f ${REFERENCE}/geocaching.loc -x duplicate,shortname \
 		-o csv -F ${TMPDIR}/filterdupe.csv2
 sort_and_compare ${TMPDIR}/filterdupe.csv1 ${TMPDIR}/filterdupe.csv2
-
-gpsbabel -i unicsv,utc -f ${REFERENCE}/duplicate_exported_1.csv -x duplicate,location -o unicsv,utc -F ${TMPDIR}/duplicate_exported_1~csv.csv
-compare ${REFERENCE}/duplicate_exported_1~csv.csv ${TMPDIR}/duplicate_exported_1~csv.csv
-gpsbabel -i unicsv,utc -f ${REFERENCE}/duplicate_exported_2.csv -x duplicate,location -o unicsv,utc -F ${TMPDIR}/duplicate_exported_2~csv.csv
-compare ${REFERENCE}/duplicate_exported_2~csv.csv ${TMPDIR}/duplicate_exported_2~csv.csv
diff --git a/unicsv.cc b/unicsv.cc
@@ -156,7 +156,6 @@ const UnicsvFormat::field_t UnicsvFormat::fields_def[] = {
   { "diff",	fld_gc_diff, kStrAny },
   { "arch",	fld_gc_is_archived, kStrAny },
   { "avail",	fld_gc_is_available, kStrAny },
-  { "exported",	fld_gc_exported, kStrAny },
   { "found",	fld_gc_last_found, kStrAny },
   { "placer_id",	fld_gc_placer_id, kStrAny },
   { "placer",	fld_gc_placer, kStrAny },
@@ -869,7 +868,6 @@ UnicsvFormat::unicsv_parse_one_line(const QString& ibuf)
     case fld_gc_diff:
     case fld_gc_is_archived:
     case fld_gc_is_available:
-    case fld_gc_exported:
     case fld_gc_last_found:
     case fld_gc_placer:
     case fld_gc_placer_id:
@@ -907,14 +905,6 @@ UnicsvFormat::unicsv_parse_one_line(const QString& ibuf)
       case fld_gc_is_available:
         gc_data->is_available = unicsv_parse_status(value);
         break;
-      case fld_gc_exported: {
-        QTime etime;
-        QDate edate;
-        etime = unicsv_parse_time(value, edate);
-        if (edate.isValid() || etime.isValid()) {
-          gc_data->exported = unicsv_adjust_time(edate, etime, true);
-        }
-      }
       break;
       case fld_gc_last_found: {
         QTime ftime;
@@ -1252,9 +1242,6 @@ UnicsvFormat::unicsv_waypt_enum_cb(const Waypoint* wpt)
     if (gc_data->is_available != Geocache::status_t::gs_unknown) {
       unicsv_outp_flags[fld_gc_is_available] = true;
     }
-    if (gc_data->exported.isValid()) {
-      unicsv_outp_flags[fld_gc_exported] = true;
-    }
     if (gc_data->last_found.isValid()) {
       unicsv_outp_flags[fld_gc_last_found] = true;
     }
@@ -1622,13 +1609,6 @@ UnicsvFormat::unicsv_waypt_disp_cb(const Waypoint* wpt)
       *fout << unicsv_fieldsep;
     }
   }
-  if (unicsv_outp_flags[fld_gc_exported]) {
-    if (gc_data) {
-      unicsv_print_date_time(gc_data->exported);
-    } else {
-      *fout << unicsv_fieldsep;
-    }
-  }
   if (unicsv_outp_flags[fld_gc_last_found]) {
     if (gc_data) {
       unicsv_print_date_time(gc_data->last_found);
@@ -1901,9 +1881,6 @@ UnicsvFormat::write()
   if (unicsv_outp_flags[fld_gc_is_available]) {
     *fout << unicsv_fieldsep << "Available";
   }
-  if (unicsv_outp_flags[fld_gc_exported]) {
-    *fout << unicsv_fieldsep << "Exported";
-  }
   if (unicsv_outp_flags[fld_gc_last_found]) {
     *fout << unicsv_fieldsep << "Last Found";
   }

diff --git a/unicsv.h b/unicsv.h
@@ -133,7 +133,6 @@ class UnicsvFormat : public Format
     fld_gc_diff,
     fld_gc_is_archived,
     fld_gc_is_available,
-    fld_gc_exported,
     fld_gc_last_found,
     fld_gc_placer,
     fld_gc_placer_id,