X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fgnumeric-reader.c;h=c379717505cb940de485dbee8c4d05059bb53e0c;hb=5c3291dc396b795696e94f47780308fd7ace6fc4;hp=5a0c75ede293a21052228a87b295a070398f3e1f;hpb=8953baa61127d6d3b91f763663ea647bf3e4e793;p=pspp-builds.git

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 5a0c75ed..c3797175 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -19,6 +19,9 @@
 #include <config.h>
 
 #include <libpspp/message.h>
+#include <libpspp/misc.h>
+
+#include "minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -168,8 +171,7 @@ struct gnumeric_reader
   int stop_row;
   int stop_col;
 
-
-  size_t value_cnt;
+  struct caseproto *proto;
   struct dictionary *dict;
   struct ccase *first_case;
   bool used_first_case;
@@ -194,6 +196,8 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
   if ( ! r->used_first_case )
     case_unref (r->first_case);
 
+  caseproto_unref (r->proto);
+
   free (r);
 }
 
@@ -314,18 +318,17 @@ static void
 convert_xml_string_to_value (struct ccase *c, const struct variable *var,
 			     const xmlChar *xv)
 {
-  char *text;
   int n_bytes = 0;
   union value *v = case_data_rw (c, var);
 
-  text = recode_string (CONV_UTF8_TO_PSPP, (const char *) xv, -1);
+  const char *text = (const char *) xv;
 
   if ( text)
     n_bytes = MIN (var_get_width (var), strlen (text));
 
   if ( var_is_alpha (var))
     {
-      memcpy (v->s, text, n_bytes);
+      memcpy (value_str_rw (v, var_get_width (var)), text, n_bytes);
     }
   else
     {
@@ -335,8 +338,6 @@ convert_xml_string_to_value (struct ccase *c, const struct variable *var,
       if ( errno != 0 || endptr == text)
 	v->f = SYSMIS;
     }
-
-  free (text);
 }
 
 struct var_spec
@@ -451,7 +452,7 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
       if ( idx  >= n_var_specs )
 	{
 	  n_var_specs =  idx + 1 ;
-	  var_spec = realloc (var_spec, sizeof (*var_spec) * n_var_specs);
+	  var_spec = xrealloc (var_spec, sizeof (*var_spec) * n_var_specs);
 	  var_spec [idx].name = NULL;
 	  var_spec [idx].width = -1;
 	  var_spec [idx].first_value = NULL;
@@ -459,16 +460,14 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 
       if ( r->node_type == XML_READER_TYPE_TEXT )
 	{
-	  char *text ;
 	  xmlChar *value = xmlTextReaderValue (r->xtr);
-
-	  text = recode_string (CONV_UTF8_TO_PSPP, (const char *) value, -1);
+	  const char *text  = (const char *) value;
 
 	  if ( r->row < r->start_row)
 	    {
 	      if ( gri->read_names )
 		{
-		  var_spec [idx].name = strdup (text);
+		  var_spec [idx].name = xstrdup (text);
 		}
 	    }
 	  else
@@ -481,7 +480,6 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 	    }
 
 	  free (value);
-	  free (text);
 	}
       else if ( r->node_type == XML_READER_TYPE_ELEMENT
 		&& r->state == STATE_CELL)
@@ -503,7 +501,7 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
   /* Create the dictionary and populate it */
   *dict = r->dict = dict_create ();
 
-  r->value_cnt = 0;
+  dict_set_encoding (r->dict, (const char *) xmlTextReaderConstEncoding (r->xtr));
 
   for (i = 0 ; i < n_var_specs ; ++i )
     {
@@ -514,8 +512,6 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
       if ( var_spec[i].width == -1 )
 	var_spec[i].width = MAX_SHORT_STRING;
 
-      r->value_cnt += value_cnt_from_width (var_spec[i].width);
-
       if  ( ! dict_make_unique_var_name (r->dict, var_spec[i].name,
 					 &vstart, name))
 	{
@@ -536,9 +532,9 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
       goto error;
     }
 
-  r->first_case = case_create (r->value_cnt);
-  memset (case_data_rw_idx (r->first_case, 0)->s,
-	  ' ', MAX_SHORT_STRING * r->value_cnt);
+  r->proto = caseproto_ref (dict_get_proto (r->dict));
+  r->first_case = case_create (r->proto);
+  case_set_missing (r->first_case);
 
   for ( i = 0 ; i < n_var_specs ; ++i )
     {
@@ -558,7 +554,7 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 
   return casereader_create_sequential
     (NULL,
-     r->value_cnt,
+     r->proto,
      n_cases,
      &gnm_file_casereader_class, r);
 
@@ -596,9 +592,8 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_)
       return r->first_case;
     }
 
-  c = case_create (r->value_cnt);
-
-  memset (case_data_rw_idx (c, 0)->s, ' ', MAX_SHORT_STRING * r->value_cnt);
+  c = case_create (r->proto);
+  case_set_missing (c);
 
   while ((r->state == STATE_CELL || r->state == STATE_CELLS_START )
 	 && r->row == current_row && (ret = xmlTextReaderRead (r->xtr)))
@@ -609,7 +604,7 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 				     r->col > r->stop_col))
 	continue;
 
-      if ( r->col - r->start_col >= r->value_cnt)
+      if ( r->col - r->start_col >= caseproto_get_n_widths (r->proto))
 	continue;
 
       if ( r->stop_row != -1 && r->row > r->stop_row)