projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Avoid using \b in sed regular expressions.
[pspp]
/
src
/
data
/
spreadsheet-reader.c
diff --git
a/src/data/spreadsheet-reader.c
b/src/data/spreadsheet-reader.c
index 29e84e63402dbba49222ba5594ad27d9cd640262..294b93cec5d3f5190d5bddde902ea6e0c0d273d5 100644
(file)
--- a/
src/data/spreadsheet-reader.c
+++ b/
src/data/spreadsheet-reader.c
@@
-18,7
+18,9
@@
#include "spreadsheet-reader.h"
#include "spreadsheet-reader.h"
+#include <libpspp/assertion.h>
#include "gnumeric-reader.h"
#include "gnumeric-reader.h"
+#include "ods-reader.h"
#include <libpspp/str.h>
#include <stdio.h>
#include <libpspp/str.h>
#include <stdio.h>
@@
-27,21
+29,77
@@
#include <gl/c-xvasprintf.h>
#include <stdlib.h>
#include <gl/c-xvasprintf.h>
#include <stdlib.h>
-struct spreadsheet *
-spreadsheet_open (const char *filename)
+
+void
+spreadsheet_destroy (struct spreadsheet *s)
+{
+ switch (s->type)
+ {
+#ifdef ODF_READ_SUPPORT
+ case SPREADSHEET_ODS:
+ ods_destroy (s);
+ break;
+#endif
+#ifdef GNM_READ_SUPPORT
+ case SPREADSHEET_GNUMERIC:
+ gnumeric_destroy (s);
+ break;
+#endif
+ default:
+ NOT_REACHED ();
+ break;
+ }
+}
+
+
+struct casereader *
+spreadsheet_make_reader (struct spreadsheet *s UNUSED,
+ const struct spreadsheet_read_options *opts UNUSED)
{
{
- struct spreadsheet *ss = NULL;
+#ifdef ODS_READ_SUPPORT
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_make_reader (s, opts);
+#endif
+#ifdef GNM_READ_SUPPORT
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_make_reader (s, opts);
+#endif
+
+ return NULL;
+}
- ss = gnumeric_probe (filename, true);
-
- return ss;
+const char *
+spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
+{
+#ifdef ODF_READ_SUPPORT
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_name (s, n);
+#endif
+#ifdef GNM_READ_SUPPORT
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_name (s, n);
+#endif
+
+ return NULL;
}
}
-void
-spreadsheet_
close (UNUSED struct spreadsheet *spreadsheet
)
+char *
+spreadsheet_
get_sheet_range (struct spreadsheet *s, int n
)
{
{
+#ifdef ODF_READ_SUPPORT
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_range (s, n);
+#endif
+
+#ifdef GNM_READ_SUPPORT
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_range (s, n);
+#endif
+
+ return NULL;
}
}
+
#define RADIX 26
static void
#define RADIX 26
static void
@@
-111,7
+169,7
@@
int_to_ps26 (int i)
i -= lower;
i += base;
i -= lower;
i += base;
- ret = xmalloc (exp);
+ ret = xmalloc (exp
+ 1
);
exp = 0;
do
exp = 0;
do
@@
-127,25
+185,34
@@
int_to_ps26 (int i)
return ret;
}
return ret;
}
+
char *
char *
-create_cell_ref (int col0, int row0
, int coli, int rowi
)
+create_cell_ref (int col0, int row0)
{
char *cs0 ;
{
char *cs0 ;
- char *csi ;
char *s ;
if ( col0 < 0) return NULL;
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);
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 (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;
}
return s;
}