X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FJulian.pm;h=c770e4a964731410c1559eff9fb0b8eb572b102f;hb=cef696652d16bbeec53aca45234ea0b64f3496d3;hp=5616542b3667dd859e25827dd61d13e693305033;hpb=d7cd2f1d32971efd542a9e4bf0d1df92a4d054de;p=spider.git

diff --git a/perl/Julian.pm b/perl/Julian.pm
index 5616542b..c770e4a9 100644
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -19,13 +19,13 @@ my @days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 # take a unix date and transform it into a julian day (ie (1998, 13) = 13th day of 1998)
 sub unixtoj
 {
-  my $t = shift;
-  my ($year, $day) = (gmtime($t))[5,7];
-  
-  if ($year < 100) {
-    $year += ($year < 50) ? 2000 : 1900;
-  }
-  return ($year, $day+1);
+	my $t = shift;
+	my ($year, $day) = (gmtime($t))[5,7];
+	
+	if ($year < 100) {
+		$year += ($year < 50) ? 2000 : 1900;
+	}
+	return ($year, $day+1);
 }
 
 # take a unix and return a julian month from it
@@ -33,71 +33,74 @@ sub unixtojm
 {
 	my $t = shift;
 	my ($mon, $year) = (gmtime($t))[4..5];
-	return ($year, $mon);
+	if ($year < 100) {
+		$year += ($year < 50) ? 2000 : 1900;
+	}
+	return ($year, $mon + 1);
 }
 
 # take a julian date and subtract a number of days from it, returning the julian date
 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;
-  }
-  return ($year, $day);
+	my ($year, $day, $amount) = @_;
+	my $diny = isleap($year) ? 366 : 365;
+	$day -= $amount;
+	while ($day <= 0) {
+		$day += $diny;
+		$year -= 1;
+		$diny = isleap($year) ? 366 : 365;
+	}
+	return ($year, $day);
 }
 
 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;
-  }
-  return ($year, $day);
+	my ($year, $day, $amount) = @_;
+	my $diny = isleap($year) ? 366 : 365;
+	$day += $amount;
+	while ($day > $diny) {
+		$day -= $diny;
+		$year += 1;
+		$diny = isleap($year) ? 366 : 365;
+	}
+	return ($year, $day);
 } 
 
 # take a julian month and subtract a number of months from it, returning the julian month
 sub subm
 {
-  my ($year, $mon, $amount) = @_;
-  $mon -= $amount;
-  while ($mon <= 0) {
-    $mon += 12;
-	$year -= 1;
-  }
-  return ($year, $mon);
+	my ($year, $mon, $amount) = @_;
+	$mon -= $amount;
+	while ($mon <= 0) {
+		$mon += 12;
+		$year -= 1;
+	}
+	return ($year, $mon);
 }
 
 sub addm
 {
-  my ($year, $mon, $amount) = @_;
-  $mon += $amount;
-  while ($mon > 12) {
-    $mon -= 12;
-	$year += 1;
-  }
-  return ($year, $mon);
+	my ($year, $mon, $amount) = @_;
+	$mon += $amount;
+	while ($mon > 12) {
+		$mon -= 12;
+		$year += 1;
+	}
+	return ($year, $mon);
 } 
 
 sub cmp
 {
-  my ($y1, $d1, $y2, $d2) = @_;
-  return $d1 - $d2 if ($y1 == $y2);
-  return $y1 - $y2;
+	my ($y1, $d1, $y2, $d2) = @_;
+	return $d1 - $d2 if ($y1 == $y2);
+	return $y1 - $y2;
 }
 
 # is it a leap year?
 sub isleap
 {
-  my $year = shift;
-  return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
+	my $year = shift;
+	return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
 }