X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fods-reader.c;h=c5ada6e09101bc3977ee2ecb67af59b0621aed6f;hb=83239cbb53294662025d5ee957d7e24e5feb66a9;hp=5363d40fe4e5df6ae3eafb134a1b9f6c9b5e0483;hpb=1e3875c54e8c220e282ab46f17bebdf4c0dea689;p=pspp

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 5363d40fe4..c5ada6e091 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -113,15 +113,28 @@ struct state_data
   int col_span;
 };
 
-struct ods_reader		/*  */
+static void
+state_data_destroy (struct state_data *sd)
+{
+  xmlFree (sd->current_sheet_name);
+  sd->current_sheet_name = NULL;
+
+  xmlFreeTextReader (sd->xtr);
+  sd->xtr = NULL;
+}
+
+struct ods_reader
 {
   struct spreadsheet spreadsheet;
   struct zip_reader *zreader;
-  int ref_cnt;
+
   int target_sheet_index;
   xmlChar *target_sheet_name;
   
-  struct state_data foo;
+  /* State data for the meta data */
+  struct state_data msd;
+
+  /* State data for the reader */
   struct state_data rsd;
 
   int start_row;
@@ -139,42 +152,44 @@ struct ods_reader		/*  */
   bool read_names;
 
   struct string ods_errs;
+
+  struct string zip_errs;
 };
 
 void
-ods_destroy (struct spreadsheet *s)
+ods_unref (struct spreadsheet *s)
 {
-#if 0
   struct ods_reader *r = (struct ods_reader *) s;
 
-  if (--r->ref_cnt == 0)
+  if (--s->ref_cnt == 0)
     {
       int i;
 
+      state_data_destroy (&r->msd);
       for (i = 0; i < r->n_allocated_sheets; ++i)
 	{
 	  xmlFree (r->sheets[i].name);
 	}
-
+	
       zip_reader_destroy (r->zreader);
       free (r->sheets);
+      free (s->file_name);
       free (r);
     }
-#endif
 }
 
 
 
 static bool
-reading_target_sheet (const struct ods_reader *r, const struct state_data *foo)
+reading_target_sheet (const struct ods_reader *r, const struct state_data *msd)
 {
   if (r->target_sheet_name != NULL)
     {
-      if ( 0 == xmlStrcmp (r->target_sheet_name, foo->current_sheet_name))
+      if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name))
 	return true;
     }
   
-  if (r->target_sheet_index == foo->current_sheet + 1)
+  if (r->target_sheet_index == msd->current_sheet + 1)
     return true;
 
   return false;
@@ -188,7 +203,7 @@ const char *
 ods_get_sheet_name (struct spreadsheet *s, int n)
 {
   struct ods_reader *r = (struct ods_reader *) s;
-  struct state_data *or = &r->foo;
+  struct state_data *or = &r->msd;
 
   assert (n < s->n_sheets);
 
@@ -211,7 +226,7 @@ char *
 ods_get_sheet_range (struct spreadsheet *s, int n)
 {
   struct ods_reader *r = (struct ods_reader *) s;
-  struct state_data *or = &r->foo;
+  struct state_data *or = &r->msd;
   
   assert (n < s->n_sheets);
 
@@ -228,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,
@@ -239,30 +254,29 @@ ods_get_sheet_range (struct spreadsheet *s, int n)
 static void
 ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 {
-#if 0
   struct ods_reader *r = r_;
   if ( r == NULL)
     return ;
 
-  if (r->xtr)
-    xmlFreeTextReader (r->xtr);
-  r->xtr = NULL;
+  state_data_destroy (&r->rsd);
 
   if ( ! ds_is_empty (&r->ods_errs))
     msg (ME, "%s", ds_cstr (&r->ods_errs));
 
   ds_destroy (&r->ods_errs);
 
-  if ( ! r->used_first_case )
+  if ( r->first_case && ! r->used_first_case )
     case_unref (r->first_case);
 
+
   caseproto_unref (r->proto);
+  r->proto = NULL;
 
-  xmlFree (r->current_sheet_name);
   xmlFree (r->target_sheet_name);
+  r->target_sheet_name = NULL;
 
-  ods_destroy (&r->spreadsheet);
-#endif
+
+  ods_unref (&r->spreadsheet);
 }
 
 
@@ -463,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);
 
@@ -489,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);
 
-
-	  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");
+
+	  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);
 	}
     }
 }
@@ -562,7 +586,6 @@ init_reader (struct ods_reader *r, bool report_errors)
   if ( content == NULL)
     return NULL;
 
-  zip_member_ref (content);
   xtr = xmlReaderForIO ((xmlInputReadCallback) zip_member_read,
 			(xmlInputCloseCallback) NULL,
 			content,   NULL, NULL,
@@ -581,55 +604,58 @@ 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;
+  r->spreadsheet.ref_cnt = 1;
 
   xtr = init_reader (r, report_errors);
   if (xtr == NULL)
     {
       goto error;
     }
-  r->foo.xtr = xtr;
-  r->foo.row = 0;
-  r->foo.col = 0;
-  r->foo.current_sheet = 0;
-  r->foo.state = STATE_INIT;
+  r->msd.xtr = xtr;
+  r->msd.row = 0;
+  r->msd.col = 0;
+  r->msd.current_sheet = 0;
+  r->msd.state = STATE_INIT;
 
 
   r->spreadsheet.n_sheets = sheet_count;
   r->n_allocated_sheets = 0;
   r->sheets = NULL;
 
-  ds_destroy (&errs);
-
-  r->spreadsheet.file_name = filename;
+  r->spreadsheet.file_name = strdup (filename);
   return &r->spreadsheet;
 
  error:
+  ds_destroy (&r->zip_errs);
   zip_reader_destroy (r->zreader);
-  ds_destroy (&errs);
   free (r);
   return NULL;
 }
@@ -653,7 +679,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   assert (r);
   r->read_names = opts->read_names;
   ds_init_empty (&r->ods_errs);
-  ++r->ref_cnt;
+  ++r->spreadsheet.ref_cnt;
 
   xtr = init_reader (r, true);
   if ( xtr == NULL)
@@ -665,6 +691,8 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   r->rsd.current_sheet = 0;
   r->rsd.state = STATE_INIT;
 
+  r->used_first_case = false;
+  r->first_case = NULL;
 
   if (opts->cell_range)
     {
@@ -707,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;
 
@@ -831,9 +859,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
       var_set_both_formats (var, &fmt);
     }
 
-  /* Create the first case, and cache it */
-  r->used_first_case = false;
-
   if ( n_var_specs ==  0 )
     {
       msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."),
@@ -841,6 +866,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
       goto error;
     }
 
+  /* Create the first case, and cache it */
   r->proto = caseproto_ref (dict_get_proto (r->dict));
   r->first_case = case_create (r->proto);
   case_set_missing (r->first_case);
@@ -849,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 */
@@ -907,6 +935,9 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
   struct ccase *c = NULL;
   struct ods_reader *r = r_;
 
+  xmlChar *val_string = NULL;
+  xmlChar *type = NULL;
+
   if (!r->used_first_case)
     {
       r->used_first_case = true;
@@ -934,9 +965,6 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
   c = case_create (r->proto);
   case_set_missing (c);
   
-  xmlChar *val_string = NULL;
-  xmlChar *type = NULL;
-
   while (1 == xmlTextReaderRead (r->rsd.xtr))
     {
       process_node (r, &r->rsd);
@@ -958,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)
 	    {
@@ -973,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);
@@ -985,6 +1014,9 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 	break;
     }
 
+  xmlFree (type);
+  xmlFree (val_string);
+  
   return c;
 }
 #endif