From 0209af8ed62a26a44e54a9dca3da02bfd297837d Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 29 Apr 2012 07:14:45 +0000 Subject: [PATCH] Finding only the specified FileLogs (for Boris) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1496 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- webfrontend/pgm2/01_FHEMWEB.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm index a412b8d9f..9fef79508 100755 --- a/webfrontend/pgm2/01_FHEMWEB.pm +++ b/webfrontend/pgm2/01_FHEMWEB.pm @@ -1024,14 +1024,7 @@ FW_fileList($) $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file my ($dir,$re) = ($1, $2); return if(!$re); - # note: this fails if the filenames of several FileLogs match the same regexp. - # This is the case e.g. for - # /var/log/fhem/foo-%Y.log - # /var/log/fhem/foo-%Y-%m-%d.log - # I do not fix it because this could easily be avoided by using a different - # naming. - # BN 2012-04-22 - $re =~ s/%./\.*/g; + $re =~ s/%./[A-Za-z0-9]*/g; my @ret; return @ret if(!opendir(DH, $dir)); while(my $f = readdir(DH)) {