--- trunk/fuse_dbi.pl	2004/08/04 08:58:46	1
+++ trunk/fuse_dbi.pl	2004/08/04 09:03:05	2
@@ -9,7 +9,7 @@
 my $sql_filenames = q{
 	select
 		templateid as id,
-		namespace||'/'||name as filename,
+		namespace||'/'||name||' ['||templateid||']' as filename,
 		length(template) as size,
 		iseditable as writable
 	from template ;
@@ -119,7 +119,7 @@
 		$f =~ s/^\E$dirname\Q//;
 		$f =~ s/^\///;
 		if ($dirname) {
-			$out{$f}++ if (/^\E$dirname\Q/);
+			$out{$f}++ if (/^\E$dirname\Q/ && $f =~ /^[^\/]+$/);
 		} else {
 			$out{$f}++ if ($f =~ /^[^\/]+$/);
 		}