Slight help clarification, defined removed, and rebuildflatndb stuff.

SWIM/NDB.pm

@@ -1100,7 +1100,7 @@ alternative directory and --dbpath and/or --root used.
        # From here on we can start putting stuff in the databases
        elsif (defined $ok) { 
          # first the package relationships
-         if (defined @REPLACE) {
+         if (@REPLACE) {
            my %relationship = @REPLACE;
            foreach (keys %relationship) {
               $ping->put($_,$relationship{$_});  
@@ -1108,7 +1108,7 @@ alternative directory and --dbpath and/or --root used.
            undef @REPLACE; 
          }
          # second the groups
-         if (defined %group) {
+         if ( %group ) {
             if (!defined $gb{$group}) {
               $ging->put($group,$package[1]);
             }
@@ -1120,7 +1120,7 @@ alternative directory and --dbpath and/or --root used.
             undef %group;
          }
          # third Filename
-         if (defined @FILENAME) {
+         if (@FILENAME) {
            my %filename = @FILENAME;
            foreach (keys %filename) {
             $ping->put($_,$filename{$_});  
@@ -1606,7 +1606,7 @@ alternative directory and --dbpath and/or --root used.
    unlink("$place/.packagesdiff$arch$dist.deb");
    rename("$place/.packagesdiff$arch$dist.deb.bk",
           "$place/.packagesdiff$arch$dist.deb");
-   if (defined @PDbk) {
+   if (@PDbk) {
      print "\n"; $x = 1;  
      # now we get to add a few more seconds checking to see if packages
      # which haven't changed can now be found in Contents, so

SWIM/NDB_File.pm

@@ -89,7 +89,7 @@ sub find_contents {
           ###############
           # this doesn't work to well for anything less simple than ../../
           if (m,^\.\./|^\.\.$,) {
-           if ($_ !~ m,/[\w-+]+/[\.\$\^\+\?\*\[\]\w-]*$,) {
+           if ($_ !~ m,/[\w\+-]+/[\.\$\^\+\?\*\[\]\w-]*$,) {
              my $dd; tr/\/// ? ($dd = tr/\///) : ($dd = 1); 
              my @pwd =  split(m,/,,$pwd);
              s,\.\./,,g;

swim

@@ -1734,14 +1734,14 @@ Usage: swim [--nopager -n]
                         [-g] [-n] [--dbpath <dir>] [--root <dir>] [--no]
                         [--arch <architecture>] [--dists <distribution>] 
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] [--stdin]
                         [<\\d{1,}>]  
        swim {--powersearch --ps ? (--research || --refinesearch) <pattern(s)>}
                         [-n] [--dir] [--dbpath <dir>] [--root <dir>] [--no]
                         [--arch <architecture>] [--dists <distribution>] 
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] [--stdin]
                         [<\\d{1,}>]  
        swim {--query -q} [-afpgn --dir] [--total -t] [-i] [-l ? <[--df]>]
@@ -1755,7 +1755,7 @@ Usage: swim [--nopager -n]
                         [--arch <architecture>] [--dists <distribution>] 
                         [--stdin] [--extract <ALL|archive|PWD!archive>]
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] 
                         [targets | -S ? <\\d{1,}>]
        swim {--audit --status -C}
@@ -1812,14 +1812,14 @@ Usage: swim [--nopager -n]
                         [-g] [-n] [--dbpath <dir>] [--root <dir>] [--no]
                         [--arch <architecture>] [--dists <distribution>] 
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] [--stdin]
                         [<\\d{1,}>]  
        swim {--powersearch --ps ? (--research || --refinesearch) <pattern(s)>}
                         [-n] [--dir] [--dbpath <dir>] [--root <dir>] [--no]
                         [--arch <architecture>] [--dists <distribution>] 
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] [--stdin]
                         [<\\d{1,}>]  
        swim {--query -q} [-afpgn --dir] [--total -t] [-i] [-l ? <[--df]>]
@@ -1833,7 +1833,7 @@ Usage: swim [--nopager -n]
                         [--arch <architecture>] [--dists <distribution>] 
                         [--stdin] [--extract <ALL|archive|PWD!archive>]
                         [-xyz ? < [--download-only] [-r --remove] [--purge] 
-                        [--source <[-b] | [--diff-only] | [--tar-only]>] 
+                        [--source <[-b] | [--diff-only] [--tar-only]>] 
                         [--reinstall] [--build-dep] >] 
                         [targets | -S ? <\\d{1,}>]
        swim {--audit --status -C}