X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fods-reader.c;h=1b828d1e36a186a9e532c4c88871881e347d23a6;hb=1e0e76eaeb51ef0c15fdcfc4bd12d9310c16a88b;hp=fa364090c4564b583d5f4b3bee982ea63772a24b;hpb=5240f6952122fc99df8db65056012b3086373c2f;p=pspp

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index fa364090c4..1b828d1e36 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -152,6 +152,8 @@ struct ods_reader
   bool read_names;
 
   struct string ods_errs;
+
+  struct string zip_errs;
 };
 
 void
@@ -241,7 +243,7 @@ ods_get_sheet_range (struct spreadsheet *s, int n)
       process_node (r, or);
     }
 
-  return create_cell_ref (
+  return create_cell_range (
 			  r->sheets[n].start_col,
 			  r->sheets[n].start_row,
 			  r->sheets[n].stop_col,
@@ -475,7 +477,7 @@ xmv_to_width (const struct xml_value *xmv, int fallback)
  */
 static void
 convert_xml_to_value (struct ccase *c, const struct variable *var,
-		      const struct xml_value *xmv)
+		      const struct xml_value *xmv, int col, int row)
 {
   union value *v = case_data_rw (c, var);
 
@@ -501,12 +503,22 @@ convert_xml_to_value (struct ccase *c, const struct variable *var,
 	  const char *text = xmv->value ?
 	    CHAR_CAST (const char *, xmv->value) : CHAR_CAST (const char *, xmv->text);
 
-
-	  free (data_in (ss_cstr (text), "UTF-8",
+	  char *m = data_in (ss_cstr (text), "UTF-8",
 			 fmt->type,
 			 v,
 			 var_get_width (var),
-			 "UTF-8"));
+			 "UTF-8");
+
+	  if (m)
+	    {
+	      char buf [FMT_STRING_LEN_MAX + 1];
+	      char *cell = create_cell_ref (col, row);
+
+	      msg (MW, _("Cannot convert the value in the spreadsheet cell %s to format (%s): %s"), 
+		   cell, fmt_to_string (fmt, buf), m);
+	      free (cell);
+	    }
+	  free (m);
 	}
     }
 }
@@ -592,28 +604,33 @@ init_reader (struct ods_reader *r, bool report_errors)
 }
 
 
+
 struct spreadsheet *
 ods_probe (const char *filename, bool report_errors)
 {
-  struct ods_reader *r;
-  struct string errs = DS_EMPTY_INITIALIZER;
   int sheet_count;
-  struct zip_reader *zr = zip_reader_create (filename, &errs);
-  xmlTextReaderPtr xtr;
+  struct ods_reader *r = xzalloc (sizeof *r);
+  xmlTextReaderPtr xtr;  
+  struct zip_reader *zr;
+
+  ds_init_empty (&r->zip_errs);
+
+  zr = zip_reader_create (filename, &r->zip_errs);
 
   if (zr == NULL)
     {
       if (report_errors)
 	{
 	  msg (ME, _("Cannot open %s as a OpenDocument file: %s"),
-	       filename, ds_cstr (&errs));
+	       filename, ds_cstr (&r->zip_errs));
 	}
+      ds_destroy (&r->zip_errs);
+      free (r);
       return NULL;
     }
 
   sheet_count = get_sheet_count (zr);
 
-  r = xzalloc (sizeof *r);
   r->zreader = zr;
   r->ref_cnt = 1;
 
@@ -633,14 +650,12 @@ ods_probe (const char *filename, bool report_errors)
   r->n_allocated_sheets = 0;
   r->sheets = NULL;
 
-  ds_destroy (&errs);
-
   r->spreadsheet.file_name = filename;
   return &r->spreadsheet;
 
  error:
+  ds_destroy (&r->zip_errs);
   zip_reader_destroy (r->zreader);
-  ds_destroy (&errs);
   free (r);
   return NULL;
 }
@@ -720,7 +735,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
   if ( opts->read_names)
     {
-      while (1 == (ret = xmlTextReaderRead (r->rsd.xtr)))
+      while (1 == xmlTextReaderRead (r->rsd.xtr))
 	{
 	  int idx;
 
@@ -860,7 +875,9 @@ ods_make_reader (struct spreadsheet *spreadsheet,
     {
       const struct variable *var = dict_get_var (r->dict, i);
 
-      convert_xml_to_value (r->first_case, var,  &var_spec[i].firstval);
+      convert_xml_to_value (r->first_case, var,  &var_spec[i].firstval,
+			    r->rsd.col - n_var_specs + i,
+			    r->rsd.row - 1);
     }
 
   /* Read in the first row of data */
@@ -969,8 +986,9 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 	  struct xml_value *xmv = xzalloc (sizeof *xmv);
 	  xmv->text = xmlTextReaderValue (r->rsd.xtr);
 	  xmv->value = val_string;	 
-	  xmv->type = type;
 	  val_string = NULL;
+	  xmv->type = type;
+	  type = NULL;
 
 	  for (col = 0; col < r->rsd.col_span; ++col)
 	    {
@@ -984,7 +1002,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 		break;
 
               var = dict_get_var (r->dict, idx);
-	      convert_xml_to_value (c, var, xmv);
+	      convert_xml_to_value (c, var, xmv, idx + r->start_col, r->rsd.row - 1);
 	    }
 
 	  xmlFree (xmv->text);