[Aimmath-commit] AIM/WEB-INF/maple AutoConf.mpl,1.10,1.11 Date.mpl,1.6,1.7

[Greg G. <gr...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32127

Modified Files:
	AutoConf.mpl Date.mpl 
Log Message:
AutoConf.mpl : added missing comma.
Date.mpl: replaced `Date/DaysSince1Jan2000` by `Date/DaysSince1Jan1970` - GG


Index: AutoConf.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConf.mpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AutoConf.mpl	21 May 2004 14:12:27 -0000	1.10
--- AutoConf.mpl	29 Aug 2004 20:34:50 -0000	1.11
***************
*** 426,430 ****
    "Env"  = "CATALINA_HOME",
    "Def"  = ["/usr/local","tomcat"],
!   "Def"  = ["/Library","Tomcat"]
    "Def"  = ["/usr/local","jakarta-tomcat"],
    "Def"  = ["/usr/local","jakarta-tomcat-*"],
--- 426,430 ----
    "Env"  = "CATALINA_HOME",
    "Def"  = ["/usr/local","tomcat"],
!   "Def"  = ["/Library","Tomcat"],
    "Def"  = ["/usr/local","jakarta-tomcat"],
    "Def"  = ["/usr/local","jakarta-tomcat-*"],

Index: Date.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Date.mpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Date.mpl	11 Apr 2004 07:08:13 -0000	1.6
--- Date.mpl	29 Aug 2004 20:34:50 -0000	1.7
***************
*** 277,288 ****
  
  `Package/Assign`(
!  `Date/DaysSince1Jan2000`::integer,
   "Returns for the specified @year@, @month@ and @day@, the number of days 
!   since the 1st of January, 2000.
   ",
   proc(year::posint, month::posint, day::posint)
    local i;
!   if year < 2000 then
!    error sprintf(__("Year out of range (must be >= 2000): %A"), year);
    elif month > 12 then
     error sprintf(__("Month invalid: %A"), month);
--- 277,288 ----
  
  `Package/Assign`(
!  `Date/DaysSince1Jan1970`::integer,
   "Returns for the specified @year@, @month@ and @day@, the number of days 
!   since the 1st of January, 1970.
   ",
   proc(year::posint, month::posint, day::posint)
    local i;
!   if year < 1970 then
!    error sprintf(__("Year out of range (must be >= 1970): %A"), year);
    elif month > 12 then
     error sprintf(__("Month invalid: %A"), month);
***************
*** 291,296 ****
                   `Date/MonthLength`(month, year), day);
    fi;
!   (year - 2000) * 365
!      + `Date/LeapYearCount`(2000, year)
       + `if`(evalb(`Date/IsLeapYear`(year) and month > 2), 1, 0)
       + sum(`Date/MonthLengths`[i], i = 1 .. month - 1)
--- 291,296 ----
                   `Date/MonthLength`(month, year), day);
    fi;
!   (year - 1970) * 365
!      + `Date/LeapYearCount`(1970, year)
       + `if`(evalb(`Date/IsLeapYear`(year) and month > 2), 1, 0)
       + sum(`Date/MonthLengths`[i], i = 1 .. month - 1)
***************
*** 309,314 ****
   proc(year::posint, m::posint, n::posint)
    local d;
!   # 1st of January, 2000 was a Saturday
!   d := 1 + ((1 - `Date/DaysSince1Jan2000`(year, m, 1)) mod 7) + 7 * (n - 1);
    while d > `Date/MonthLength`(m, year) do
      d := d - 7;
--- 309,314 ----
   proc(year::posint, m::posint, n::posint)
    local d;
!   # 1st of January, 1970 was a Thursday
!   d := 1 + ((3 - `Date/DaysSince1Jan1970`(year, m, 1)) mod 7) + 7 * (n - 1);
    while d > `Date/MonthLength`(m, year) do
      d := d - 7;