--- loncom/xml/lonxml.pm 2010/09/29 16:02:19 1.505.2.3 +++ loncom/xml/lonxml.pm 2010/09/29 15:47:21 1.515 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.505.2.3 2010/09/29 16:02:19 raeburn Exp $ +# $Id: lonxml.pm,v 1.515 2010/09/29 15:47:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -222,101 +222,6 @@ sub xmlend { return $discussion; } -sub tokeninputfield { - my $defhost=$Apache::lonnet::perlvar{'lonHostID'}; - $defhost=~tr/a-z/A-Z/; - return (< - function updatetoken() { - var comp=new Array; - var barcode=unescape(document.tokeninput.barcode.value); - comp=barcode.split('*'); - if (typeof(comp[0])!="undefined") { - document.tokeninput.codeone.value=comp[0]; - } - if (typeof(comp[1])!="undefined") { - document.tokeninput.codetwo.value=comp[1]; - } - if (typeof(comp[2])!="undefined") { - comp[2]=comp[2].toUpperCase(); - document.tokeninput.codethree.value=comp[2]; - } - document.tokeninput.barcode.value=''; - } - -
- - - - -
DocID Checkin
- - - - - - - -
Scan in Barcode
or Type in DocID - -* - -* - -
-
-
-ENDINPUTFIELD -} - -sub maketoken { - my ($symb,$tuname,$tudom,$tcrsid)=@_; - unless ($symb) { - $symb=&Apache::lonnet::symbread(); - } - unless ($tuname) { - $tuname=$env{'user.name'}; - $tudom=$env{'user.domain'}; - $tcrsid=$env{'request.course.id'}; - } - - return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid); -} - -sub printtokenheader { - my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_; - unless ($token) { return ''; } - - my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); - unless ($tsymb) { - $tsymb=$symb; - } - unless ($tuname) { - $tuname=$name; - $tudom=$domain; - $tcrsid=$courseid; - } - - my $plainname=&Apache::loncommon::plainname($tuname,$tudom); - - if ($target eq 'web') { - my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); - return - ''. - &mt('Checked out for').' '.$plainname. - '
'.&mt('User').': '.$tuname.' at '.$tudom. - '
'.&mt('ID').': '.$idhash{$tuname}. - '
'.&mt('CourseID').': '.$tcrsid. - '
'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}. - '
'.&mt('DocID').': '.$token. - '
'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'
'; - } else { - return $token; - } -} - sub printalltags { my $temp; foreach $temp (sort keys %Apache::lonxml::alltags) { @@ -571,11 +476,11 @@ sub inner_xmlparse { } if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { $finaloutput=&afterburn($finaloutput); - } + } if ($target eq 'modified') { # if modfied, handle startpart and endpart $finaloutput=~s/\]*\>(.*)\]*\>/$1<\/part>/gs; - } + } return $finaloutput; } @@ -737,8 +642,9 @@ sub setup_globals { sub init_safespace { my ($target,$safeeval,$safehole,$safeinit) = @_; - $safeeval->deny_only(':dangerous'); $safeeval->reval('use Math::Complex;'); + $safeeval->reval('use LaTeX::Table;'); + $safeeval->deny_only(':dangerous'); $safeeval->permit_only(":default"); $safeeval->permit("entereval"); $safeeval->permit(":base_math"); @@ -1528,25 +1434,17 @@ SIMPLECONTENT sub verify_html { my ($filecontents)=@_; - my ($is_html,$is_xml); - if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { - $is_xml = 1; - } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\>\;)/is) { - $is_html = 1; - } - unless ($is_xml || $is_html) { - return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>'); - } - if ($is_html) { - if ($filecontents!~/(?:\<|\<\;)\/html(?:\>|\>\;)/is) { - return &mt('File does not have [_1] ending tag','<html>'); - } - if ($filecontents!~/(?:\<|\<\;)(?:body|frameset)[^\<]*(?:\>|\>\;)/is) { - return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>'); - } - if ($filecontents!~/(?:\<|\<\;)\/(?:body|frameset)[^\<]*(?:\>|\>\;)/is) { - return &mt('File does not have [_1] or [_2] ending tag','<body>','<frameset>'); - } + if ($filecontents!~/(?:\<|\<\;)(?:html|xml)[^\<]*(?:\>|\>\;)/is) { + return &mt('File does not have [_1] or [_2] starting tag','<html>','<xml>'); + } + if ($filecontents!~/(?:\<|\<\;)\/(?:html|xml)(?:\>|\>\;)/is) { + return &mt('File does not have [_1] or [_2] ending tag','<html>','<xml>'); + } + if ($filecontents!~/(?:\<|\<\;)(?:body|frameset)[^\<]*(?:\>|\>\;)/is) { + return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>'); + } + if ($filecontents!~/(?:\<|\<\;)\/(?:body|frameset)[^\<]*(?:\>|\>\;)/is) { + return &mt('File does not have [_1] or [_2] ending tag','<body>','<frameset>'); } return ''; } @@ -1595,12 +1493,12 @@ sub inserteditinfo { my ($add_to_onload, $add_to_onresize); $initialize=&Apache::lonhtmlcommon::spellheader(); if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) { - my $lang = &Apache::lonhtmlcommon::htmlarea_lang(); + my $lang = &Apache::lonhtmlcommon::htmlarea_lang(); my %textarea_args = ( fullpage => 'true', dragmath => 'math', ); - $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); + $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); } $initialize .= (< @@ -1815,6 +1713,9 @@ ENDNOTFOUND $result = &Apache::lontexconvert::converted(\$filecontents, $env{'form.texengine'}); if ($env{'form.return_only_error_and_warning_counts'}) { + if (&verify_html(''.$result.'')) { + $errorcount++; + } $result = "$errorcount:$warningcount"; } } else { @@ -1839,26 +1740,22 @@ ENDNOTFOUND '
'.$result.
                               '
'; } - if ($env{'environment.remote'} eq 'off') { - my $brcrum; - if ($env{'request.state'} eq 'construct') { - $brcrum = [{'href' => &Apache::loncommon::authorspace(), - 'text' => 'Construction Space'}, - {'href' => '', - 'text' => $breadcrumbtext}]; - } else { - $brcrum = ''; # FIXME: Where are we? - } - my %options = ('bread_crumbs' => $brcrum, - 'bgcolor' => '#FFFFFF'); - $result = - &Apache::loncommon::start_page(undef,undef,\%options) - .$controls - .$result - .&Apache::loncommon::end_page(); + my $brcrum; + if ($env{'request.state'} eq 'construct') { + $brcrum = [{'href' => &Apache::loncommon::authorspace(), + 'text' => 'Construction Space'}, + {'href' => '', + 'text' => $breadcrumbtext}]; } else { - $result = $controls.$result; + $brcrum = ''; # FIXME: Where are we? } + my %options = ('bread_crumbs' => $brcrum, + 'bgcolor' => '#FFFFFF'); + $result = + &Apache::loncommon::start_page(undef,undef,\%options) + .$controls + .$result + .&Apache::loncommon::end_page(); } } } @@ -1889,10 +1786,6 @@ ENDNOTFOUND $header = &Apache::loncommon::head_subbox( &Apache::loncommon::CSTR_pageheader()); } - if ($env{'environment.remote'} ne 'off') { - $options{'bgcolor'} = '#FFFFFF'; - $options{'only_body'} = 1; - } my $js = &Apache::edit::js_change_detection(). &Apache::loncommon::resize_textarea_js(); @@ -2278,7 +2171,7 @@ sub get_tag { =item &print_pdf_radiobutton(fieldname, value) Returns a latexline to generate a PDF-Form-Radiobutton. -Note: Radiobuttons with equal names are automaticly grouped +Note: Radiobuttons with equal names are automaticly grouped in a selection-group. $fieldname: PDF internalname of the radiobutton(group)