X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=e6d5eac9f6ec12335fa63a51f66d41072e547414;hb=eb06da6a334bc37108cdce9bfc7f26cfcb2003ee;hp=cfa33d115239010244e082705d45e2bd1b885df1;hpb=415dbf964ef32c89d6283a19487a6eb188f32ed2;p=pspp

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index cfa33d1152..e6d5eac9f6 100644
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -1,5 +1,6 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
+                 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,10 +46,23 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) (msgid)
 
+
+#ifdef ODF_READ_SUPPORT
+static const bool odf_read_support = true;
+#else
+static const bool odf_read_support = false;
+#endif
+
+#ifdef GNM_READ_SUPPORT
+static const bool gnm_read_support = true;
+#else
+static const bool gnm_read_support = false;
+#endif
+
 static bool parse_spreadsheet (struct lexer *lexer, char **filename,
 			       struct spreadsheet_read_options *opts);
 
-static void destroy_spreadsheet_read_info (struct spreadsheet_read_info *, struct spreadsheet_read_options *);
+static void destroy_spreadsheet_read_info (struct spreadsheet_read_options *);
 
 static int parse_get_txt (struct lexer *lexer, struct dataset *);
 static int parse_get_psql (struct lexer *lexer, struct dataset *);
@@ -57,10 +71,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);
 
@@ -81,35 +103,46 @@ 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;
 
-      if ( 0 == strncasecmp (tok, "GNM", 3))
+      if ( gnm_read_support && 0 == strncasecmp (tok, "GNM", 3))
 	{
 	  struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
+	  if (spreadsheet == NULL)
+	    goto error;
 	  reader = gnumeric_make_reader (spreadsheet, &opts);
 	  dict = spreadsheet->dict;
+	  gnumeric_destroy (spreadsheet);
 	}
-      else if (0 == strncasecmp (tok, "ODS", 3))
+      else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3))
 	{
 	  struct spreadsheet *spreadsheet = ods_probe (filename, true);
+	  if (spreadsheet == NULL)
+	    goto error;
 	  reader = ods_make_reader (spreadsheet, &opts);
 	  dict = spreadsheet->dict;
+	  ods_destroy (spreadsheet);
 	}
 
+      free (filename);
+
       if (reader)
 	{
 	  dataset_set_dict (ds, dict);
 	  dataset_set_source (ds, reader);
 	  free (tok);
+	  destroy_spreadsheet_read_info (&opts);
 	  return CMD_SUCCESS;
 	}
     }
   else
     msg (SE, _("Unsupported TYPE %s."), tok);
 
+
  error:
+  destroy_spreadsheet_read_info (&opts);
   free (tok);
   return CMD_FAILURE;
 }
@@ -400,7 +433,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
             goto error;
           if (lex_integer (lexer) < 1)
             {
-              msg (SE, _("Value of FIRSTCASE must be 1 or greater."));
+              msg (SE, _("Value of %s must be 1 or greater."), "FIRSTCASE");
               goto error;
             }
           data_parser_set_skip (parser, lex_integer (lexer) - 1);
@@ -438,7 +471,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
             goto error;
           if (lex_integer (lexer) < 1)
             {
-              msg (SE, _("Value of FIXCASE must be at least 1."));
+              msg (SE, _("Value of %s must be 1 or greater."), "FIXCASE");
               goto error;
             }
           data_parser_set_records (parser, lex_integer (lexer));
@@ -458,7 +491,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
                 goto error;
               if (lex_integer (lexer) < 1)
                 {
-                  msg (SE, _("Value of FIRST must be at least 1."));
+                  msg (SE, _("Value of %s must be 1 or greater."), "FIRST");
                   goto error;
                 }
               data_parser_set_case_limit (parser, lex_integer (lexer));
@@ -470,7 +503,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
                 goto error;
               if (lex_integer (lexer) < 1 || lex_integer (lexer) > 100)
                 {
-                  msg (SE, _("Value of PERCENT must be between 1 and 100."));
+                  msg (SE, _("Value of %s must be between 1 and 100."), "PERCENT");
                   goto error;
                 }
               data_parser_set_case_percent (parser, lex_integer (lexer));
@@ -667,7 +700,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
 
 
 static void 
-destroy_spreadsheet_read_info (UNUSED struct spreadsheet_read_info *sri,
-			       UNUSED struct spreadsheet_read_options *opts)
+destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
 {
+  free (opts->cell_range);
+  free (opts->sheet_name);
 }