From 338938f205b12e981cdaadf4feb30c6fe184c7d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
Date: Fri, 21 May 2010 23:25:37 +0200
Subject: [PATCH] gpst: Moving lots of code out of print_entry() into the new
 gen_entry()

It receives lots of arguments, will fix that later.

93a7927c-651f-11df-9bad-90e6ba3022ac
20cdac12-66f7-11df-b2d9-90e6ba3022ac
030e4de2-66f9-11df-99e3-90e6ba3022ac
---
 gpst | 185 +++++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 97 insertions(+), 88 deletions(-)

diff --git a/gpst b/gpst
index ef4bb0c..a5499ba 100755
--- a/gpst
+++ b/gpst
@@ -934,94 +934,7 @@ sub print_entry {
         unless ($first_time) {
             $first_time = $ep_time;
         }
-        if ($Opt{'double-y-scale'} && length($Dat{'lat'})) {
-            $Dat{'lat'} *= 2;
-        }
-        if ($Opt{'output-format'} eq "gpsml") {
-            if ($Dat{'what'} eq "tp") {
-                $Dat{'format'} = "gpsml";
-                $Line .= trackpoint(%Dat);
-            } elsif ($Dat{'what'} =~ /^(pause|desc|title)$/) {
-                $Line .= sprintf("<%s>%s</%s>\n",
-                                 $1,
-                                 $Dat{$1},
-                                 $1);
-            }
-        } elsif ($Opt{'output-format'} eq "pgtab") {
-            if ($Dat{'what'} eq "tp" && !length($Dat{'error'})) {
-                $Dat{'format'} = "pgtab";
-                $Line .= trackpoint(%Dat);
-            }
-        } elsif ($Opt{'output-format'} eq "xgraph") {
-            if ($print_pos && !length($Dat{'error'})) {
-                $Dat{'format'} = "xgraph";
-                $Line .= trackpoint(%Dat);
-            }
-        } elsif($Opt{'output-format'} eq "gpstrans") {
-            if ($print_pos && !length($Dat{'error'})) {
-                $Dat{'format'} = "gpstrans";
-                $Line .= trackpoint(%Dat);
-            }
-        } elsif($Opt{'output-format'} eq "gpx") {
-            if ($Dat{'what'} eq "tp") {
-                $Dat{'format'} = "gpx";
-                $Line .= trackpoint(%Dat);
-            }
-        } elsif ($Opt{'output-format'} eq "clean") {
-            if ($Dat{'what'} eq "tp" && !length($Dat{'error'})) {
-                $Dat{'format'} = "clean";
-                $Line .= trackpoint(%Dat);
-            }
-        } elsif ($Opt{'output-format'} eq "ps") {
-            $Line .= (
-                $pause_len
-                    ? "f\n$Dat{'lon'} $Dat{'lat'} m\n"
-                    : "$Dat{'lon'} $Dat{'lat'} l\n"
-            );
-        } elsif ($Opt{'output-format'} eq "svg") {
-            $Line .= (
-                ($last_lon == 1000) || $pause_len
-                    ? join("",
-                        "$svg_start_thing<path\n",
-                        "  stroke=\"blue\"\n",
-                        "  stroke-width=\"0.001\"\n",
-                        "  fill=\"none\"\n",
-                        "  d=\"\n",
-                        "M $Dat{'lon'} $Dat{'lat'}\n")
-                    : "L $Dat{'lon'} $Dat{'lat'}\n"
-            );
-        } elsif ($Opt{'output-format'} eq "ygraph") {
-            if (!length($Dat{'error'})) {
-                my $Time = $print_time ? ($ep_time - $first_time) * 1 : 0;
-                $Line .= "\"Time = $Time.0\n$Dat{'lon'} $Dat{'lat'}\n\n";
-            }
-        } elsif ($Opt{'output-format'} eq "csv") {
-            # {{{
-            if (!length($Dat{'error'})) {
-                $Dat{'format'} = "csv";
-                $Line .= join("\t",
-                    $print_time
-                        ? $Opt{'epoch'}
-                            ? $ep_time
-                            : $Opt{'short-date'}
-                                ? "$Dat{'year'}$Dat{'month'}$Dat{'day'}T" .
-                                  "$Dat{'hour'}$Dat{'min'}$Dat{'sec'}Z"
-                                : "$Dat{'year'}-$Dat{'month'}-$Dat{'day'}T" .
-                                  "$Dat{'hour'}:$Dat{'min'}:$Dat{'sec'}Z"
-                        : "",
-                    $Dat{'lon'},
-                    $Dat{'lat'},
-                    $print_ele ? $Dat{'ele'} : "", # Elevation
-                    "\n"
-                );
-            }
-            # }}}
-        } elsif ($Opt{'output-format'} eq "pgwtab") {
-            # FIXME: NOP at the moment.
-        } else {
-            die("$progname: \"$Opt{'output-format'}\": " .
-                "Unknown output format\n");
-        }
+        $Line .= gen_entry($print_pos, $pause_len, $print_time, $ep_time, $print_ele, %Dat);
         # }}}
     }
 
@@ -1055,6 +968,102 @@ sub print_entry {
     # }}}
 }
 
+sub gen_entry {
+    # Generate trackpoint entry, calls trackpoint() {{{
+    my ($print_pos, $pause_len, $print_time, $ep_time, $print_ele, %Dat) = @_;
+    my $Line = "";
+    if ($Opt{'double-y-scale'} && length($Dat{'lat'})) {
+        $Dat{'lat'} *= 2;
+    }
+    if ($Opt{'output-format'} eq "gpsml") {
+        if ($Dat{'what'} eq "tp") {
+            $Dat{'format'} = "gpsml";
+            $Line .= trackpoint(%Dat);
+        } elsif ($Dat{'what'} =~ /^(pause|desc|title)$/) {
+            $Line .= sprintf("<%s>%s</%s>\n",
+                             $1,
+                             $Dat{$1},
+                             $1);
+        }
+    } elsif ($Opt{'output-format'} eq "pgtab") {
+        if ($Dat{'what'} eq "tp" && !length($Dat{'error'})) {
+            $Dat{'format'} = "pgtab";
+            $Line .= trackpoint(%Dat);
+        }
+    } elsif ($Opt{'output-format'} eq "xgraph") {
+        if ($print_pos && !length($Dat{'error'})) {
+            $Dat{'format'} = "xgraph";
+            $Line .= trackpoint(%Dat);
+        }
+    } elsif($Opt{'output-format'} eq "gpstrans") {
+        if ($print_pos && !length($Dat{'error'})) {
+            $Dat{'format'} = "gpstrans";
+            $Line .= trackpoint(%Dat);
+        }
+    } elsif($Opt{'output-format'} eq "gpx") {
+        if ($Dat{'what'} eq "tp") {
+            $Dat{'format'} = "gpx";
+            $Line .= trackpoint(%Dat);
+        }
+    } elsif ($Opt{'output-format'} eq "clean") {
+        if ($Dat{'what'} eq "tp" && !length($Dat{'error'})) {
+            $Dat{'format'} = "clean";
+            $Line .= trackpoint(%Dat);
+        }
+    } elsif ($Opt{'output-format'} eq "ps") {
+        $Line .= (
+            $pause_len
+                ? "f\n$Dat{'lon'} $Dat{'lat'} m\n"
+                : "$Dat{'lon'} $Dat{'lat'} l\n"
+        );
+    } elsif ($Opt{'output-format'} eq "svg") {
+        $Line .= (
+            ($last_lon == 1000) || $pause_len
+                ? join("",
+                    "$svg_start_thing<path\n",
+                    "  stroke=\"blue\"\n",
+                    "  stroke-width=\"0.001\"\n",
+                    "  fill=\"none\"\n",
+                    "  d=\"\n",
+                    "M $Dat{'lon'} $Dat{'lat'}\n")
+                : "L $Dat{'lon'} $Dat{'lat'}\n"
+        );
+    } elsif ($Opt{'output-format'} eq "ygraph") {
+        if (!length($Dat{'error'})) {
+            my $Time = $print_time ? ($ep_time - $first_time) * 1 : 0;
+            $Line .= "\"Time = $Time.0\n$Dat{'lon'} $Dat{'lat'}\n\n";
+        }
+    } elsif ($Opt{'output-format'} eq "csv") {
+        # {{{
+        if (!length($Dat{'error'})) {
+            $Dat{'format'} = "csv";
+            $Line .= join("\t",
+                $print_time
+                    ? $Opt{'epoch'}
+                        ? $ep_time
+                        : $Opt{'short-date'}
+                            ? "$Dat{'year'}$Dat{'month'}$Dat{'day'}T" .
+                              "$Dat{'hour'}$Dat{'min'}$Dat{'sec'}Z"
+                            : "$Dat{'year'}-$Dat{'month'}-$Dat{'day'}T" .
+                              "$Dat{'hour'}:$Dat{'min'}:$Dat{'sec'}Z"
+                    : "",
+                $Dat{'lon'},
+                $Dat{'lat'},
+                $print_ele ? $Dat{'ele'} : "", # Elevation
+                "\n"
+            );
+        }
+        # }}}
+    } elsif ($Opt{'output-format'} eq "pgwtab") {
+        # FIXME: NOP at the moment.
+    } else {
+        die("$progname: \"$Opt{'output-format'}\": " .
+            "Unknown output format\n");
+    }
+    return($Line);
+    # }}}
+} # gen_entry()
+
 sub pause_entry {
     # {{{
     my ($pause_len, $ep_time, $last_time) = @_;
-- 
2.11.4.GIT