Merge remote branch 'origin/master' into import-gui

[pspp] / src / language / data-io / get-data.c

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index 2879e34a4bb3f329a3ab244cd8bb4c6b75f6e228..321bd887ea3690c91e7b0a916b7cd24f8b10443a 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -58,10 +58,18 @@ int
 cmd_get_data (struct lexer *lexer, struct dataset *ds)
 {
   char *tok = NULL;
+  struct spreadsheet_read_options opts;
+  
+  opts.sheet_name = NULL;
+  opts.sheet_index = -1;
+  opts.cell_range = NULL;
+  opts.read_names = false;
+  opts.asw = -1;
+
   lex_force_match (lexer, T_SLASH);
 
   if (!lex_force_match_id (lexer, "TYPE"))
-    return CMD_FAILURE;
+    goto error;
 
   lex_force_match (lexer, T_EQUALS);
 
@@ -82,7 +90,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
       char *filename = NULL;
       struct casereader *reader = NULL;
       struct dictionary *dict = NULL;
-      struct spreadsheet_read_options opts;
+
       if (!parse_spreadsheet (lexer, &filename, &opts))
        goto error;
 
@@ -93,6 +101,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
            goto error;
          reader = gnumeric_make_reader (spreadsheet, &opts);
          dict = spreadsheet->dict;
+         gnumeric_destroy (spreadsheet);
        }
       else if (0 == strncasecmp (tok, "ODS", 3))
        {
@@ -101,6 +110,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
            goto error;
          reader = ods_make_reader (spreadsheet, &opts);
          dict = spreadsheet->dict;
+         ods_destroy (spreadsheet);
        }
 
       free (filename);
@@ -113,15 +123,13 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
          destroy_spreadsheet_read_info (&opts);
          return CMD_SUCCESS;
        }
-      destroy_spreadsheet_read_info (&opts);
     }
   else
     msg (SE, _("Unsupported TYPE %s."), tok);
 
 
-
-
  error:
+  destroy_spreadsheet_read_info (&opts);
   free (tok);
   return CMD_FAILURE;
 }
@@ -682,4 +690,5 @@ static void
 destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
 {
   free (opts->cell_range);
+  free (opts->sheet_name);
 }