projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp-sheet-view: Fix bug that omitted bottom of cell grid lines.
[pspp]
/
src
/
data
/
spreadsheet-reader.c
diff --git
a/src/data/spreadsheet-reader.c
b/src/data/spreadsheet-reader.c
index e34fcb38faa8045e216ffc99bc0c2e179b437f8f..02e5c2d3c04b18e3cc38dcce5359ac9fbbada59d 100644
(file)
--- a/
src/data/spreadsheet-reader.c
+++ b/
src/data/spreadsheet-reader.c
@@
-18,26
+18,72
@@
#include "spreadsheet-reader.h"
#include "spreadsheet-reader.h"
+#include <libpspp/assertion.h>
+#include "gnumeric-reader.h"
+#include "ods-reader.h"
+
#include <libpspp/str.h>
#include <stdio.h>
#include <string.h>
#include <libpspp/str.h>
#include <stdio.h>
#include <string.h>
+#include <gl/xalloc.h>
+#include <gl/c-xvasprintf.h>
+#include <stdlib.h>
+
+
+void
+spreadsheet_destroy (struct spreadsheet *s)
+{
+ switch (s->type)
+ {
+ case SPREADSHEET_ODS:
+ ods_destroy (s);
+ break;
+ case SPREADSHEET_GNUMERIC:
+ gnumeric_destroy (s);
+ break;
+ default:
+ NOT_REACHED ();
+ break;
+ }
+}
-struct
spreadsheet
*
-spreadsheet_
open (const char *filename
)
+struct
casereader
*
+spreadsheet_
make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts
)
{
{
- struct spreadsheet *ss = NULL;
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_make_reader (s, opts);
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_make_reader (s, opts);
- ss = gnumeric_probe (filename);
-
- return ss;
+ return NULL;
}
}
-void
-spreadsheet_
close (struct spreadsheet *spreadsheet
)
+const char *
+spreadsheet_
get_sheet_name (struct spreadsheet *s, int n
)
{
{
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_name (s, n);
+
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_name (s, n);
+
+ return NULL;
}
}
+char *
+spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
+{
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_get_sheet_range (s, n);
+
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_get_sheet_range (s, n);
+
+ return NULL;
+}
+
+
#define RADIX 26
static void
#define RADIX 26
static void
@@
-107,7
+153,7
@@
int_to_ps26 (int i)
i -= lower;
i += base;
i -= lower;
i += base;
- ret =
malloc (exp
);
+ ret =
xmalloc (exp + 1
);
exp = 0;
do
exp = 0;
do
@@
-123,16
+169,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 = int_to_ps26 (col0);
- char *csi = int_to_ps26 (coli);
- char *s = c_xasprintf ("%s%d:%s%ld",
- cs0, row0 + 1,
- csi, rowi + 1);
+ char *cs0 ;
+ char *s ;
+
+ if ( col0 < 0) return NULL;
+ if ( row0 < 0) return NULL;
+
+ cs0 = int_to_ps26 (col0);
+ 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;
}