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

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index 90dbc6db..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,17 +16,57 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1; 
+package org.altusmetrum.altoslib_13;
 
 import java.io.File;
 import java.util.*;
 
 public class AltosFile extends File {
 
-	public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
+	static String number(int n) {
+		if (n == AltosLib.MISSING)
+			return "unkn";
+		else
+			return String.format("%04d", n);
+	}
+
+	static String receiver(int receiver) {
+		if (receiver == AltosLib.MISSING)
+			return "";
+		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-%03d-flight-%03d.%s",
-				     year, month, day, serial, flight, 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) {
+		this(year, month, day, serial, flight, AltosLib.MISSING, extension);
+	}
+
+	public AltosFile(int serial, int flight, int receiver, String extension) {
+		this(Calendar.getInstance().get(Calendar.YEAR),
+		     Calendar.getInstance().get(Calendar.MONTH) + 1,
+		     Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+		     serial,
+		     flight,
+		     receiver,
+		     extension);
 	}
 
 	public AltosFile(int serial, int flight, String extension) {
@@ -34,10 +75,11 @@ public class AltosFile extends File {
 		     Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
 		     serial,
 		     flight,
+		     AltosLib.MISSING,
 		     extension);
 	}
 
-	public AltosFile(AltosRecord telem) {
-		this(telem.serial, telem.flight, "telem");
+	public AltosFile(AltosCalData cal_data) {
+		this(cal_data.serial, cal_data.flight, cal_data.receiver_serial, "telem");
 	}
 }