Merge branch 'thh-checkinput' into next

[usenet/newsstats.git] / NewsStats.pm

diff --git a/NewsStats.pm b/NewsStats.pm
index f0a4066..fd4843b 100644 (file)
--- a/NewsStats.pm
+++ b/NewsStats.pm
@@ -33,6 +33,7 @@ require Exporter;
   SplitPeriod
   ListMonth
   ListNewsgroups
   SplitPeriod
   ListMonth
   ListNewsgroups

+  ParseHierarchies

   ReadGroupList
   OutputData
   FormatOutput
   ReadGroupList
   OutputData
   FormatOutput


@@ -230,8 +231,9 @@ sub ReadGroupList {
   my %ValidGroups;
   open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!");
   while (<$LIST>) {
   my %ValidGroups;
   open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!");
   while (<$LIST>) {

-    s/^(\S+).*$/$1/;
+    s/^\s*(\S+).*$/$1/;

     chomp;
     chomp;

+    next if /^$/;

     $ValidGroups{$_} = '1';
   };
   close $LIST;
     $ValidGroups{$_} = '1';
   };
   close $LIST;


@@ -572,6 +574,7 @@ sub SQLGroupList {
   my ($Newsgroups) = @_;
   # substitute '*' wildcard with SQL wildcard character '%'
   $Newsgroups =~ s/\*/%/g;
   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 !~ /:/;
   # list of newsgroups separated by ':'
   # just one newsgroup?
   return (SQLGroupWildcard($Newsgroups),$Newsgroups) if $Newsgroups !~ /:/;
   # list of newsgroups separated by ':'


@@ -593,7 +596,6 @@ sub SQLGroupWildcard {
 ###                  (group.name or group.name.%)
 ### OUT: SQL code to become part of a 'WHERE' clause
   my ($Newsgroup) = @_;
 ###                  (group.name or group.name.%)
 ### OUT: SQL code to become part of a 'WHERE' clause
   my ($Newsgroup) = @_;

-  # FIXME: check for validity

   if ($Newsgroup !~ /%/) {
     return 'newsgroup = ?';
   } else {
   if ($Newsgroup !~ /%/) {
     return 'newsgroup = ?';
   } else {


@@ -696,6 +698,19 @@ sub SQLBuildClause {
   return $SQLClause;
 };
 
   return $SQLClause;
 };
 

+#####--------------------------- Verifications ----------------------------#####
+
+################################################################################
+sub CheckValidNewsgroups {
+################################################################################
+### syntax check of newgroup list
+### IN : $Newsgroups: list of newsgroups (group.one.*:group.two:group.three.*)
+### OUT: boolean
+  my ($Newsgroups) = @_;
+  my $InvalidCharRegExp = ',; ';
+  return ($Newsgroups =~ /[$InvalidCharRegExp]/) ? 0 : 1;
+};
+

 
 #####------------------------------- done ---------------------------------#####
 1;
 
 #####------------------------------- done ---------------------------------#####
 1;