[Gpredict-svn] SF.net SVN: gpredict:[952] trunk

[<aa...@us...>]

Revision: 952
          http://gpredict.svn.sourceforge.net/gpredict/?rev=952&view=rev
Author:   aa1vs
Date:     2011-11-12 19:49:28 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Change decision of two versus three line tle's to do simpler checks first.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/tle-update.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-11-12 18:15:03 UTC (rev 951)
+++ trunk/ChangeLog	2011-11-12 19:49:28 UTC (rev 952)
@@ -6,7 +6,10 @@
     * src/gtk-sat-module-popup.c
     Sort satellite list in popup.
 
+    * src/tle-update.c
+    Change decision of two versus three line tle's to do simpler checks first.
 
+
 2011-11-06 Charles Suprin <hamaa1vs at gmail.com>
 
     * src/gtk-sat-map.c

Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c	2011-11-12 18:15:03 UTC (rev 951)
+++ trunk/src/tle-update.c	2011-11-12 19:49:28 UTC (rev 952)
@@ -922,7 +922,10 @@
             /* third is that neither of these is true and we are consuming either text at the top of the 
                file or a text file that happens to be in the update directory 
             */ 
-            if (Checksum_Good(tle_working[1]) && (tle_working[1][0]=='1')) {
+            if ((tle_working[1][0] == '1') && 
+                (tle_working[2][0] == '2') && 
+                Checksum_Good(tle_working[1]) &&
+                Checksum_Good(tle_working[2])) {
                 sat_log_log (SAT_LOG_LEVEL_DEBUG,
                              _("%s:%s: Processing a three line TLE"),
                              __FILE__, __FUNCTION__);
@@ -934,7 +937,10 @@
                 /* we consumed three lines so we need three lines */
                 linesneeded = 3;
                 
-            } else if (Checksum_Good(tle_working[0]) && (tle_working[0][0]=='1')) {
+            } else if ((tle_working[0][0] == '1') && 
+                       (tle_working[1][0] == '2') &&
+                       Checksum_Good(tle_working[0]) && 
+                       Checksum_Good(tle_working[1])) {
                 sat_log_log (SAT_LOG_LEVEL_DEBUG,
                              _("%s:%s: Processing a bare two line TLE"),
                              __FILE__, __FUNCTION__);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.