X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FJulian.pm;h=c770e4a964731410c1559eff9fb0b8eb572b102f;hb=cef696652d16bbeec53aca45234ea0b64f3496d3;hp=17a020ec69dc96b1a5026ec094e7ce1390b7f2e5;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git

diff --git a/perl/Julian.pm b/perl/Julian.pm
index 17a020ec..c770e4a9 100644
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -19,102 +19,89 @@ 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) = @_;
-  my ($day, $mon, $year) = (gmtime($t))[3..5];
-  my $jday;
-  
-  # set the correct no of days for february
-  if ($year < 100) {
-    $year += ($year < 50) ? 2000 : 1900;
-  }
-  $days[1] = isleap($year) ? 29 : 28;
-  for (my $i = 0, $jday = 0; $i < $mon; $i++) {
-    $jday += $days[$i];
-  }
-  $jday += $day;
-  return ($year, $jday);
+	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
+sub unixtojm
+{
+	my $t = shift;
+	my ($mon, $year) = (gmtime($t))[4..5];
+	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);
 } 
 
-sub cmp
+# take a julian month and subtract a number of months from it, returning the julian month
+sub subm
 {
-  my ($y1, $d1, $y2, $d2) = @_;
-  return $d1 - $d2 if ($y1 == $y2);
-  return $y1 - $y2;
+	my ($year, $mon, $amount) = @_;
+	$mon -= $amount;
+	while ($mon <= 0) {
+		$mon += 12;
+		$year -= 1;
+	}
+	return ($year, $mon);
 }
 
-# is it a leap year?
-sub isleap
+sub addm
 {
-  my $year = shift;
-  return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
-}
-
-# this section deals with files that are julian date based
+	my ($year, $mon, $amount) = @_;
+	$mon += $amount;
+	while ($mon > 12) {
+		$mon -= 12;
+		$year += 1;
+	}
+	return ($year, $mon);
+} 
 
-# open a data file with prefix $fn/$year/$day.dat and return an object to it
-sub open
+sub cmp
 {
-  my ($pkg, $fn, $year, $day, $mode) = @_;
-
-  # if we are writing, check that the directory exists
-  if (defined $mode) {
-    my $dir = "$fn/$year";
-	mkdir($dir, 0777) if ! -e $dir;
-  }
-  my $self = {};
-  $self->{fn} = sprintf "$fn/$year/%03d.dat", $day;
-  $mode = 'r' if !$mode;
-  my $fh = new FileHandle $self->{fn}, $mode;
-  return undef if !$fh;
-  $fh->autoflush(1) if $mode ne 'r';         # make it autoflushing if writable
-  $self->{fh} = $fh;
-  $self->{year} = $year;
-  $self->{day} = $day;
-  dbg("julian", "opening $self->{fn}\n");
-  
-  return bless $self, $pkg;
+	my ($y1, $d1, $y2, $d2) = @_;
+	return $d1 - $d2 if ($y1 == $y2);
+	return $y1 - $y2;
 }
 
-# close the data file
-sub close
+# is it a leap year?
+sub isleap
 {
-  my $self = shift;
-  undef $self->{fh};      # close the filehandle
-  delete $self->{fh};
+	my $year = shift;
+	return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0)) ? 1 : 0; 
 }
 
-sub DESTROY               # catch undefs and do what is required further do the tree
-{
-  my $self = shift;
-  dbg("julian", "closing $self->{fn}\n");
-  undef $self->{fh} if defined $self->{fh};
-} 
 
 1;