Changeset 14662
- Timestamp:
- 2007-10-11T12:20:56+13:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/perllib/plugins/MediaWikiPlug.pm
r14657 r14662 63 63 'type' => "regexp", 64 64 'reqd' => "no", 65 'deft' => "<table([^>]*)id=(\\\"|')toc(\\\"|')(.|\\n)* </table>\\n" },65 'deft' => "<table([^>]*)id=(\\\"|')toc(\\\"|')(.|\\n)*?</table>\\n" }, 66 66 # set to delete the navigation section 67 67 { 'name' => "delete_nav", … … 127 127 my @head_and_body = split(/<body/i,$$textref); 128 128 my $head = shift(@head_and_body); 129 my $body_text = join("<body", @head_and_body); 129 my $body_text = join("<body", @head_and_body); 130 130 131 131 $head =~ m/<title>(.+)<\/title>/i; … … 159 159 # remove header section, it may contain header images or additional search boxes 160 160 my $header_exp = "<div([^>]*)id=(\"|')container(\"|')([^>]*)>(.|\\n)*<div([^>]*)id=(\"|')column-content"; 161 $body_text =~ s/$header_exp/<div$1id='container'$4><div$6id='column-content/isg; 161 if($body_text =~ /$header_exp/){ 162 $body_text =~ s/$header_exp/<div$1id='container'$4><div$6id='column-content/isg; 163 } else { 164 $header_exp = "(.|\\n)*?<div([^>]*)?id=(\"|')column-content"; 165 if($body_text =~ /$header_exp/){ 166 $body_text =~ s/$header_exp/<div$2id='column-content/i; 167 } 168 } 162 169 163 170 # remove timeline … … 270 277 # comment out the body element because we change the body to div 271 278 $line =~ s/^(\s*)body(\s*){(\s*)$/$1\/*body$2*\/{$3/isg; 272 273 if($line =~ m/^(.+)\{/i || $line =~ m/^(\s)*#/i){ 274 $line = "#wikispecificstyle " . $line; 275 } 279 280 if($line =~ m/^(.+)\{/i || $line =~ m/^(\s)*#/i){ 281 if($line !~ m/wikispecificstyle/i){ 282 $line = "#wikispecificstyle " . $line; 283 } 284 } 285 276 286 $css_content .= $line; 277 287 } … … 375 385 } else { 376 386 $preserve_sections .= "\n$searchbox_section\n"; 377 } 378 387 } 379 388 380 389 if($preserve_sections ne ""){ 381 390 $preserve_sections = "<div id=\"column-one\">\n" . $preserve_sections . "\n</div>\n"; 382 391 } 383 $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>"; 384 392 $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>"; 393 385 394 $body_text =~ s/$print_footer/$preserve_sections/isg; 386 395 … … 389 398 my @forms; 390 399 my $form_count = 0; 391 while($body_text =~ m/<form([^>]*)name=("|')([^> ]*)("|')/isg){392 next if($3 eq " q");393 $forms[$form_count++] = $&; 400 while($body_text =~ m/<form([^>]*)name=("|')([^>"']*)?("|')/isg){ 401 next if($3 eq "searchform"); 402 $forms[$form_count++] = $&; 394 403 } 395 404 foreach my $form (@forms) { 396 405 $body_text =~ s/$form[\s\S]*?<\/form>//m; 397 } 398 406 } 399 407 400 408 # process links. … … 559 567 # If delete_toc is set, remove toc and tof contents. 560 568 if (defined $self->{'delete_toc'} && ($self->{'delete_toc'} == 1)){ 561 if (defined $self->{'toc_exp'} && $self->{'toc_exp'} =~ /\S/){ 562 # print "\nit matches toc_exp !!\n" if $body_text =~ /$self->{'toc_exp'}/;569 if (defined $self->{'toc_exp'} && $self->{'toc_exp'} =~ /\S/){ 570 # print "\nit matches toc_exp !!\n" if $body_text =~ /$self->{'toc_exp'}/; 563 571 if ($body_text =~ /$self->{'toc_exp'}/) { 564 $body_text =~ s/$self->{'toc_exp'}//i; 572 $body_text =~ s/$self->{'toc_exp'}//i; 565 573 } 566 574 }
Note:
See TracChangeset
for help on using the changeset viewer.