--- loncom/interface/loncommon.pm 2008/04/04 16:48:42 1.636.2.6 +++ loncom/interface/loncommon.pm 2008/01/22 22:37:18 1.637 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.636.2.6 2008/04/04 16:48:42 raeburn Exp $ +# $Id: loncommon.pm,v 1.637 2008/01/22 22:37:18 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,75 +78,6 @@ my $readit; ## Global Variables ## -# ----------------------------------------------- SSI with retries: -# - -=pod - -=head1 Server Side include with retries: - -=over 4 - -=item * &ssi_with_retries(resource,retries form) - -Performs an ssi with some number of retries. Retries continue either -until the result is ok or until the retry count supplied by the -caller is exhausted. - -Inputs: - -=over 4 - -resource - Identifies the resource to insert. - -retries - Count of the number of retries allowed. - -form - Hash that identifies the rendering options. - -=back - -Returns: - -=over 4 - -content - The content of the response. If retries were exhausted this is empty. - -response - The response from the last attempt (which may or may not have been successful. - -=back - -=back - -=cut - -sub ssi_with_retries { - my ($resource, $retries, %form) = @_; - - - my $ok = 0; # True if we got a good response. - my $content; - my $response; - - # Try to get the ssi done. within the retries count: - - do { - ($content, $response) = &Apache::lonnet::ssi($resource, %form); - $ok = $response->is_success; - if (!$ok) { - &Apache::lonnet::logthis("Failed ssi_with_retries on $resource: ".$response->is_success.', '.$response->code.', '.$response->message); - } - $retries--; - } while (!$ok && ($retries > 0)); - - if (!$ok) { - $content = ''; # On error return an empty content. - } - return ($content, $response); - -} - - - # ----------------------------------------------- Filetypes/Languages/Copyright my %language; my %supported_language; @@ -3179,7 +3110,7 @@ sub get_student_view { } if (defined($target)) { $form{'grade_target'} = $target; } $feedurl=&Apache::lonnet::clutter($feedurl); - my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form); + my $userview=&Apache::lonnet::ssi_body($feedurl,%form); $userview=~s/\]*\>//gi; $userview=~s/\<\/body\>//gi; $userview=~s/\//gi; @@ -3188,39 +3119,7 @@ sub get_student_view { $userview=~s/\<\/head\>//gi; $userview=~s/action\s*\=/would_be_action\=/gi; $userview=&relative_to_absolute($feedurl,$userview); - if (wantarray) { - return ($userview,$response); - } else { - return $userview; - } -} - -sub get_student_view_with_retries { - my ($symb,$retries,$username,$domain,$courseid,$target,$moreenv) = @_; - - my $ok = 0; # True if we got a good response. - my $content; - my $response; - - # Try to get the student_view done. within the retries count: - - do { - ($content, $response) = &get_student_view($symb,$username,$domain,$courseid,$target,$moreenv); - $ok = $response->is_success; - if (!$ok) { - &Apache::lonnet::logthis("Failed get_student_view_with_retries on $symb: ".$response->is_success.', '.$response->code.', '.$response->message); - } - $retries--; - } while (!$ok && ($retries > 0)); - - if (!$ok) { - $content = ''; # On error return an empty content. - } - if (wantarray) { - return ($content, $response); - } else { - return $content; - } + return $userview; } =pod @@ -4082,7 +3981,7 @@ ENDROLE $dc_info = '('.$dc_info.')'; } - if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) { + if ($env{'environment.remote'} eq 'off') { # No Remote if ($env{'request.state'} eq 'construct') { $forcereg=1; @@ -4105,10 +4004,10 @@ ENDROLE $lastitem = $thisdisfn; } $titleinfo = - &Apache::loncommon::help_open_menu('','',3,'Authoring') - .''.&mt('Construction Space').': ' - .'
' + &Apache::loncommon::help_open_menu('','',3,'Authoring'). + 'Construction Space: '. + '' .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem
" .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()') .'' @@ -4599,10 +4498,6 @@ table.LC_aboutme_port tr.LC_even_row td table.LC_data_table tr.LC_data_table_highlight td { background-color: $data_table_darker; } -table.LC_data_table tr td.LC_leftcol_header { - background-color: $data_table_head; - font-weight: bold; -} table.LC_data_table tr.LC_empty_row td, table.LC_nested tr.LC_empty_row td { background-color: #FFFFFF; @@ -8188,26 +8083,19 @@ sub construct_course { $outcome .= $clonemsg.$linefeed; my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); # Copy all files - &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); + &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'}); # Restore URL $cenv{'url'}=$oldcenv{'url'}; # Restore title $cenv{'description'}=$oldcenv{'description'}; +# restore grading mode + if (defined($oldcenv{'grading'})) { + $cenv{'grading'}=$oldcenv{'grading'}; + } # Mark as cloned $cenv{'clonedfrom'}=$cloneid; -# Need to clone grading mode - my %newenv=&Apache::lonnet::get('environment',['grading'],$$crsudom,$$crsunum); - $cenv{'grading'}=$newenv{'grading'}; -# Do not clone these environment entries - &Apache::lonnet::del('environment', - ['default_enrollment_start_date', - 'default_enrollment_end_date', - 'question.email', - 'policy.email', - 'comment.email', - 'pch.users.denied', - 'plc.users.denied'], - $$crsudom,$$crsunum); + delete($cenv{'default_enrollment_start_date'}); + delete($cenv{'default_enrollment_end_date'}); } #