loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.484.2.2 and 1.491

-version 1.484.2.2, 2008/10/24 19:36:40
+version 1.491, 2009/02/18 06:43:55
  Line 37
  # to any other parties under any circumstances.
  #
+ =pod
+ =head1 NAME
+ Apache::lonxml
+ =head1 SYNOPSIS
+ XML Parsing Module
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 SUBROUTINES
+ =cut
  package Apache::lonxml;
  use vars
- Line 505  sub inner_xmlparse {
+ Line 524  sub inner_xmlparse {
  	  if (!$Apache::lonxml::usestyle) {
  	      $extras=$Apache::lonxml::style_values;
  	  }
-           if ($token->[1] ne 'translated') {
+ 	  if ( $#$parstack > -1 ) {
- 	      if ( $#$parstack > -1 ) {
+ 	      $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
- 	          $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
+ 	  } else {
- 	      } else {
+ 	      $result= &Apache::run::evaluate($result,$safeeval,$extras);
- 	          $result=&Apache::run::evaluate($result,$safeeval,$extras);
- 	      }
            }
        }
        $Apache::lonxml::post_evaluate=1;
- Line 660  sub setup_globals {
+ Line 677  sub setup_globals {
    $Apache::lonxml::request=$request;
    $errorcount=0;
    $warningcount=0;
+   $Apache::lonxml::internal_error=0;
    $Apache::lonxml::default_homework_loaded=0;
    $Apache::lonxml::usestyle=1;
    &init_counter();
- Line 1588  FULLPAGE
+ Line 1606  FULLPAGE
        my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
        my $textarea_events = &Apache::edit::element_change_detection();
        my $form_events     = &Apache::edit::form_change_detection();
-       my $htmlerror=&verify_html($filecontents);
+       my $htmlerror;
-       if ($htmlerror) {
+       if ($filetype eq 'html') {
-          $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+           $htmlerror=&verify_html($filecontents);
+           if ($htmlerror) {
+               $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+           }
        }
        my $editfooter=(<<ENDFOOTER);
  $initialize
- Line 1830  sub error {
+ Line 1851  sub error {
      $errorcount++;
+     $Apache::lonxml::internal_error=1;
      if (defined($Apache::inputtags::part)) {
  	if ( @Apache::inputtags::response ) {
  	    push(@errors,
- Line 2139  sub get_tag {
+ Line 2162  sub get_tag {
      return $insertlist{"$tagnum.tag"};
  }
+ ############################################################
+ #                                           PDF-FORM-METHODS
+ =pod
+ =item &print_pdf_radiobutton(fieldname, value,  text)
+ Returns a latexline to generate a PDF-Form-Radiobutton with Text.
+ $fieldname: PDF internalname of the radiobutton
+ $value:     Value of radiobutton (read when dumping the PDF data)
+ $text:      Text on the rightside of the radiobutton
+ =cut
+ sub print_pdf_radiobutton {
+     my $result = '';
+     my ($fieldName, $value, $text) = @_;
+     $result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n";
+     $result .= '\radioButton[\symbolchoice{circle}]{'.
+                $fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n";
+     $result .= '\end{tabularx}' . "\n";
+     $result .= '\hspace{2mm}' . "\n";
+     return $result;
+ }
+ =pod
+ =item &print_pdf_start_combobox(fieldname)
+ Starts a latexline to generate a PDF-Form-Combobox with text.
+ $fieldname: PDF internal name of the Combobox
+ =cut
+ sub print_pdf_start_combobox {
+     my $result;
+     my ($fieldName) = @_;
+     $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";
+     $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; #
+     return $result;
+ }
+ =pod
+ =item &print_pdf_add_combobox_option(options)
+ Generates a latexline to add Options to a PDF-Form-ComboBox.
+ $option: PDF internal name of the Combobox-Option
+ =cut
+ sub print_pdf_add_combobox_option {
+     my $result;
+     my ($option) = @_;
+     $result .= '('.$option.')';
+     return $result;
+ }
+ =pod
+ =item &print_pdf_end_combobox(text) {
+ Returns latexcode to end a PDF-Form-Combobox with text.
+ =cut
+ sub print_pdf_end_combobox {
+     my $result;
+     my ($text) = @_;
+     $result .= '}&'.$text."\\\\\n";
+     $result .= '\end{tabularx}' . "\n";
+     $result .= '\hspace{2mm}' . "\n";
+     return $result;
+ }
+ =pod
+ =item &print_pdf_hiddenField(fieldname, user, domain)
+ Returns a latexline to generate a PDF-Form-hiddenField with userdata.
+ $fieldname label for hiddentextfield
+ $user:    name of user
+ $domain:  domain of user
+ =cut
+ sub print_pdf_hiddenfield {
+     my $result;
+     my ($fieldname, $user, $domain) = @_;
+     $result .= '\textField [\F{\FHidden}\F{-\FPrint}\V{'.$domain.'&'.$user.'}]{'.$fieldname.'}{0in}{0in}'."\n";
+     return $result;
+ }
 ;
  __END__

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

Removed from v.1.484.2.2
changed lines
	Added in v.1.491