[BACK]Return to post_xml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework / cleanxml

Diff for /loncom/homework/cleanxml/post_xml.pm between versions 1.7 and 1.10

version 1.7, 2016/01/14 16:28:06 version 1.10, 2016/11/10 19:48:22
Line 128  sub post_xml { Line 128  sub post_xml {
       
   remove_useless_notsolved($root);    remove_useless_notsolved($root);
       
     fix_comments($root);
     
   fix_paragraphs_inside($root, \@all_block);    fix_paragraphs_inside($root, \@all_block);
   
   remove_empty_style($root);    remove_empty_style($root);
       
   fix_empty_lc_elements($root);    fix_empty_lc_elements($root);
       
     reduce_empty_p($root);
     
   lowercase_attribute_values($root);    lowercase_attribute_values($root);
       
   replace_numericalresponse_unit_attribute($root);    replace_numericalresponse_unit_attribute($root);
Line 1810  sub remove_useless_notsolved { Line 1814  sub remove_useless_notsolved {
   }    }
 }  }
   
   # Use <pre> for multi-line comments without elements.
   sub fix_comments {
     my ($root) = @_;
     my $doc = $root->ownerDocument;
     my @comments = $root->getElementsByTagName('comment');
     foreach my $comment (@comments) {
       my $first = $comment->firstChild;
       if (defined $first) {
         if ($first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /\n/ &&
             !defined $first->nextSibling) {
           my $pre = $doc->createElement('pre');
           $comment->removeChild($first);
           $comment->appendChild($pre);
           $pre->appendChild($first);
         }
       }
     }
   }
   
 # adds a paragraph inside if needed and calls fix_paragraph for all paragraphs (including new ones)  # adds a paragraph inside if needed and calls fix_paragraph for all paragraphs (including new ones)
 sub fix_paragraphs_inside {  sub fix_paragraphs_inside {
   my ($node, $all_block) = @_;    my ($node, $all_block) = @_;
   # blocks in which paragrahs will be added:    # blocks in which paragrahs will be added:
   my @blocks_with_p = ('loncapa','library','problem','part','problemtype','window','block','while','postanswerdate','preduedate','solved','notsolved','languageblock','instructorcomment','togglebox','standalone','body','form');    my @blocks_with_p = ('loncapa','library','problem','part','problemtype','window','block','while','postanswerdate','preduedate','languageblock','instructorcomment','togglebox','standalone','body','form');
   my @fix_p_if_br_or_p = (@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote');    my @fix_p_if_br_or_p = (@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote','solved','notsolved');
   if ((string_in_array(\@blocks_with_p, $node->nodeName) && paragraph_needed($node)) ||    if ((string_in_array(\@blocks_with_p, $node->nodeName) && paragraph_needed($node)) ||
       (string_in_array(\@fix_p_if_br_or_p, $node->nodeName) && paragraph_inside($node))) {        (string_in_array(\@fix_p_if_br_or_p, $node->nodeName) && paragraph_inside($node))) {
     # if non-empty, add paragraphs where needed between all br and remove br      # if non-empty, add paragraphs where needed between all br and remove br
Line 2247  sub fix_empty_lc_elements { Line 2270  sub fix_empty_lc_elements {
     }      }
   }    }
 }  }
   
   # remove consecutive empty paragraphs (they will not show anyway)
   sub reduce_empty_p {
     my ($node) = @_;
     my $next;
     for (my $child=$node->firstChild; defined $child; $child=$next) {
       $next = $child->nextSibling;
       while (defined $next && $next->nodeType == XML_TEXT_NODE && $next->nodeValue =~ /^[ \t\f\n\r]*$/) {
         $next = $next->nextSibling;
       }
       if ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName eq 'p' && defined $next &&
           $next->nodeType == XML_ELEMENT_NODE && $next->nodeName eq 'p') {
         my $first = $child->firstChild;
         if (!defined $first || (!defined $first->nextSibling &&
             $first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /^[ \t\f\n\r]*$/)) {
           $first = $next->firstChild;
           if (!defined $first || (!defined $first->nextSibling &&
               $first->nodeType == XML_TEXT_NODE && $first->nodeValue =~ /^[ \t\f\n\r]*$/)) {
             $node->removeChild($child);
           }
         }
       }
       if ($child->nodeType == XML_ELEMENT_NODE) {
         reduce_empty_p($child);
       }
     }
   }
   
 # turn some attribute values into lowercase when they should be  # turn some attribute values into lowercase when they should be
 sub lowercase_attribute_values {  sub lowercase_attribute_values {
Removed from v.1.7  
changed lines
  Added in v.1.10

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