Changeset 14662

Timestamp:

2007-10-11T12:20:56+13:00 (17 years ago)

Author:

anna

Message:

Undoing commit of r14657.

File:

• gsdl/trunk/perllib/plugins/MediaWikiPlug.pm (modified) (7 diffs)

gsdl/trunk/perllib/plugins/MediaWikiPlug.pm

@@ -63 +63 @@
        'type' => "regexp",
        'reqd' => "no",
-       'deft' => "<table([^>]*)id=(\\\"|')toc(\\\"|')(.|\\n)*</table>\\n" },        
+       'deft' => "<table([^>]*)id=(\\\"|')toc(\\\"|')(.|\\n)*?</table>\\n" },        
      # set to delete the navigation section
      { 'name' => "delete_nav",
@@ -127 +127 @@
     my @head_and_body = split(/<body/i,$$textref);
     my $head = shift(@head_and_body);
-    my $body_text = join("<body", @head_and_body);  
+    my $body_text = join("<body", @head_and_body);      
     
     $head =~ m/<title>(.+)<\/title>/i;
@@ -159 +159 @@
     # remove header section, it may contain header images or additional search boxes
     my $header_exp = "<div([^>]*)id=(\"|')container(\"|')([^>]*)>(.|\\n)*<div([^>]*)id=(\"|')column-content";
-    $body_text =~ s/$header_exp/<div$1id='container'$4><div$6id='column-content/isg;
+    if($body_text =~ /$header_exp/){
+        $body_text =~ s/$header_exp/<div$1id='container'$4><div$6id='column-content/isg;
+    } else {                
+        $header_exp = "(.|\\n)*?<div([^>]*)?id=(\"|')column-content";
+                if($body_text =~ /$header_exp/){
+                  $body_text =~ s/$header_exp/<div$2id='column-content/i;                
+                }
+    }
     
     # remove timeline
@@ -270 +277 @@
                     # comment out the body element because we change the body to div
                     $line =~ s/^(\s*)body(\s*){(\s*)$/$1\/*body$2*\/{$3/isg;
-                                        
-            if($line =~ m/^(.+)\{/i || $line =~ m/^(\s)*#/i){                    
-            $line = "#wikispecificstyle " . $line;
-            }
+                    
+                    if($line =~ m/^(.+)\{/i || $line =~ m/^(\s)*#/i){                    
+                      if($line !~ m/wikispecificstyle/i){
+                        $line = "#wikispecificstyle " . $line;
+                      } 
+                    }
+                    
             $css_content .= $line;
         }
@@ -375 +385 @@
     } else {
         $preserve_sections .= "\n$searchbox_section\n";
-    }    
-    
+    } 
     
     if($preserve_sections ne ""){
       $preserve_sections = "<div id=\"column-one\">\n" . $preserve_sections . "\n</div>\n";
     }
-    $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>";    
-    
+    $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>";   
+            
     $body_text =~ s/$print_footer/$preserve_sections/isg;
     
@@ -389 +398 @@
     my @forms;
     my $form_count = 0;
-    while($body_text =~ m/<form([^>]*)name=("|')([^>]*)("|')/isg){
-        next if($3 eq "q");
-        $forms[$form_count++] = $&;
+    while($body_text =~ m/<form([^>]*)name=("|')([^>"']*)?("|')/isg){
+        next if($3 eq "searchform");
+        $forms[$form_count++] = $&;        
     }
     foreach my $form (@forms) {      
       $body_text =~ s/$form[\s\S]*?<\/form>//m;
-    }    
-    
+    }
     
     # process links. 
@@ -559 +567 @@
     # If delete_toc is set, remove toc and tof contents.    
     if (defined $self->{'delete_toc'} && ($self->{'delete_toc'} == 1)){
-    if (defined $self->{'toc_exp'} && $self->{'toc_exp'} =~ /\S/){
-          # print "\nit matches toc_exp!!\n" if $body_text =~ /$self->{'toc_exp'}/;
+    if (defined $self->{'toc_exp'} && $self->{'toc_exp'} =~ /\S/){      
+          # print "\nit matches toc_exp !!\n" if $body_text =~ /$self->{'toc_exp'}/;
           if ($body_text =~ /$self->{'toc_exp'}/) {
-        $body_text =~ s/$self->{'toc_exp'}//i;
+        $body_text =~ s/$self->{'toc_exp'}//i;      
           }
     }