X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFile.java;h=e96b19db823c87cd274ded9002bb6ef1f6432f40;hp=a79216a2682d3eddf518c78882d63cd2ce1d983d;hb=a8f4af38d7abbb1da922b5e4d84af218475f1752;hpb=4231d68bae69d9a7d1f52205002db452cd5f986d

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index a79216a2..e96b19db 100644
--- a/altoslib/AltosFile.java
+++ b/altoslib/AltosFile.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_13;
 
 import java.io.File;
 import java.util.*;
@@ -35,10 +36,23 @@ public class AltosFile extends File {
 		return String.format("-via-%04d", receiver);
 	}
 
+	static private String label(int flight) {
+		if (flight < 0)
+			return "corrupt";
+		else
+			return "flight";
+	}
+
+	static private int flight(int flight) {
+		if (flight < 0)
+			return -flight;
+		return flight;
+	}
+
 	public AltosFile(int year, int month, int day, int serial, int flight, int receiver, String extension) {
 		super (AltosPreferences.logdir(),
-		       String.format("%04d-%02d-%02d-serial-%s-flight-%s%s.%s",
-				     year, month, day, number(serial), number(flight), receiver(receiver), extension));
+		       String.format("%04d-%02d-%02d-serial-%s-%s-%s%s.%s",
+				     year, month, day, number(serial), label(flight), number(flight(flight)), receiver(receiver), extension));
 	}
 
 	public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
@@ -65,7 +79,7 @@ public class AltosFile extends File {
 		     extension);
 	}
 
-	public AltosFile(AltosState state) {
-		this(state.serial, state.flight, state.receiver_serial, "telem");
+	public AltosFile(AltosCalData cal_data) {
+		this(cal_data.serial, cal_data.flight, cal_data.receiver_serial, "telem");
 	}
 }