X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.c;h=08a37157e4a62c880d3c8cf93bf868685cd1d486;hb=a49b940e58f148bf111c647d9b4822025636ff80;hp=da2d6ea2aeb1f4f9f86230d004d77a17a5580ec8;hpb=4d9ca60552f27a6c4e1d959b7d9f5b8ec562a7d6;p=pspp

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index da2d6ea2ae..08a37157e4 100644
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -18,6 +18,7 @@
 
 #include "spreadsheet-reader.h"
 
+#include <libpspp/assertion.h>
 #include "gnumeric-reader.h"
 #include "ods-reader.h"
 
@@ -28,38 +29,67 @@
 #include <gl/c-xvasprintf.h>
 #include <stdlib.h>
 
-struct spreadsheet * 
-spreadsheet_open (const char *filename)
+void
+spreadsheet_ref (struct spreadsheet *s)
 {
-  struct spreadsheet *ss = NULL;
-
-  ss = ods_probe (filename, true);
-  
-  return ss;
+  s->ref_cnt++;
 }
 
-void 
-spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
+void
+spreadsheet_unref (struct spreadsheet *s)
 {
+  switch (s->type)
+    {
+    case SPREADSHEET_ODS:
+      ods_unref (s);
+      break;
+
+    case SPREADSHEET_GNUMERIC:
+      gnumeric_unref (s);
+      break;
+    default:
+      NOT_REACHED ();
+      break;
+    }
 }
 
 
-struct casereader * 
-spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+struct casereader *
+spreadsheet_make_reader (struct spreadsheet *s,
+                         const struct spreadsheet_read_options *opts)
 {
-  return ods_make_reader (s, opts);
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_make_reader (s, opts);
+
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_make_reader (s, opts);
+
+  return NULL;
 }
 
-const char * 
+const char *
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
-  return ods_get_sheet_name (s, 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 * 
+
+char *
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
-  return ods_get_sheet_range (s, 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;
 }
 
 
@@ -124,7 +154,7 @@ int_to_ps26 (int i)
   while (i > lower + base - 1)
     {
       lower += base;
-      base *= RADIX;      
+      base *= RADIX;
       assert (base > 0);
       exp++;
     }
@@ -148,25 +178,34 @@ int_to_ps26 (int i)
   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;
 }