[Aimmath-commit] AIM/WEB-INF/maple Aim.mpl,1.5,1.6 Date.mpl,1.4,1.5

[<nps...@us...>]

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

Modified Files:
	Aim.mpl Date.mpl 
Log Message:


Index: Aim.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Aim.mpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Aim.mpl	6 Sep 2003 10:41:15 -0000	1.5
--- Aim.mpl	11 Mar 2004 13:39:42 -0000	1.6
***************
*** 744,748 ****
          rawtable,question,
          seedfile,seed,
!         historyfile,history,labeltable,nametable,questionhistory,
          label, oldfocus, subquestion, cgilabel, oldans;
    global AimCache;
--- 744,748 ----
          rawtable,question,
          seedfile,seed,
!         historyfile,history,questionhistory,
          label, oldfocus, subquestion, cgilabel, oldans;
    global AimCache;
***************
*** 805,818 ****
      history := eval(`new/aim/Quiz/History`(quizversion));
     fi;
!    labeltable := eval(history['LabelTable']);
!    nametable  := eval(history['NameTable']);
     for question in quizversion['Questions'] do
      label := question['Label'];
!     if not(assigned(labeltable[label])) then
       questionhistory :=
        eval(`new/aim/Question/History`(eval(question)));
!      labeltable[label] := eval(questionhistory);
!      nametable[question['Name'],question['PartLabel']] := 
!       eval(questionhistory);
      fi;
     od;
--- 805,817 ----
      history := eval(`new/aim/Quiz/History`(quizversion));
     fi;
! 
     for question in quizversion['Questions'] do
      label := question['Label'];
!     if not(history['ContainsLabel',label]) then
       questionhistory :=
        eval(`new/aim/Question/History`(eval(question)));
!      history['PutQuestion',
!       question['Name'],question['Label'],
!       eval(questionhistory)];
      fi;
     od;
***************
*** 823,831 ****
    if quizcontext['UseRecordedAnswers'] then
     rawtable := table([]);
-    labeltable := eval(history['LabelTable']);
     for question in quizversion['Questions'] do
      label := question['Label'];
      rawtable[cat("RawAnswer",label)] :=
!      eval(labeltable[label])['LastRawAnswer'];
     od;
     if member(command,{"UnfocusQuiz","MoveQuizFocus"}) then
--- 822,830 ----
    if quizcontext['UseRecordedAnswers'] then
     rawtable := table([]);
     for question in quizversion['Questions'] do
      label := question['Label'];
+     questionhistory := eval(history['GetQuestionByLabel',label]);
      rawtable[cat("RawAnswer",label)] :=
!      questionhistory['LastRawAnswer'];
     od;
     if member(command,{"UnfocusQuiz","MoveQuizFocus"}) then

Index: Date.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Date.mpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Date.mpl	1 Sep 2003 20:22:23 -0000	1.4
--- Date.mpl	11 Mar 2004 13:39:42 -0000	1.5
***************
*** 291,295 ****
    1990=[1, 28],1991=[7, 27],1992=[5, 25],1993=[4, 31],1994=[3, 30],
    1995=[2, 29],1996=[7, 27],1997=[6, 26],1998=[5, 25],1999=[4, 31],
!   2000=[2, 29],2001=[1, 28],2002=[7, 27],2003=[6, 26],2004=[4, 31],
    2005=[3, 30],2006=[2, 29],2007=[1, 28],2008=[6, 26],2009=[5, 25],
    2010=[4, 31],2011=[3, 30],2012=[1, 28],2013=[7, 27],2014=[6, 26],
--- 291,295 ----
    1990=[1, 28],1991=[7, 27],1992=[5, 25],1993=[4, 31],1994=[3, 30],
    1995=[2, 29],1996=[7, 27],1997=[6, 26],1998=[5, 25],1999=[4, 31],
!   2000=[2, 29],2001=[1, 28],2002=[7, 27],2003=[6, 26],2004=[4, 26],
    2005=[3, 30],2006=[2, 29],2007=[1, 28],2008=[6, 26],2009=[5, 25],
    2010=[4, 31],2011=[3, 30],2012=[1, 28],2013=[7, 27],2014=[6, 26],
***************
*** 329,333 ****
    evalb((month >  4 and month < 10) or
          (month =  4 and day >= `Date/SummerTime`[year][1]) or
!         (month = 10 and day <= `Date/SummerTime`[year][2]));
   end
  ):
--- 329,333 ----
    evalb((month >  4 and month < 10) or
          (month =  4 and day >= `Date/SummerTime`[year][1]) or
!         (month = 10 and day < `Date/SummerTime`[year][2]));
   end
  ):