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.4.3 and 1.488

-version 1.484.4.3, 2009/10/04 03:42:42
+version 1.488, 2008/10/27 19:15:35
  Line 505  sub inner_xmlparse {
  	  if (!$Apache::lonxml::usestyle) {
  	      $extras=$Apache::lonxml::style_values;
  	  }
- 	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 658  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 1587  FULLPAGE
+ Line 1586  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;
+       my $htmlerror=&verify_html($filecontents);
-       if ($filetype eq 'html') {
+       if ($htmlerror) {
-           $htmlerror=&verify_html($filecontents);
+          $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
-           if ($htmlerror) {
-               $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
-           }
        }
        my $editfooter=(<<ENDFOOTER);
  $initialize
- Line 1666  sub handler {
+ Line 1662  sub handler {
  	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
  							      'lastrevisiondate'));
      }
-     # Embedded Flash movies (e.g., from Camtasia) served from https will not display in IE
-     #   if XML config file has expired from cache.
-     if ($ENV{'SERVER_PORT'} == 443) {
-         if ($request->uri =~ /\.xml$/) {
-             my ($httpbrowser,$clientbrowser) =
-                 &Apache::loncommon::decode_user_agent($request);
-             if ($clientbrowser =~ /^explorer$/i) {
-                 delete $request->headers_out->{'Cache-control'};
-                 delete $request->headers_out->{'Pragma'};
-                 my $expiration = time + 60;
-                 my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration));
-                 $request->headers_out->set("Expires" => $date);
-             }
-         }
-     }
      $request->send_http_header;
      return OK if $request->header_only;
- Line 1847  sub error {
+ Line 1828  sub error {
      $errorcount++;
-     $Apache::lonxml::internal_error=1;
      if (defined($Apache::inputtags::part)) {
  	if ( @Apache::inputtags::response ) {
  	    push(@errors,
- Line 2158  sub get_tag {
+ Line 2137  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.4.3
changed lines
	Added in v.1.488