--- rat/lonratparms.pm 2001/11/29 19:23:49 1.8 +++ rat/lonratparms.pm 2003/04/30 16:08:30 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Set parameters inside of the RAT # -# $Id: lonratparms.pm,v 1.8 2001/11/29 19:23:49 www Exp $ +# $Id: lonratparms.pm,v 1.15 2003/04/30 16:08:30 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,11 +38,13 @@ # 3/1 Gerd Kortemeyer) # # 03/03/01,06/15,06/25,06/26,06/30,07/02,07/03,07/04 Gerd Kortemeyer +# 03/11/02 Matthew Hall # package Apache::lonratparms; use strict; use Apache::Constants qw(:common); +use Apache::lonhtmlcommon(); sub handler { my $r = shift; @@ -52,18 +54,8 @@ sub handler { # Get query string for limited number of parameters - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'url') || ($name eq 'parms') || - ($name eq 'resid')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } (split(/&/,$ENV{'QUERY_STRING'})); - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['url','parms','resid']); # ------------------------------------------------------------------- Read file @@ -74,23 +66,46 @@ sub handler { my %display; my %value; - map { + foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { if ($_=~/^parameter\_/) { $content{$_}=&Apache::lonnet::metadata($uri,$_); $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type'); $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display'); } - } split(/\,/,&Apache::lonnet::metadata($uri,'keys')); + } + +# -------------------------------------- Additional parms for certain resources + if ($uri=~/\.(sequence|page)\.meta$/) { + $content{'parameter_randompick'}=''; + $type{'parameter_randompick'}='int_pos'; + $display{'parameter_randompick'}='Randomly pick number of resources'; + + $content{'parameter_randompickseed'}=''; + $type{'parameter_randompickseed'}='int_pos'; + $display{'parameter_randompickseed'}= + 'Random seed for randomly picking number of resources (optional, only set if you know what you are doing)'; + } else { + $content{'parameter_mapalias'}=''; + $type{'parameter_mapalias'}='string'; + $display{'parameter_mapalias'}='Resource alias name for conditions'; + } + if ($uri=~/\.(problem|exam|quiz|assess|survey|form|library)\.meta$/) { + $content{'parameter_hiddenparts'}=''; + $type{'parameter_hiddenparts'}='string'; + $display{'parameter_hiddenparts'}= + 'A comma separted list of Part Ids to not display.'; + } # ---------------------------------------------------------- Current Parameters - map { + foreach (split(/\:/,$ENV{'form.parms'})) { my ($ptype,$pname,$pvalue)=split(/\_\_\_/,$_); unless ($type{$pname}) { $type{$pname}=$ptype; } $value{$pname}=$pvalue; - } split(/\:/,$ENV{'form.parms'}); + } # --------------------------------------------------- Print input screen header + my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); $r->print(< @@ -103,14 +118,7 @@ sub handler { parmwin.close(); } - function pjump(type,dis,value,marker,ret,call) { - parmwin=window.open("/adm/rat/parameter.html?type="+escape(type) - +"&value="+escape(value)+"&marker="+escape(marker) - +"&return="+escape(ret) - +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms", - "height=350,width=350,scrollbars=no,menubar=no"); - - } + $pjump_def function stpr() { eval("document.parameters."+document.parameters.pres_marker.value+ @@ -143,21 +151,20 @@ ENDHEADER ENDDOCUMENT - map { + foreach (keys(%content)) { my $cur=$content{$_}; + # Should if(defined($value{$_})) be if(exists($value{$_})) ? if (defined($value{$_})) { $cur=$value{$_}; }; - $r->print(' + + +'); - } keys %content; + } $r->print( '
ParameterDefaultValueSet?
'.$display{$_}.'
'.$_. - '
 '.$content{$_}. - ' Enter". - 'print(<<"END"); +
$display{$_}
$_
 $content{$_}  +Enterprint(' checked'); } $r->print('>

'); return OK;