[BACK]Return to lonxml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.571 and 1.572

version 1.571, 2024/04/17 13:37:37 version 1.572, 2024/04/17 15:15:13
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # XML Parser Module   # XML Parser Module
 #  #
 # $Id$  # $Id$
 #  #
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # Copyright for TtHfunc and TtMfunc by Ian Hutchinson.   # Copyright for TtHfunc and TtMfunc by Ian Hutchinson.
 # TtHfunc and TtMfunc (the "Code") may be compiled and linked into   # TtHfunc and TtMfunc (the "Code") may be compiled and linked into
 # binary executable programs or libraries distributed by the   # binary executable programs or libraries distributed by the
 # Michigan State University (the "Licensee"), but any binaries so   # Michigan State University (the "Licensee"), but any binaries so
 # distributed are hereby licensed only for use in the context  # distributed are hereby licensed only for use in the context
 # of a program or computational system for which the Licensee is the   # of a program or computational system for which the Licensee is the
 # primary author or distributor, and which performs substantial   # primary author or distributor, and which performs substantial
 # additional tasks beyond the translation of (La)TeX into HTML.  # additional tasks beyond the translation of (La)TeX into HTML.
 # The C source of the Code may not be distributed by the Licensee  # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.  # to any other parties under any circumstances.
Line 57  described at http://www.lon-capa.org. Line 57  described at http://www.lon-capa.org.
   
   
   
 package Apache::lonxml;   package Apache::lonxml;
 use vars   use vars 
 qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);  qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);
 use strict;  use strict;
Line 117  use Apache::lonhtmlcommon(); Line 117  use Apache::lonhtmlcommon();
 use Apache::functionplotresponse();  use Apache::functionplotresponse();
 use Apache::lonnavmaps();  use Apache::lonnavmaps();
   
 #====================================   Main subroutine: xmlparse    #====================================   Main subroutine: xmlparse
   
 #debugging control, to turn on debugging modify the correct handler  #debugging control, to turn on debugging modify the correct handler
   
Line 208  sub xmlend { Line 208  sub xmlend {
     if ($Apache::lonhomework::parsing_a_problem ||      if ($Apache::lonhomework::parsing_a_problem ||
  $Apache::lonhomework::parsing_a_task ) {   $Apache::lonhomework::parsing_a_task ) {
  $mode='problem';   $mode='problem';
  $status=$Apache::inputtags::status[-1];    $status=$Apache::inputtags::status[-1];
     }      }
     my $discussion;      my $discussion;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
Line 317  sub xmlparse { Line 317  sub xmlparse {
  }   }
  &init_state();   &init_state();
  if ($env{'form.return_only_error_and_warning_counts'}) {   if ($env{'form.return_only_error_and_warning_counts'}) {
      if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) {        if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) {
         my $error=&verify_html($content_file_string);          my $error=&verify_html($content_file_string);
         if ($error) { $errorcount++; }          if ($error) { $errorcount++; }
      }       }
Line 343  sub latex_special_symbols { Line 343  sub latex_special_symbols {
         $string=~s/([^\\])\&/$1\\\&/g;          $string=~s/([^\\])\&/$1\\\&/g;
         $string=~s/([^\\])\#/$1\\\#/g;          $string=~s/([^\\])\#/$1\\\#/g;
  $string =~ s/_/\\_/g;              # _ -> \_   $string =~ s/_/\\_/g;              # _ -> \_
  $string =~ s/\^/\\\^{}/g;          # ^ -> \^{}    $string =~ s/\^/\\\^{}/g;          # ^ -> \^{}
     } else {      } else {
  $string=~s/\\/\\ensuremath{\\backslash}/g;   $string=~s/\\/\\ensuremath{\\backslash}/g;
  $string=~s/\\\%|\%/\\\%/g;   $string=~s/\\\%|\%/\\\%/g;
Line 469  sub inner_xmlparse { Line 469  sub inner_xmlparse {
   
       if ($token->[0] eq 'E') {        if ($token->[0] eq 'E') {
           if ($dontpop) {            if ($dontpop) {
               $lastdontpop = $token;                 $lastdontpop = $token;
           } else {            } else {
               $lastendtag = $token->[1];                $lastendtag = $token->[1];
               &end_tag($stack,$parstack,$token);                &end_tag($stack,$parstack,$token);
Line 483  sub inner_xmlparse { Line 483  sub inner_xmlparse {
     }      }
   }    }
   
   if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') &&     if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') &&
       ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) {        ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) {
        if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) {         if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) {
            &end_tag($stack,$parstack,$lastdontpop);             &end_tag($stack,$parstack,$lastdontpop);
Line 506  sub inner_xmlparse { Line 506  sub inner_xmlparse {
   if ($target eq 'modified') {    if ($target eq 'modified') {
 # if modfied, handle startpart and endpart  # if modfied, handle startpart and endpart
      $finaloutput=~s/\<startpartmarker[^\>]*\>(.*)\<endpartmarker[^\>]*\>/<part>$1<\/part>/gs;       $finaloutput=~s/\<startpartmarker[^\>]*\>(.*)\<endpartmarker[^\>]*\>/<part>$1<\/part>/gs;
   }        }
   return $finaloutput;    return $finaloutput;
 }  }
   
 ##   ##
 ## Looks to see if there is a subroutine defined for this tag.  If so, call it,  ## Looks to see if there is a subroutine defined for this tag.  If so, call it,
 ## otherwise do not call it as we do not know what it is.  ## otherwise do not call it as we do not know what it is.
 ##  ##
Line 597  sub callsub { Line 597  sub callsub {
     sub init_state {      sub init_state {
  undef(%state);   undef(%state);
     }      }
       
     sub set_state {      sub set_state {
  my ($key,$value) = @_;   my ($key,$value) = @_;
  $state{$key} = $value;   $state{$key} = $value;
Line 699  sub init_safespace { Line 699  sub init_safespace {
   $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');    $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
   $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,    $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
                   '&r_cas_formula_fix');                    '&r_cas_formula_fix');
    
   $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,    $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
   '&capa_formula_fix');    '&capa_formula_fix');
   
Line 725  sub init_safespace { Line 725  sub init_safespace {
   $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');    $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
   $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');    $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
   $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');    $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');
     
   $safehole->wrap(\&Math::Cephes::bdtr  ,$safeeval,'&bdtr'  );    $safehole->wrap(\&Math::Cephes::bdtr  ,$safeeval,'&bdtr'  );
   $safehole->wrap(\&Math::Cephes::bdtrc ,$safeeval,'&bdtrc' );    $safehole->wrap(\&Math::Cephes::bdtrc ,$safeeval,'&bdtrc' );
   $safehole->wrap(\&Math::Cephes::bdtri ,$safeeval,'&bdtri' );    $safehole->wrap(\&Math::Cephes::bdtri ,$safeeval,'&bdtri' );
Line 1072  sub increment_counter { Line 1072  sub increment_counter {
     }      }
     $Apache::lonxml::counter += $increment;      $Apache::lonxml::counter += $increment;
   
     # If the caller supplied the response_id parameter,       # If the caller supplied the response_id parameter,
     # Maintain its counter.. creating if necessary.      # Maintain its counter.. creating if necessary.
   
     if (defined($part_response)) {      if (defined($part_response)) {
Line 1193  sub set_bubble_lines { Line 1193  sub set_bubble_lines {
   
 =item get_bubble_line_hash  =item get_bubble_line_hash
   
 Returns the current bubble line hash.  This is assumed to   Returns the current bubble line hash.  This is assumed to
 be small so we return a copy  be small so we return a copy
   
   
Line 1219  sub get_all_text { Line 1219  sub get_all_text {
     my $depth=0;      my $depth=0;
     my $token;      my $token;
     my $result='';      my $result='';
     if ( $tag =~ m:^/: ) {       if ( $tag =~ m:^/: ) {
  my $tag=substr($tag,1);    my $tag=substr($tag,1);
  #&Apache::lonxml::debug("have:$tag:");   #&Apache::lonxml::debug("have:$tag:");
  my $top_empty=0;   my $top_empty=0;
  while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {   while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
Line 1321  sub newparser { Line 1321  sub newparser {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);      push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
   } else {    } else {
     push (@Apache::lonxml::pwd, $dir);      push (@Apache::lonxml::pwd, $dir);
   }     }
 }  }
   
 sub parstring {  sub parstring {
Line 1338  sub parstring { Line 1338  sub parstring {
     push(@values,"\"$val\"");      push(@values,"\"$val\"");
  }   }
     }      }
     my $var_init =       my $var_init =
  (@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');'   (@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');'
         : '';          : '';
     return $var_init;      return $var_init;
Line 1591  FULLPAGE Line 1591  FULLPAGE
               }                }
           } elsif ($symb || $folderpath) {            } elsif ($symb || $folderpath) {
               $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";                $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
               $initialize .=                 $initialize .=
                   &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,                    &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
                                                              undef,$folderpath,$uri)."\n";                                                               undef,$folderpath,$uri)."\n";
           }            }
Line 1803  sub handler { Line 1803  sub handler {
   
     my $target=&get_target();      my $target=&get_target();
     $Apache::lonxml::debug=$env{'user.debug'};      $Apache::lonxml::debug=$env{'user.debug'};
       
     &Apache::loncommon::content_type($request,'text/html');      &Apache::loncommon::content_type($request,'text/html');
     &Apache::loncommon::no_cache($request);      &Apache::loncommon::no_cache($request);
     if ($env{'request.state'} eq 'published') {      if ($env{'request.state'} eq 'published') {
Line 1811  sub handler { Line 1811  sub handler {
       'lastrevisiondate'));        'lastrevisiondate'));
     }      }
     # Embedded Flash movies from Camtasia served from https will not display in IE      # Embedded Flash movies from Camtasia served from https will not display in IE
     #   if XML config file has expired from cache.          #   if XML config file has expired from cache.
     if ($ENV{'SERVER_PORT'} == 443) {      if ($ENV{'SERVER_PORT'} == 443) {
         if ($request->uri =~ /\.xml$/) {          if ($request->uri =~ /\.xml$/) {
             my ($httpbrowser,$clientbrowser) =              my ($httpbrowser,$clientbrowser) =
Line 1826  sub handler { Line 1826  sub handler {
         }          }
     }      }
     $request->send_http_header;      $request->send_http_header;
        
     return OK if $request->header_only;      return OK if $request->header_only;
   
   
Line 1949  ENDNOTFOUND Line 1949  ENDNOTFOUND
                     $inhibit_menu = 1;                      $inhibit_menu = 1;
                 }                  }
             }              }
             if (($filetype ne 'html') &&               if (($filetype ne 'html') &&
                 (!$env{'form.return_only_error_and_warning_counts'}) &&                  (!$env{'form.return_only_error_and_warning_counts'}) &&
                 (!$inhibit_menu)) {                  (!$inhibit_menu)) {
                 my $nochgview = 1;                  my $nochgview = 1;
Line 2007  ENDNOTFOUND Line 2007  ENDNOTFOUND
             if ($request->uri =~ m{^/uploaded/}) {              if ($request->uri =~ m{^/uploaded/}) {
                 if ($env{'request.course.id'}) {                  if ($env{'request.course.id'}) {
                     if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {                      if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {
                         if ($1 eq 'supplemental') {                           if ($1 eq 'supplemental') {
                             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},                              &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                                                     ['folderpath','title']);                                                                      ['folderpath','title']);
                         }                          }
Line 2027  ENDNOTFOUND Line 2027  ENDNOTFOUND
                     }                      }
                 }                  }
                 unless ($itemtitle) {                  unless ($itemtitle) {
                     ($symb,$itemtitle,$displayfile) =                       ($symb,$itemtitle,$displayfile) =
                         &get_courseupload_hierarchy($request->uri,                          &get_courseupload_hierarchy($request->uri,
                                                     $env{'form.folderpath'},                                                      $env{'form.folderpath'},
                                                     $env{'form.title'});                                                      $env{'form.title'});
Line 2040  ENDNOTFOUND Line 2040  ENDNOTFOUND
  &inserteditinfo($filecontents,$filetype,$displayfile,$symb,   &inserteditinfo($filecontents,$filetype,$displayfile,$symb,
                                 $itemtitle,$env{'form.folderpath'},$request->uri,$action);                                  $itemtitle,$env{'form.folderpath'},$request->uri,$action);
   
     my %options =       my %options =
  ('add_entries' =>   ('add_entries' =>
                    {'onresize'     => $add_to_onresize,                     {'onresize'     => $add_to_onresize,
                     'onload'       => $add_to_onload,   });                      'onload'       => $add_to_onload,   });
Line 2079  ENDNOTFOUND Line 2079  ENDNOTFOUND
   
     &Apache::lonxml::add_messages(\$result);      &Apache::lonxml::add_messages(\$result);
     $request->print($result);      $request->print($result);
       
     return OK;      return OK;
 }  }
   
Line 2150  sub debug { Line 2150  sub debug {
 }  }
   
 sub show_error_warn_msg {  sub show_error_warn_msg {
     if (($env{'request.filename'} eq       if (($env{'request.filename'} eq
          $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/lib/templates/simpleproblem.problem') &&           $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/lib/templates/simpleproblem.problem') &&
         (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {          (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
  return 1;   return 1;
Line 2245  sub error { Line 2245  sub error {
   
 sub warning {  sub warning {
     $warningcount++;      $warningcount++;
     
     if ($env{'form.grade_target'} ne 'tex') {      if ($env{'form.grade_target'} ne 'tex') {
  if ( &show_error_warn_msg() ) {   if ( &show_error_warn_msg() ) {
     push(@Apache::lonxml::warning_messages,      push(@Apache::lonxml::warning_messages,
Line 2260  sub warning { Line 2260  sub warning {
 }  }
   
 sub info {  sub info {
     if ($env{'form.grade_target'} ne 'tex'       if ($env{'form.grade_target'} ne 'tex'
  && $env{'request.state'} eq 'construct') {   && $env{'request.state'} eq 'construct') {
  push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");   push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");
     }      }
Line 2310  sub get_param { Line 2310  sub get_param {
  }   }
     } else {      } else {
  if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {   if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
       
     return &Apache::run::run("{$args;".'return $'.$param.'}',      return &Apache::run::run("{$args;".'return $'.$param.'}',
                                      $safeeval); #'                                       $safeeval); #'
  } else {   } else {
Line 2392  sub register_insert_xml { Line 2392  sub register_insert_xml {
     }      }
  }   }
     }      }
        
     # parse the allows and ignore tags set to <show>no</show>      # parse the allows and ignore tags set to <show>no</show>
     foreach my $tag (@alltags) {      foreach my $tag (@alltags) {
         next if (!exists($insertlist{$tag.'.allow'}));          next if (!exists($insertlist{$tag.'.allow'}));
Line 2498  sub get_tag { Line 2498  sub get_tag {
 =item &print_pdf_radiobutton(fieldname, value)  =item &print_pdf_radiobutton(fieldname, value)
   
 Returns a latexline to generate a PDF-Form-Radiobutton.  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.        in a selection-group.
   
 $fieldname: PDF internalname of the radiobutton(group)  $fieldname: PDF internalname of the radiobutton(group)
Line 2525  sub print_pdf_start_combobox { Line 2525  sub print_pdf_start_combobox {
     my $result;      my $result;
     my ($fieldName) = @_;      my ($fieldName) = @_;
     $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";      $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";
     $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; #       $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; #
   
     return $result;      return $result;
 }  }
Line 2543  $option: PDF internal name of the Combob Line 2543  $option: PDF internal name of the Combob
 sub print_pdf_add_combobox_option {  sub print_pdf_add_combobox_option {
   
     my $result;      my $result;
     my ($option) = @_;        my ($option) = @_;
   
     $result .= '('.$option.')';      $result .= '('.$option.')';
        
     return $result;      return $result;
 }  }
   
Removed from v.1.571  
changed lines
  Added in v.1.572

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>