--- loncom/lonnet/perl/lonnet.pm 2007/05/14 08:47:54 1.874 +++ loncom/lonnet/perl/lonnet.pm 2007/05/17 09:25:31 1.878 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.874 2007/05/14 08:47:54 albertel Exp $ +# $Id: lonnet.pm,v 1.878 2007/05/17 09:25:31 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -756,7 +756,7 @@ sub get_dom { if ($udom && $uhome && ($uhome ne 'no_host')) { my $rep=&reply("getdom:$udom:$namespace:$items",$uhome); my %returnhash; - if ($rep =~ /^error: 2 /) { + if ($rep eq '' || $rep =~ /^error: 2 /) { return %returnhash; } my @pairs=split(/\&/,$rep); @@ -4454,8 +4454,18 @@ sub userlog_query { sub auto_run { my ($cnum,$cdom) = @_; - my $homeserver = &homeserver($cnum,$cdom); - my $response = &reply('autorun:'.$cdom,$homeserver); + my $response = 0; + my $settings; + my %domconfig = &get_dom('configuration',['autoenroll'],$cdom); + if (ref($domconfig{'autoenroll'}) eq 'HASH') { + $settings = $domconfig{'autoenroll'}; + if ($settings->{'run'} eq '1') { + $response = 1; + } + } else { + my $homeserver = &homeserver($cnum,$cdom); + $response = &reply('autorun:'.$cdom,$homeserver); + } return $response; } @@ -5902,6 +5912,13 @@ sub devalidatecourseresdata { # --------------------------------------------------- Course Resourcedata Query +# +# Parameters: +# $coursenum - Number of the course. +# $coursedomain - Domain at which the course was created. +# Returns: +# A hash of the course parameters along (I think) with timestamps +# and version info. sub get_courseresdata { my ($coursenum,$coursedomain)=@_; @@ -8520,6 +8537,14 @@ setting for a specific $type, where $typ @what should be a list of parameters to ask about. This routine caches answers for 5 minutes. +=item * + +get_courseresdata($courseid, $domain) : dump the entire course resource +data base, returning a hash that is keyed by the resource name and has +values that are the resource value. I believe that the timestamps and +versions are also returned. + + =back =head2 Course Modification @@ -9202,3 +9227,4 @@ symblist($mapname,%newhash) : update sym =back =cut +