some more fixes for wiki

1 files changed, 11 insertions, 12 deletions

diff --git a/wiki2.pl b/wiki2.pl
index 1ce94f3..f6fb6e2 100644
--- a/wiki2.pl
+++ b/wiki2.pl
@@ -17,7 +17,7 @@ my $wiki = WWW::Wikipedia->new( language => $lang);
 
 my $result = $wiki->search( "$ARGV[0]" );
 if (defined $result) {
-   my @lines = split('\n', $result->text());
+   my @lines = split('\n', $result->text_basic());
    my @newlines;
    my $newline = "";
    my $isDis = 0;
@@ -26,17 +26,17 @@ if (defined $result) {
    foreach my $line (@lines) {
 #print "$line\n";
       $line =~ s/<!--.*-->//g;
-      $line=~ s/^}}//g;
+      #$line=~ s/^}}//g;
       $line=~ s/^\]\]//g;
       $line=~ s/^\s*//;
       $line=~ s/\s*$//;
       $comment = 1 if $line =~ m/^<!--$/;
       $comment = 0 if $line =~ m/^-->$/;
-      if ($line && $line =~ m/^\* /) {
+      if ($line && $line =~ m/^\*\s?/) {
          push(@newlines, $newline);
          push(@newlines, $line);
          $newline = "";
-         $isDis = 1 if $ln < 3;
+         $isDis = 1 if $ln < 4;
       } elsif ($line) {
          $newline = "$newline$line ";
          $ln++;
@@ -55,14 +55,6 @@ if (defined $result) {
       $line=~ s/^\s*//;
       $line=~ s/\s*$//;
       if ($line !~ m/^\s*$/) {
-         if ($isDis) {
-            if ($line =~ m/^\* /) {
-               last if $ln == 3;
-               $lst = 1 if $ln == 2;
-               print "$line\n";
-               $ln++;
-            }
-         } else {
          $line = decode_entities($line);
          #$line =~ s/\([^\(\)]*\)||\[[^\[\]]*\]//g;
          $line =~ s/\[\[([^|\]]*\|)?([^\]]*)\]\]/$2/g;
@@ -75,6 +67,13 @@ if (defined $result) {
          $line =~ s/<ref[^>]*>[^<]*<\/ref>//g;
          $line =~ s/\s+/ /g;
          $line =~ s/\s([,.\?!])/$1/g;
+         if ($isDis) {
+            if ($line =~ m/^\*\s?/) {
+               last if ($ln == 3) && ($lst = 1);
+               print "$line\n";
+               $ln++;
+            }
+         } else {
             if ($line =~ m/.{448}.*/) {
                $line =~ s/^(.{448}).*$/$1/;
                #$line =~ s/^(.*[\.!\?])[^\.!\?]*$/$1 (...)/;