struct casereader *clone;
casenumber n_cases;
- /* This seems to avoid a bug in Gcc 4.4.5 where, upon
- return from this function, the stack appeared corrupt,
- and the program returned to the wrong address. Oddly
- the problem only manifested itself when used in conjunction
- with the ODS reader, in code such as:
-
- GET DATA /TYPE=ODS ....
- LIST.
- */
-#if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4)
- volatile int x = 1; x++;
-#endif
-
clone = casereader_clone (reader);
n_cases = casereader_advance (clone, max_cases);
casereader_destroy (clone);
#include <libxml/xmlreader.h>
#include <zlib.h>
+#include "data/format.h"
+#include "data/data-in.h"
#include "data/case.h"
#include "data/casereader-provider.h"
#include "data/dictionary.h"
#include "gl/xalloc.h"
+
+/* Shamelessly lifted from the Gnumeric sources:
+ https://git.gnome.org/browse/gnumeric/tree/src/value.h
+ */
+enum gnm_value_type
+{
+ VALUE_EMPTY = 10,
+ VALUE_BOOLEAN = 20,
+ VALUE_INTEGER = 30, /* Note, this was removed from gnumeric in 2006 - old versions may of
+ course still be around. New ones are supposed to use float.*/
+ VALUE_FLOAT = 40,
+ VALUE_ERROR = 50,
+ VALUE_STRING = 60,
+ VALUE_CELLRANGE = 70,
+ VALUE_ARRAY = 80
+};
+
+
+
static void gnm_file_casereader_destroy (struct casereader *, void *);
static struct ccase *gnm_file_casereader_read (struct casereader *, void *);
struct dictionary *dict;
struct ccase *first_case;
bool used_first_case;
+
+ enum gnm_value_type vtype;
};
process_node (gr, &gr->msd);
}
- return create_cell_ref (
+ return create_cell_range (
gr->sheets[n].start_col,
gr->sheets[n].start_row,
gr->sheets[n].stop_col,
*/
static void
convert_xml_string_to_value (struct ccase *c, const struct variable *var,
- const xmlChar *xv)
+ const xmlChar *xv, enum gnm_value_type type, int col, int row)
{
union value *v = case_data_rw (c, var);
value_set_missing (v, var_get_width (var));
else if ( var_is_alpha (var))
value_copy_str_rpad (v, var_get_width (var), xv, ' ');
- else
+ else if (type == VALUE_FLOAT || type == VALUE_INTEGER)
{
const char *text = CHAR_CAST (const char *, xv);
char *endptr;
if ( errno != 0 || endptr == text)
v->f = SYSMIS;
}
+ else
+ {
+ const char *text = CHAR_CAST (const char *, xv);
+
+ const struct fmt_spec *fmt = var_get_write_format (var);
+
+ 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);
+ }
}
struct var_spec
char *name;
int width;
xmlChar *first_value;
+ int first_type;
};
n_cases --;
}
+ int type = 0;
/* Read in the first row of cells,
including the headers if read_names was set */
while (
)
{
int idx;
+
+ if (r->rsd.state == STATE_CELL && r->rsd.node_type == XML_READER_TYPE_TEXT)
+ {
+ xmlChar *attr =
+ xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType"));
+
+ type = _xmlchar_to_int (attr);
+
+ xmlFree (attr);
+ }
+
process_node (r, &r->rsd);
- if ( r->rsd.row > r->start_row ) break;
+ if ( r->rsd.row > r->start_row )
+ {
+ xmlChar *attr =
+ xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType"));
+
+ r->vtype = _xmlchar_to_int (attr);
+
+ xmlFree (attr);
+ break;
+ }
if ( r->rsd.col < r->start_col ||
(r->stop_col != -1 && r->rsd.col > r->stop_col))
var_spec [i].name = NULL;
var_spec [i].width = -1;
var_spec [i].first_value = NULL;
+ var_spec [i].first_type = -1;
}
n_var_specs = idx + 1 ;
}
+ var_spec [idx].first_type = type;
+
if ( r->rsd.node_type == XML_READER_TYPE_TEXT )
{
xmlChar *value = xmlTextReaderValue (r->rsd.xtr);
continue;
var = dict_get_var (r->dict, x++);
-
+
convert_xml_string_to_value (r->first_case, var,
- var_spec[i].first_value);
+ var_spec[i].first_value,
+ var_spec[i].first_type,
+ r->rsd.col + i - 1,
+ r->rsd.row - 1);
}
for ( i = 0 ; i < n_var_specs ; ++i )
if (r->start_col == -1)
r->start_col = r->rsd.min_col;
+
while ((r->rsd.state == STATE_CELL || r->rsd.state == STATE_CELLS_START )
&& r->rsd.row == current_row && (ret = xmlTextReaderRead (r->rsd.xtr)))
{
process_node (r, &r->rsd);
+ if (r->rsd.state == STATE_CELL && r->rsd.node_type == XML_READER_TYPE_ELEMENT)
+ {
+ xmlChar *attr =
+ xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType"));
+
+ r->vtype = _xmlchar_to_int (attr);
+
+ xmlFree (attr);
+ }
+
if ( r->rsd.col < r->start_col || (r->stop_col != -1 &&
r->rsd.col > r->stop_col))
continue;
if ( r->stop_row != -1 && r->rsd.row > r->stop_row)
break;
+
if ( r->rsd.node_type == XML_READER_TYPE_TEXT )
{
xmlChar *value = xmlTextReaderValue (r->rsd.xtr);
-
const int idx = r->rsd.col - r->start_col;
-
const struct variable *var = dict_get_var (r->dict, idx);
- convert_xml_string_to_value (c, var, value);
+ convert_xml_string_to_value (c, var, value, r->vtype,
+ r->rsd.col, r->rsd.row);
- free (value);
+ xmlFree (value);
}
}
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,
*/
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);
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);
}
}
}
{
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 */
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);
return ret;
}
+
char *
-create_cell_ref (int col0, int row0, int coli, int rowi)
+create_cell_ref (int col0, int row0)
{
char *cs0 ;
- char *csi ;
char *s ;
if ( col0 < 0) return NULL;
- if ( rowi < 0) return NULL;
- if ( coli < 0) return NULL;
if ( row0 < 0) return NULL;
cs0 = int_to_ps26 (col0);
- csi = int_to_ps26 (coli);
- s = c_xasprintf ("%s%d:%s%d",
- cs0, row0 + 1,
- csi, rowi + 1);
+ s = c_xasprintf ("%s%d", cs0, row0 + 1);
+
free (cs0);
- free (csi);
+
+ return s;
+}
+
+char *
+create_cell_range (int col0, int row0, int coli, int rowi)
+{
+ char *s0 = create_cell_ref (col0, row0);
+ char *si = create_cell_ref (coli, rowi);
+
+ char *s = c_xasprintf ("%s:%s", s0, si);
+
+ free (s0);
+ free (si);
return s;
}
char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n);
-char *create_cell_ref (int col0, int row0, int coli, int rowi);
+char * create_cell_ref (int col0, int row0);
+char *create_cell_range (int col0, int row0, int coli, int rowi);
void spreadsheet_destroy (struct spreadsheet *);
/* Allow right-click events to propagate upward in the widget hierarchy.
Otherwise right-click menus, that trigger on a button-press-event on
the containing PsppSheetView, will pop up if the button is rendered as
- a facade but not if the button widget exists. */
+ a facade but not if the button widget exists.
+
+ We have to translate the event's data by hand to be relative to the
+ parent window, because the normal GObject signal propagation mechanism
+ won't do it for us. (This might be a hint that we're doing this
+ wrong.) */
+ gint x, y;
+
+ gdk_window_get_position (event->window, &x, &y);
+ event->x += x;
+ event->y += y;
g_signal_stop_emission_by_name (button, "button-press-event");
return FALSE;
}
DISPLAY VARIABLES.
LIST.
])
-AT_CHECK([pspp -o pspp.csv get-data.sps])
-AT_CHECK([cat pspp.csv], [0], [dnl
+AT_CHECK([pspp -O format=csv get-data.sps], [0], [dnl
Variable,Description,,Position
name,Format: A8,,1
,Measure: Nominal,,
,Display Alignment: Right,,
,Display Width: 8,,
+warning: Cannot convert the value in the spreadsheet cell C4 to format (F8.2): Field contents are not numeric.
+
Table: Data List
name,id,height
fred ,.00,23.40