X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FJulian.pm;h=9f333d1188aa5ed264c10cf3bfa0a94e55b27c0b;hb=refs%2Fheads%2Fnew-spawn;hp=c770e4a964731410c1559eff9fb0b8eb572b102f;hpb=cef696652d16bbeec53aca45234ea0b64f3496d3;p=spider.git

diff --git a/perl/Julian.pm b/perl/Julian.pm
index c770e4a9..9f333d11 100644
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -3,104 +3,159 @@
 #
 # Copyright (c) - 1998 Dirk Koopman G1TLH
 #
-# $Id$
 #
+#
+
+use strict;
 
 package Julian;
 
-use FileHandle;
-use DXDebug;
-use Carp;
 
-use strict;
+use vars qw(@days @ldays @month);
+@days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+@ldays = (31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+@month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
-my @days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+sub alloc($$$)
+{
+	my ($pkg, $year, $thing) = @_;
+	return bless [$year, $thing], ref($pkg)||$pkg;
+}
 
-# take a unix date and transform it into a julian day (ie (1998, 13) = 13th day of 1998)
-sub unixtoj
+sub copy
 {
-	my $t = shift;
-	my ($year, $day) = (gmtime($t))[5,7];
-	
-	if ($year < 100) {
-		$year += ($year < 50) ? 2000 : 1900;
-	}
-	return ($year, $day+1);
+	my $old = shift;
+	return $old->alloc(@$old);
+}
+
+sub cmp($$)
+{
+	my ($a, $b) = @_;
+	return $a->[1] - $b->[1] if ($a->[0] == $b->[0]);
+	return $a->[0] - $b->[0];
+}
+
+sub year
+{
+	return $_[0]->[0];
+}
+
+sub thing
+{
+	return $_[0]->[1];
 }
 
-# take a unix and return a julian month from it
-sub unixtojm
+package Julian::Day;
+
+use vars qw(@ISA);
+@ISA = qw(Julian);
+
+# is it a leap year?
+sub _isleap
 {
+	my $year = shift;
+	return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
+}
+
+sub new($$)
+{
+	my $pkg = shift;
 	my $t = shift;
-	my ($mon, $year) = (gmtime($t))[4..5];
-	if ($year < 100) {
-		$year += ($year < 50) ? 2000 : 1900;
-	}
-	return ($year, $mon + 1);
+	my ($year, $day) = (gmtime($t))[5,7];
+	$year += 1900;
+	return $pkg->SUPER::alloc($year, $day+1);
 }
 
 # take a julian date and subtract a number of days from it, returning the julian date
-sub sub
+sub sub($$)
 {
-	my ($year, $day, $amount) = @_;
-	my $diny = isleap($year) ? 366 : 365;
-	$day -= $amount;
-	while ($day <= 0) {
-		$day += $diny;
-		$year -= 1;
-		$diny = isleap($year) ? 366 : 365;
+	my ($old, $amount) = @_;
+	my $self = $old->copy;
+	my $diny = _isleap($self->[0]) ? 366 : 365;
+	$self->[1] -= $amount;
+	while ($self->[1] <= 0) {
+		$self->[0] -= 1;
+		$diny = _isleap($self->[0]) ? 366 : 365;
+		$self->[1] += $diny;
 	}
-	return ($year, $day);
+	return $self;
 }
 
-sub add
+sub add($$)
 {
-	my ($year, $day, $amount) = @_;
-	my $diny = isleap($year) ? 366 : 365;
-	$day += $amount;
-	while ($day > $diny) {
-		$day -= $diny;
-		$year += 1;
-		$diny = isleap($year) ? 366 : 365;
+	my ($old, $amount) = @_;
+	my $self = $old->copy;
+	my $diny = _isleap($self->[0]) ? 366 : 365;
+	$self->[1] += $amount;
+	while ($self->[1] > $diny) {
+		$self->[1] -= $diny;
+		$self->[0] += 1;
+		$diny = _isleap($self->[0]) ? 366 : 365;
 	}
-	return ($year, $day);
+	return $self;
 } 
 
-# take a julian month and subtract a number of months from it, returning the julian month
-sub subm
+sub as_string
 {
-	my ($year, $mon, $amount) = @_;
-	$mon -= $amount;
-	while ($mon <= 0) {
-		$mon += 12;
-		$year -= 1;
+	my $self = shift;
+	my $days = $self->[1];
+	my $mon = 0;
+	for (_isleap($self->[0]) ? @Julian::ldays : @Julian::days) {
+		if ($_ < $days) {
+			$days -= $_;
+			$mon++;
+		} else {
+			last;
+		}
 	}
-	return ($year, $mon);
+	return "$days-$Julian::month[$mon]-$self->[0]";
 }
 
-sub addm
+package Julian::Month;
+
+use vars qw(@ISA);
+@ISA = qw(Julian);
+
+sub new($$)
 {
-	my ($year, $mon, $amount) = @_;
-	$mon += $amount;
-	while ($mon > 12) {
-		$mon -= 12;
-		$year += 1;
-	}
-	return ($year, $mon);
-} 
+	my $pkg = shift;
+	my $t = shift;
+	my ($mon, $year) = (gmtime($t))[4,5];
+	$year += 1900;
+	return $pkg->SUPER::alloc($year, $mon+1);
+}
 
-sub cmp
+# take a julian month and subtract a number of months from it, returning the julian month
+sub sub($$)
 {
-	my ($y1, $d1, $y2, $d2) = @_;
-	return $d1 - $d2 if ($y1 == $y2);
-	return $y1 - $y2;
+	my ($old, $amount) = @_;
+	my $self = $old->copy;
+	
+	$self->[1] -= $amount;
+	while ($self->[1] <= 0) {
+		$self->[1] += 12;
+		$self->[0] -= 1;
+	}
+	return $self;
 }
 
-# is it a leap year?
-sub isleap
+sub add($$)
 {
-	my $year = shift;
-	return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
+	my ($old, $amount) = @_;
+	my $self = $old->copy;
+
+	$self->[1] += $amount;
+	while ($self->[1] > 12) {
+		$self->[1] -= 12;
+		$self->[0] += 1;
+	}
+	return $self;
+} 
+
+sub as_string
+{
+	my $self = shift;
+	return "$Julian::month[$self->[1]]-$self->[0]";
 }