X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFile.java;h=9802f883edbcb9ad8a26962b8f2f05e2bd2bdfbe;hb=effc62354fc82bb937c6f445a147fc92153a0731;hp=1ab00b381443b8c99fa96d3f9a026ddc58cd7bfc;hpb=20bc23ddb90f8a6da1f7ea70f02cf3a038059d32;p=fw%2Faltos

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index 1ab00b38..9802f883 100644
--- 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_2; 
 
 import java.io.File;
 import java.util.*;
 
 public class AltosFile extends File {
 
+	static String number(int n) {
+		if (n == AltosLib.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");
 	}
 }