directory browsing, Makefile for debugging

git-svn-id: svn://svn.rot13.org/fuse_dbi/trunk@2 17f4e80c-d0e0-0310-8903-bfc3ae804c12

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..4fcba46
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+all:
+       sudo umount /mnt2
+       ./fuse_dbi.pl /mnt2
+       sudo umount /mnt2

diff --git a/fuse_dbi.pl b/fuse_dbi.pl
index 07f8df1..a0a2fdf 100755 (executable)
--- a/fuse_dbi.pl
+++ b/fuse_dbi.pl
@@ -9,7 +9,7 @@ use strict;
 my $sql_filenames = q{
        select
                templateid as id,
 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 ;
                length(template) as size,
                iseditable as writable
        from template ;


@@ -119,7 +119,7 @@ sub e_getdir {
                $f =~ s/^\E$dirname\Q//;
                $f =~ s/^\///;
                if ($dirname) {
                $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 =~ /^[^\/]+$/);
                }
                } else {
                        $out{$f}++ if ($f =~ /^[^\/]+$/);
                }