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

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

Revision: 902
          http://gpredict.svn.sourceforge.net/gpredict/?rev=902&view=rev
Author:   aa1vs
Date:     2011-09-21 20:25:08 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Corrects satellite status not being updated correctly when a .sat and update data have different status.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-09-21 20:05:06 UTC (rev 901)
+++ trunk/ChangeLog	2011-09-21 20:25:08 UTC (rev 902)
@@ -2,9 +2,13 @@
 
     * ChangeLog
     * src/tle-update.c
-    Corrects satellite name not being update correctly when a satellite occurs with international ID and name in same update.
+    Corrects satellite name not being updated correctly when a satellite occurs with international ID and name in same update.
 
+    * ChangeLog
+    * src/tle-update.c
+    Corrects satellite status not being updated correctly when a .sat and update data have different status.
 
+
 2011-09-20 Charles Suprin <hamaa1vs at gmail.com>
 
     * ChangeLog

Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c	2011-09-21 20:05:06 UTC (rev 901)
+++ trunk/src/tle-update.c	2011-09-21 20:25:08 UTC (rev 902)
@@ -1250,15 +1250,6 @@
             g_free(satname);
             g_free(satnickname);
 
-            if ( status != ntle->status ){
-
-                sat_log_log (SAT_LOG_LEVEL_MSG,
-                             _("%s: Data for  %d updated for operational status."),
-                             __FUNCTION__, catnr);
-                g_key_file_set_integer (satdata, "Satellite", "STATUS", ntle->status);
-                updateddata = TRUE;
-            }
-
             if (tle.epoch < ntle->epoch) {
                 /* new data is newer than what we already have */
                 /* store new data */
@@ -1267,8 +1258,17 @@
                              __FUNCTION__, catnr);
                 g_key_file_set_string (satdata, "Satellite", "TLE1", ntle->line1);
                 g_key_file_set_string (satdata, "Satellite", "TLE2", ntle->line2);
+                g_key_file_set_integer (satdata, "Satellite", "STATUS", ntle->status);
                 updateddata = TRUE;
 
+            } else if (tle.epoch == ntle->epoch) {
+                if  ((status != ntle->status) && (ntle->status != OP_STAT_UNKNOWN)){
+                    sat_log_log (SAT_LOG_LEVEL_MSG,
+                                 _("%s: Data for  %d updated for operational status."),
+                                 __FUNCTION__, catnr);
+                    g_key_file_set_integer (satdata, "Satellite", "STATUS", ntle->status);
+                    updateddata = TRUE;
+                }
             }
             
             if (updateddata ==TRUE) {

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