From: Thomas Hochstein <thh@inter.net>
Date: Mon, 2 Sep 2013 10:59:57 +0000 (+0200)
Subject: Merge branch 'thh-bug37' into next
X-Git-Tag: 0.01~1^2~3
X-Git-Url: https://code.th-h.de/?p=usenet%2Fnewsstats.git;a=commitdiff_plain;h=7c83a673e654c823fe04d7731fd02f9bc5787703

Merge branch 'thh-bug37' into next

* thh-bug37:
  Create better newsgroup lists for SQL clause.
---

7c83a673e654c823fe04d7731fd02f9bc5787703
diff --cc NewsStats.pm
index fd4843b,b0094dc..12334cd
--- a/NewsStats.pm
+++ b/NewsStats.pm
@@@ -574,17 -574,48 +574,49 @@@ sub SQLGroupList 
    my ($Newsgroups) = @_;
    # substitute '*' wildcard with SQL wildcard character '%'
    $Newsgroups =~ s/\*/%/g;
 +  return (undef,undef) if !CheckValidNewsgroups($Newsgroups);
    # just one newsgroup?
    return (SQLGroupWildcard($Newsgroups),$Newsgroups) if $Newsgroups !~ /:/;
+   my ($SQL,@WildcardGroups,@NoWildcardGroups);
    # list of newsgroups separated by ':'
-   my $SQL = '(';
    my @GroupList = split /:/, $Newsgroups;
    foreach (@GroupList) {
-      $SQL .= ' OR ' if $SQL gt '(';
-      $SQL .= SQLGroupWildcard($_);
+     if ($_ !~ /%/) {
+       # add to list of newsgroup names WITHOUT wildcard
+       push (@NoWildcardGroups,$_);
+     } else {
+       # add to list of newsgroup names WITH wildcard
+       push (@WildcardGroups,$_);
+       # add wildcard to SQL clause
+       # 'OR' if SQL clause is not empty
+       $SQL .= ' OR ' if $SQL;
+       $SQL .= 'newsgroup LIKE ?'
+     }
    };
-   $SQL .= ')';
+   if (scalar(@NoWildcardGroups)) {
+     # add 'OR' if SQL clause is not empty
+     $SQL .= ' OR ' if $SQL;
+     if (scalar(@NoWildcardGroups) < 2) {
+       # special case: just one newsgroup without wildcard
+       $SQL .= 'newsgroup = ?';
+     } else {
+       # create list of newsgroups to include: 'newsgroup IN (...)'
+       $SQL .= 'newsgroup IN (';
+       my $SQLin;
+       foreach (@NoWildcardGroups) {
+         $SQLin .= ',' if $SQLin;
+         $SQLin .= '?';
+       }
+       # add list to SQL clause
+       $SQL .= $SQLin .= ')';
+     }
+   }
+   # add brackets '()' to SQL clause as needed (more than one wildcard group)
+   if (scalar(@WildcardGroups)) {
+     $SQL = '(' . $SQL .')';
+   }
+   # rebuild @GroupList in (now) correct order
+   @GroupList = (@WildcardGroups,@NoWildcardGroups);
    return ($SQL,@GroupList);
  };