altoslib/altosui: Get legacy telem working with new AltosState structure

[fw/altos] / altoslib / AltosFile.java

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index a2ff261ac463ab3c9ff513049fa5a19237f8d7ba..54c5482435b18e75d3e173498b664240c82007ed 100644 (file)
--- a/altoslib/AltosFile.java
+++ b/altoslib/AltosFile.java
@@ -15,17 +15,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib; 
+package org.altusmetrum.altoslib_1; 
 
 import java.io.File;
 import java.util.*;
 
 public class AltosFile extends File {
 
+       static String number(int n) {
+               if (n == AltosRecord.MISSING)
+                       return "unk";
+               else
+                       return String.format("%03d", n);
+       }
+
        public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
                super (AltosPreferences.logdir(),
-                      String.format("%04d-%02d-%02d-serial-%03d-flight-%03d.%s",
-                                    year, month, day, serial, flight, extension));
+                      String.format("%04d-%02d-%02d-serial-%s-flight-%s.%s",
+                                    year, month, day, number(serial), number(flight), extension));
        }
 
        public AltosFile(int serial, int flight, String extension) {
@@ -37,7 +44,7 @@ public class AltosFile extends File {
                     extension);
        }
 
-       public AltosFile(AltosRecord telem) {
-               this(telem.serial, telem.flight, "telem");
+       public AltosFile(AltosState state) {
+               this(state.serial, state.flight, "telem");
        }
 }