Make exclusions actually work.

Updates #630
shawnlaffan · Jan 20, 2017 · d9b6c9d · d9b6c9d
1 parent 188a190
commit d9b6c9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Biodiverse/GUI/Export.pm b/lib/Biodiverse/GUI/Export.pm
@@ -115,8 +115,9 @@ sub Run {
 
         eval {
             $object->export(
-                format   => $selected_format,
-                file     => $filename,
+                format         => $selected_format,
+                file           => $filename,
+                export_colours => $export_colours,
                 @$params,
             )
         };

diff --git a/lib/Biodiverse/TreeNode/BootstrapBlock.pm b/lib/Biodiverse/TreeNode/BootstrapBlock.pm
@@ -72,6 +72,7 @@ sub encode_bootstrap_block {
 
     if($args{exclusions}) {
         my @excluded_keys = @{$args{exclusions}};
+        # print "Exclusions are: @excluded_keys\n";
         foreach my $exclusion (@excluded_keys) {
             delete $boot_values{$exclusion};
         }
@@ -87,8 +88,10 @@ sub encode_bootstrap_block {
     $json_string = scalar reverse $json_string; # cheeky
     $json_string =~ s/\}/\]/;
     $json_string = scalar reverse $json_string;
-
-    return $json_string;
+
+    # if we have nothing in this block, we probably don't want to
+    # write out [], makes the nexus file ugly.
+    return $json_string eq "[]" ? "" : $json_string;
 }