X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=daec18f41da340c9d0e5b9c882eae4e3c2fbc53d;hb=261eabd9113876a12994f7b419cbf3cf1ee98453;hp=fa033f22e86c2de2b126d5d50a826f3bb4132c13;hpb=4785da39b9cb392c0a6a2c38a8abac199a72d615;p=pspp

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index fa033f22e8..daec18f41d 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,10 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) (msgid)
 
-static bool parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri, 
+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 *);
@@ -56,11 +57,12 @@ static int parse_get_psql (struct lexer *lexer, struct dataset *);
 int
 cmd_get_data (struct lexer *lexer, struct dataset *ds)
 {
+  struct spreadsheet_read_options opts;
   char *tok = NULL;
   lex_force_match (lexer, T_SLASH);
 
   if (!lex_force_match_id (lexer, "TYPE"))
-    return CMD_FAILURE;
+    goto error;
 
   lex_force_match (lexer, T_EQUALS);
 
@@ -78,32 +80,48 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
   else if (lex_match_id (lexer, "GNM") || 
       lex_match_id (lexer, "ODS"))
     {
+      char *filename = NULL;
       struct casereader *reader = NULL;
       struct dictionary *dict = NULL;
-      struct spreadsheet_read_info sri;
-      struct spreadsheet_read_options opts;
-      if (!parse_spreadsheet (lexer, &sri, &opts))
+
+      if (!parse_spreadsheet (lexer, &filename, &opts))
 	goto error;
 
       if ( 0 == strncasecmp (tok, "GNM", 3))
-	reader = gnumeric_open_reader (&sri, &opts, &dict);
+	{
+	  struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
+	  if (spreadsheet == NULL)
+	    goto error;
+	  reader = gnumeric_make_reader (spreadsheet, &opts);
+	  dict = spreadsheet->dict;
+	}
       else if (0 == strncasecmp (tok, "ODS", 3))
-	reader = ods_open_reader (&sri, &opts, &dict);
+	{
+	  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);
-	  destroy_spreadsheet_read_info (&sri, &opts);
 	  free (tok);
+	  destroy_spreadsheet_read_info (&opts);
 	  return CMD_SUCCESS;
 	}
-      destroy_spreadsheet_read_info (&sri, &opts);
     }
   else
     msg (SE, _("Unsupported TYPE %s."), tok);
 
+
  error:
+  destroy_spreadsheet_read_info (&opts);
   free (tok);
   return CMD_FAILURE;
 }
@@ -185,15 +203,14 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds)
 }
 
 static bool
-parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri, 
+parse_spreadsheet (struct lexer *lexer, char **filename, 
 		   struct spreadsheet_read_options *opts)
 {
   opts->sheet_index = 1;
   opts->sheet_name = NULL;
   opts->cell_range = NULL;
-  sri->read_names = true;
-  sri->asw = -1;
-  sri->file_name = NULL;
+  opts->read_names = true;
+  opts->asw = -1;
 
   lex_force_match (lexer, T_SLASH);
 
@@ -205,7 +222,7 @@ parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
   if (!lex_force_string (lexer))
     goto error;
 
-  sri->file_name = utf8_to_filename (lex_tokcstr (lexer));
+  *filename  = utf8_to_filename (lex_tokcstr (lexer));
 
   lex_get (lexer);
 
@@ -214,7 +231,7 @@ parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
       if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
 	{
 	  lex_match (lexer, T_EQUALS);
-	  sri->asw = lex_integer (lexer);
+	  opts->asw = lex_integer (lexer);
 	  lex_get (lexer);
 	}
       else if (lex_match_id (lexer, "SHEET"))
@@ -232,8 +249,8 @@ parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
 	    }
 	  else if (lex_match_id (lexer, "INDEX"))
 	    {
-	      sri->sheet_index = lex_integer (lexer);
-	      if (sri->sheet_index <= 0)
+	      opts->sheet_index = lex_integer (lexer);
+	      if (opts->sheet_index <= 0)
 		{
 		  msg (SE, _("The sheet index must be greater than or equal to 1"));
 		  goto error;
@@ -276,11 +293,11 @@ parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
 
 	  if ( lex_match_id (lexer, "ON"))
 	    {
-	      sri->read_names = true;
+	      opts->read_names = true;
 	    }
 	  else if (lex_match_id (lexer, "OFF"))
 	    {
-	      sri->read_names = false;
+	      opts->read_names = false;
 	    }
 	  else
 	    {
@@ -299,7 +316,6 @@ parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
   return true;
 
  error:
-  destroy_spreadsheet_read_info (sri, opts);
   return false;
 }
 
@@ -663,10 +679,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
 
 
 static void 
-destroy_spreadsheet_read_info (struct spreadsheet_read_info *sri,
-			       struct spreadsheet_read_options *opts)
+destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
 {
-  free (opts->sheet_name);
   free (opts->cell_range);
-  free (sri->file_name);
+  free (opts->sheet_name);
 }