aimmath-commit

[<mo...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim
In directory sc8-pr-cvs1:/tmp/cvs-serv23771

Modified Files:
	Compile.mpl 
Log Message:
Modified the code for multiquestions so that question parameters defined in the question's header with the <string> flag propagate into the subquestions.

Index: Compile.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/Compile.mpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Compile.mpl	4 Oct 2003 01:21:17 -0000	1.8
--- Compile.mpl	20 Dec 2003 21:38:53 -0000	1.9
***************
*** 179,188 ****
        nam_::string,
        level_::integer,
!       partlabel_::string
       )
  # KM
  # DIST  global MPROC_,IPROC,IPROCSTRING;
    global MPROC_,IPROC,IPROCSTRING,Config;
! # END 
    local question,line,flag,text,solstarted,solended,
          qtype,value,keywords,aimlocals,ansvar,
--- 179,191 ----
        nam_::string,
        level_::integer,
!       partlabel_::string,
! # KM
!       params_::table
! # END KM
       )
  # KM
  # DIST  global MPROC_,IPROC,IPROCSTRING;
    global MPROC_,IPROC,IPROCSTRING,Config;
! # END KM
    local question,line,flag,text,solstarted,solended,
          qtype,value,keywords,aimlocals,ansvar,
***************
*** 242,245 ****
--- 245,251 ----
    if nargs > 2 then level := level_; fi;
    if nargs > 3 then partlabel := partlabel_; fi;
+ # KM
+   if nargs > 4 then params  := params_; fi;
+ # END KM
  
    # Check to see if this is a multipart question; if so, hand
***************
*** 829,833 ****
        nam_::string,
        level_::integer,
!       partlabel_::string
       )
  # KM
--- 835,842 ----
        nam_::string,
        level_::integer,
!       partlabel_::string,
! # KM
!       params_::table
! # END KM
       )
  # KM
***************
*** 868,871 ****
--- 877,883 ----
    if nargs > 2 then level := level_; fi;
    if nargs > 3 then partlabel := partlabel_; fi;
+ # KM
+   if nargs > 4 then params := params_; fi;
+ # END KM
  
    flagnum := 0;
***************
*** 994,998 ****
          nam,
          level + 1,
!         sprintf("%s.%d",partlabel,partnum)
         );
        if type([subquestion],[`aim/Question`]) then
--- 1006,1013 ----
          nam,
          level + 1,
!         sprintf("%s.%d",partlabel,partnum),
! # KM
!         params
! # END KM
         );
        if type([subquestion],[`aim/Question`]) then