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=34e8d67a554a0fabb9da57cd80bf1e1ca401331d;hpb=b9eebec7ee7819f004d7e683cbc354a456279e5e;p=pspp

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 34e8d67a55..c5ada6e091 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -67,9 +67,9 @@ ods_open_reader (const struct spreadsheet_read_options *opts,
 #include "gl/xalloc.h"
 
 static void ods_file_casereader_destroy (struct casereader *, void *);
-
 static struct ccase *ods_file_casereader_read (struct casereader *, void *);
 
+
 static const struct casereader_class ods_file_casereader_class =
   {
     ods_file_casereader_read,
@@ -100,30 +100,48 @@ enum reader_state
     STATE_CELL_CONTENT     /* Found a the text within a cell */
   };
 
-struct ods_reader
+struct state_data
 {
-  struct spreadsheet spreadsheet;
-  struct zip_reader *zreader;
   xmlTextReaderPtr xtr;
-
+  int node_type;
   enum reader_state state;
   int row;
   int col;
-  int node_type;
   int current_sheet;
   xmlChar *current_sheet_name;
 
-  const xmlChar *target_sheet_name;
+  int col_span;
+};
+
+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 target_sheet_index;
+  xmlChar *target_sheet_name;
+  
+  /* State data for the meta data */
+  struct state_data msd;
 
+  /* State data for the reader */
+  struct state_data rsd;
 
   int start_row;
   int start_col;
   int stop_row;
   int stop_col;
 
-  int col_span;
-
   struct sheet_detail *sheets;
   int n_allocated_sheets;
 
@@ -134,37 +152,63 @@ struct ods_reader
   bool read_names;
 
   struct string ods_errs;
+
+  struct string zip_errs;
 };
 
+void
+ods_unref (struct spreadsheet *s)
+{
+  struct ods_reader *r = (struct ods_reader *) s;
+
+  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);
+    }
+}
+
+
 
 static bool
-reading_target_sheet (const struct ods_reader *r)
+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, r->current_sheet_name))
+      if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name))
 	return true;
     }
   
-  if (r->target_sheet_index == r->current_sheet + 1)
+  if (r->target_sheet_index == msd->current_sheet + 1)
     return true;
 
   return false;
 }
 
 
-static void process_node (struct ods_reader *r);
+static void process_node (struct ods_reader *or, struct state_data *r);
 
 
 const char *
 ods_get_sheet_name (struct spreadsheet *s, int n)
 {
-  struct ods_reader *or = (struct ods_reader *) s;
-  
+  struct ods_reader *r = (struct ods_reader *) s;
+  struct state_data *or = &r->msd;
+
   assert (n < s->n_sheets);
 
   while ( 
-	  (or->n_allocated_sheets <= n)
+	  (r->n_allocated_sheets <= n)
 	  || or->state != STATE_SPREADSHEET
 	  )
     {
@@ -172,22 +216,23 @@ ods_get_sheet_name (struct spreadsheet *s, int n)
       if ( ret != 1)
 	break;
 
-      process_node (or);
+      process_node (r, or);
     }
 
-  return or->sheets[n].name;
+  return r->sheets[n].name;
 }
 
 char *
 ods_get_sheet_range (struct spreadsheet *s, int n)
 {
-  struct ods_reader *or = (struct ods_reader *) s;
+  struct ods_reader *r = (struct ods_reader *) s;
+  struct state_data *or = &r->msd;
   
   assert (n < s->n_sheets);
 
   while ( 
-	  (or->n_allocated_sheets <= n)
-	  || (or->sheets[n].stop_row == -1) 
+	  (r->n_allocated_sheets <= n)
+	  || (r->sheets[n].stop_row == -1) 
 	  || or->state != STATE_SPREADSHEET
 	  )
     {
@@ -195,14 +240,14 @@ ods_get_sheet_range (struct spreadsheet *s, int n)
       if ( ret != 1)
 	break;
 
-      process_node (or);
+      process_node (r, or);
     }
 
-  return create_cell_ref (
-			  or->sheets[n].start_col,
-			  or->sheets[n].start_row,
-			  or->sheets[n].stop_col,
-			  or->sheets[n].stop_row);
+  return create_cell_range (
+			  r->sheets[n].start_col,
+			  r->sheets[n].start_row,
+			  r->sheets[n].stop_col,
+			  r->sheets[n].stop_row);
 }
 
 
@@ -213,25 +258,33 @@ ods_file_casereader_destroy (struct casereader *reader UNUSED, void *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->target_sheet_name);
+  r->target_sheet_name = NULL;
 
-  //  free (r);
+
+  ods_unref (&r->spreadsheet);
 }
 
+
+
+
+
 static void
-process_node (struct ods_reader *r)
+process_node (struct ods_reader *or, struct state_data *r)
 {
   xmlChar *name = xmlTextReaderName (r->xtr);
   if (name == NULL)
@@ -261,15 +314,15 @@ process_node (struct ods_reader *r)
 
 	  ++r->current_sheet;
 
-	  if (r->current_sheet >= r->n_allocated_sheets)
+	  if (r->current_sheet >= or->n_allocated_sheets)
 	    {
-	      assert (r->current_sheet == r->n_allocated_sheets);
-	      r->sheets = xrealloc (r->sheets, sizeof (*r->sheets) * ++r->n_allocated_sheets);
-	      r->sheets[r->n_allocated_sheets - 1].start_col = -1;
-	      r->sheets[r->n_allocated_sheets - 1].stop_col = -1;
-	      r->sheets[r->n_allocated_sheets - 1].start_row = -1;
-	      r->sheets[r->n_allocated_sheets - 1].stop_row = -1;
-	      r->sheets[r->n_allocated_sheets - 1].name = CHAR_CAST (char *, xmlStrdup (r->current_sheet_name));
+	      assert (r->current_sheet == or->n_allocated_sheets);
+	      or->sheets = xrealloc (or->sheets, sizeof (*or->sheets) * ++or->n_allocated_sheets);
+	      or->sheets[or->n_allocated_sheets - 1].start_col = -1;
+	      or->sheets[or->n_allocated_sheets - 1].stop_col = -1;
+	      or->sheets[or->n_allocated_sheets - 1].start_row = -1;
+	      or->sheets[or->n_allocated_sheets - 1].stop_row = -1;
+	      or->sheets[or->n_allocated_sheets - 1].name = CHAR_CAST (char *, xmlStrdup (r->current_sheet_name));
 	    }
 
 	  r->col = 0;
@@ -298,6 +351,8 @@ process_node (struct ods_reader *r)
 	  
 	  if (! xmlTextReaderIsEmptyElement (r->xtr))
 	    r->state = STATE_ROW;
+
+	  xmlFree (value);
 	}
       else if (0 == xmlStrcasecmp (name, _xml("table:table")) && 
 	       (XML_READER_TYPE_END_ELEMENT  == r->node_type))
@@ -348,22 +403,22 @@ process_node (struct ods_reader *r)
       break;
     case STATE_CELL_CONTENT:
       assert (r->current_sheet >= 0);
-      assert (r->current_sheet < r->n_allocated_sheets);
+      assert (r->current_sheet < or->n_allocated_sheets);
 
-      if (r->sheets[r->current_sheet].start_row == -1)
-	r->sheets[r->current_sheet].start_row = r->row - 1;
+      if (or->sheets[r->current_sheet].start_row == -1)
+	or->sheets[r->current_sheet].start_row = r->row - 1;
 
       if ( 
-	  (r->sheets[r->current_sheet].start_col == -1)
+	  (or->sheets[r->current_sheet].start_col == -1)
 	  ||
-	  (r->sheets[r->current_sheet].start_col >= r->col - 1)
+	  (or->sheets[r->current_sheet].start_col >= r->col - 1)
 	   )
-	r->sheets[r->current_sheet].start_col = r->col - 1;
+	or->sheets[r->current_sheet].start_col = r->col - 1;
 
-      r->sheets[r->current_sheet].stop_row = r->row - 1;
+      or->sheets[r->current_sheet].stop_row = r->row - 1;
 
-      if ( r->sheets[r->current_sheet].stop_col <  r->col - 1)
-	r->sheets[r->current_sheet].stop_col = r->col - 1;
+      if ( or->sheets[r->current_sheet].stop_col <  r->col - 1)
+	or->sheets[r->current_sheet].stop_col = r->col - 1;
 
       if (XML_READER_TYPE_END_ELEMENT  == r->node_type)
 	r->state = STATE_CELL;
@@ -422,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);
 
@@ -448,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);
 	}
     }
 }
@@ -471,7 +536,7 @@ get_sheet_count (struct zip_reader *zreader)
     return -1;
 
   mxtr = xmlReaderForIO ((xmlInputReadCallback) zip_member_read,
-			 (xmlInputCloseCallback) zip_member_finish,
+			 (xmlInputCloseCallback) NULL,
 			 meta,   NULL, NULL, 0);
 
   while (1 == xmlTextReaderRead (mxtr))
@@ -512,80 +577,85 @@ ods_error_handler (void *ctx, const char *mesg,
 }
 
 
-static bool
+static xmlTextReaderPtr
 init_reader (struct ods_reader *r, bool report_errors)
 {
   struct zip_member *content = zip_member_open (r->zreader, "content.xml");
   xmlTextReaderPtr xtr;
 
   if ( content == NULL)
-    return false;
-
-  zip_member_ref (content);
-
+    return NULL;
 
   xtr = xmlReaderForIO ((xmlInputReadCallback) zip_member_read,
-			(xmlInputCloseCallback) zip_member_finish,
+			(xmlInputCloseCallback) NULL,
 			content,   NULL, NULL,
 			report_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING) );
 
   if ( xtr == NULL)
     return false;
 
-  r->xtr = xtr;
+
   r->spreadsheet.type = SPREADSHEET_ODS;
-  r->row = 0;
-  r->col = 0;
-  r->current_sheet = 0;
-  r->state = STATE_INIT;
 
   if (report_errors) 
     xmlTextReaderSetErrorHandler (xtr, ods_error_handler, r);
 
-  return true;
+  return xtr;
 }
 
 
+
 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);
+  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->spreadsheet.ref_cnt = 1;
 
-  if (! init_reader (r, report_errors))
+  xtr = init_reader (r, report_errors);
+  if (xtr == NULL)
     {
       goto error;
     }
+  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;
 }
@@ -601,6 +671,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   int i;
   struct var_spec *var_spec = NULL;
   int n_var_specs = 0;
+  xmlTextReaderPtr xtr;
 
   struct ods_reader *r = (struct ods_reader *) spreadsheet;
   xmlChar *val_string = NULL;
@@ -608,12 +679,22 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   assert (r);
   r->read_names = opts->read_names;
   ds_init_empty (&r->ods_errs);
+  ++r->spreadsheet.ref_cnt;
 
-
-  if ( !init_reader (r, true))
+  xtr = init_reader (r, true);
+  if ( xtr == NULL)
     goto error;
 
-  if ( opts->cell_range )
+  r->rsd.xtr = xtr;
+  r->rsd.row = 0;
+  r->rsd.col = 0;
+  r->rsd.current_sheet = 0;
+  r->rsd.state = STATE_INIT;
+
+  r->used_first_case = false;
+  r->first_case = NULL;
+
+  if (opts->cell_range)
     {
       if ( ! convert_cell_ref (opts->cell_range,
 			       &r->start_col, &r->start_row,
@@ -632,29 +713,17 @@ ods_make_reader (struct spreadsheet *spreadsheet,
       r->stop_row = -1;
     }
 
-  r->state = STATE_INIT;
-  r->target_sheet_name = BAD_CAST opts->sheet_name;
+  r->target_sheet_name = xmlStrdup (BAD_CAST opts->sheet_name);
   r->target_sheet_index = opts->sheet_index;
-  r->row = r->col = 0;
-
-
-#if 0
-  printf ("%s:%d %d,%d %d,%d\n", __FILE__, __LINE__, 
-	  r->start_col,
-	  r->start_row,
-	  r->stop_col,
-	  r->stop_row);
-#endif
-
 
   /* Advance to the start of the cells for the target sheet */
-  while ( ! reading_target_sheet (r)  
-	  || r->state != STATE_ROW || r->row <= r->start_row )
+  while ( ! reading_target_sheet (r, &r->rsd)  
+	  || r->rsd.state != STATE_ROW || r->rsd.row <= r->start_row )
     {
-      if (1 != (ret = xmlTextReaderRead (r->xtr)))
+      if (1 != (ret = xmlTextReaderRead (r->rsd.xtr)))
 	   break;
 
-      process_node (r);
+      process_node (r, &r->rsd);
     }
 
   if (ret < 1)
@@ -666,17 +735,17 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
   if ( opts->read_names)
     {
-      while (1 == (ret = xmlTextReaderRead (r->xtr)))
+      while (1 == xmlTextReaderRead (r->rsd.xtr))
 	{
 	  int idx;
 
-	  process_node (r);
+	  process_node (r, &r->rsd);
 
 	  /* If the row is finished then stop for now */
-	  if (r->state == STATE_TABLE && r->row > r->start_row)
+	  if (r->rsd.state == STATE_TABLE && r->rsd.row > r->start_row)
 	    break;
 
-	  idx = r->col - r->start_col -1 ;
+	  idx = r->rsd.col - r->start_col -1 ;
 
 	  if ( idx < 0)
 	    continue;
@@ -684,11 +753,11 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 	  if (r->stop_col != -1 && idx > r->stop_col - r->start_col)
 	    continue;
 
-	  if (r->state == STATE_CELL_CONTENT 
+	  if (r->rsd.state == STATE_CELL_CONTENT 
 	      &&
-	      XML_READER_TYPE_TEXT  == r->node_type)
+	      XML_READER_TYPE_TEXT  == r->rsd.node_type)
 	    {
-	      xmlChar *value = xmlTextReaderValue (r->xtr);
+	      xmlChar *value = xmlTextReaderValue (r->rsd.xtr);
 
 	      if ( idx >= n_var_specs)
 		{
@@ -712,44 +781,36 @@ ods_make_reader (struct spreadsheet *spreadsheet,
     }
 
   /* Read in the first row of data */
-  while (1 == xmlTextReaderRead (r->xtr))
+  while (1 == xmlTextReaderRead (r->rsd.xtr))
     {
       int idx;
-      process_node (r);
+      process_node (r, &r->rsd);
 
-      if ( ! reading_target_sheet (r) )
+      if ( ! reading_target_sheet (r, &r->rsd) )
 	break;
 
       /* If the row is finished then stop for now */
-      if (r->state == STATE_TABLE &&
-	  r->row > r->start_row + (opts->read_names ? 1 : 0))
+      if (r->rsd.state == STATE_TABLE &&
+	  r->rsd.row > r->start_row + (opts->read_names ? 1 : 0))
 	break;
 
-      idx = r->col - r->start_col - 1;
+      idx = r->rsd.col - r->start_col - 1;
       if (idx < 0)
 	continue;
 
       if (r->stop_col != -1 && idx > r->stop_col - r->start_col)
 	continue;
 
-      if ( r->state == STATE_CELL &&
-	   XML_READER_TYPE_ELEMENT  == r->node_type)
+      if ( r->rsd.state == STATE_CELL &&
+	   XML_READER_TYPE_ELEMENT  == r->rsd.node_type)
 	{
-	  type = xmlTextReaderGetAttribute (r->xtr, _xml ("office:value-type"));
-	  val_string = xmlTextReaderGetAttribute (r->xtr, _xml ("office:value"));
+	  type = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value-type"));
+	  val_string = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value"));
 	}
 
-      if ( r->state == STATE_CELL_CONTENT &&
-	   XML_READER_TYPE_TEXT  == r->node_type)
+      if ( r->rsd.state == STATE_CELL_CONTENT &&
+	   XML_READER_TYPE_TEXT  == r->rsd.node_type)
 	{
-#if 0
-	  printf ("%s:%d Idx %d n_var_specs %d\n", __FILE__, __LINE__,
-		  idx, n_var_specs);
-
-	  printf ("%s:%d Idx %d r_col %d\n", __FILE__, __LINE__,
-		  idx, r->col);
-#endif
-
 	  if (idx >= n_var_specs)
 	    {
 	      var_spec = xrealloc (var_spec, sizeof (*var_spec) * (idx + 1));
@@ -762,7 +823,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 	    }
 
 	  var_spec [idx].firstval.type = type;
-	  var_spec [idx].firstval.text = xmlTextReaderValue (r->xtr);
+	  var_spec [idx].firstval.text = xmlTextReaderValue (r->rsd.xtr);
 	  var_spec [idx].firstval.value = val_string;
 
 	  val_string = NULL;
@@ -773,7 +834,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
   /* Create the dictionary and populate it */
   r->spreadsheet.dict = r->dict = dict_create (
-    CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->xtr)));
+    CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->rsd.xtr)));
 
   for (i = 0; i < n_var_specs ; ++i )
     {
@@ -798,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."),
@@ -808,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);
@@ -816,19 +875,20 @@ 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 */
-  while (1 == xmlTextReaderRead (r->xtr))
+  while (1 == xmlTextReaderRead (r->rsd.xtr))
     {
-      process_node (r);
+      process_node (r, &r->rsd);
 
-      if (r->state == STATE_ROW)
+      if (r->rsd.state == STATE_ROW)
 	break;
     }
 
-  // zip_reader_destroy (zreader);
 
   for ( i = 0 ; i < n_var_specs ; ++i )
     {
@@ -849,8 +909,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
  error:
   
-  //zip_reader_destroy (zreader);
-
   for ( i = 0 ; i < n_var_specs ; ++i )
     {
       free (var_spec[i].firstval.type);
@@ -865,7 +923,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   r->spreadsheet.dict = NULL;
   ods_file_casereader_destroy (NULL, r);
 
-
   return NULL;
 }
 
@@ -876,9 +933,10 @@ static struct ccase *
 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;
-  struct ods_reader *r = r_;
 
   if (!r->used_first_case)
     {
@@ -888,17 +946,17 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 
 
   /* Advance to the start of a row. (If there is one) */
-  while (r->state != STATE_ROW 
-	 && 1 == xmlTextReaderRead (r->xtr)
+  while (r->rsd.state != STATE_ROW 
+	 && 1 == xmlTextReaderRead (r->rsd.xtr)
 	 )
     {
-      process_node (r);
+      process_node (r, &r->rsd);
     }
 
 
-  if ( ! reading_target_sheet (r)  
-       ||  r->state < STATE_TABLE
-       ||  (r->stop_row != -1 && r->row > r->stop_row + 1)
+  if ( ! reading_target_sheet (r, &r->rsd)  
+       ||  r->rsd.state < STATE_TABLE
+       ||  (r->stop_row != -1 && r->rsd.row > r->stop_row + 1)
        )
     {
       return NULL;
@@ -907,41 +965,44 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
   c = case_create (r->proto);
   case_set_missing (c);
   
-  while (1 == xmlTextReaderRead (r->xtr))
+  while (1 == xmlTextReaderRead (r->rsd.xtr))
     {
-      process_node (r);
+      process_node (r, &r->rsd);
 
-      if ( r->stop_row != -1 && r->row > r->stop_row + 1)
+      if ( r->stop_row != -1 && r->rsd.row > r->stop_row + 1)
 	break;
 
-      if (r->state == STATE_CELL &&
-	   r->node_type == XML_READER_TYPE_ELEMENT)
+      if (r->rsd.state == STATE_CELL &&
+	   r->rsd.node_type == XML_READER_TYPE_ELEMENT)
 	{
-	  type = xmlTextReaderGetAttribute (r->xtr, _xml ("office:value-type"));
-	  val_string = xmlTextReaderGetAttribute (r->xtr, _xml ("office:value"));
+	  type = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value-type"));
+	  val_string = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value"));
 	}
 
-      if (r->state == STATE_CELL_CONTENT && 
-	   r->node_type == XML_READER_TYPE_TEXT)
+      if (r->rsd.state == STATE_CELL_CONTENT && 
+	   r->rsd.node_type == XML_READER_TYPE_TEXT)
 	{
 	  int col;
 	  struct xml_value *xmv = xzalloc (sizeof *xmv);
-	  xmv->text = xmlTextReaderValue (r->xtr);
+	  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->col_span; ++col)
+	  for (col = 0; col < r->rsd.col_span; ++col)
 	    {
 	      const struct variable *var;
-	      const int idx = r->col - col - r->start_col - 1;
+	      const int idx = r->rsd.col - col - r->start_col - 1;
 	      if (idx < 0)
 		continue;
 	      if (r->stop_col != -1 && idx > r->stop_col - r->start_col )
 		break;
+	      if (idx >= dict_get_var_cnt (r->dict))
+		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);
@@ -949,10 +1010,13 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 	  xmlFree (xmv->type);
 	  free (xmv);
 	}
-      if ( r->state <= STATE_TABLE)
+      if ( r->rsd.state <= STATE_TABLE)
 	break;
     }
 
+  xmlFree (type);
+  xmlFree (val_string);
+  
   return c;
 }
 #endif