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=ebf31eea2cfd8b49e8e83e2da931eecb9bf40ab1;hp=2e7df57f02cc8d7321e7affeb28d1a27f164a86e;hpb=6e2be552b8c17b0632803e21b296155e79dd67b4;p=pspp

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index 2e7df57f02..e6d5eac9f6 100644
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -46,6 +46,19 @@
 #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);
 
@@ -57,8 +70,15 @@ 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;
+  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"))
@@ -87,7 +107,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
       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)
@@ -96,7 +116,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
 	  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)
@@ -413,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);
@@ -451,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));
@@ -471,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));
@@ -483,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));