getdir fix, working WebGUI example

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

diff --git a/DBI.pm b/DBI.pm
index b39373c..df80edc 100755 (executable)
--- a/DBI.pm
+++ b/DBI.pm
@@ -235,12 +235,11 @@ sub e_getdir {
        # return as many text filenames as you like, followed by the retval.
        print((scalar keys %files)." files total\n");
        my %out;
-       foreach (keys %files) {
-               my $f = $_;
-               $f =~ s/^\E$dirname\Q//;
-               $f =~ s/^\///;
+       foreach my $f (sort keys %files) {
                if ($dirname) {
-                       $out{$f}++ if (/^\E$dirname\Q/ && $f =~ /^[^\/]+$/);
+                       if ($f =~ s/^\E$dirname\Q\///) {
+                               $out{$f}++ if ($f =~ /^[^\/]+$/);
+                       }
                } else {
                        $out{$f}++ if ($f =~ /^[^\/]+$/);
                }
@@ -249,6 +248,7 @@ sub e_getdir {
                $out{'no files? bug?'}++;
        }
        print scalar keys %out," files in dir '$dirname'\n";
+       print "## ",join(" ",keys %out),"\n";
        return (keys %out),0;
 }
 

diff --git a/examples/webgui.pl b/examples/webgui.pl
index ce04fcf..e649e39 100755 (executable)
--- a/examples/webgui.pl
+++ b/examples/webgui.pl
@@ -25,9 +25,15 @@ my $sql_update = q{
                where oid = ?;
 };
 
-Fuse::DBI->run({
+my $mnt = Fuse::DBI->mount({
        filenames => $sql_filenames,
        read => $sql_read,
        update => $sql_update,
        dsn => 'DBI:Pg:dbname=webgui',
+       mount => '/mnt2',
 });
+
+print "Press enter to exit...";
+my $foo = <STDIN>;
+
+$mnt->umount;