X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.c;h=efaafa30c597cd3a6c3528c96e9df995d8313914;hb=5c7ef80c2934c94d9739940d4f62f0f9815b852e;hp=11e8cf593ac44476664aab6ac2d8fef688121cf0;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index 11e8cf593a..efaafa30c5 100644
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,45 @@
 
 #include "spreadsheet-reader.h"
 
+#include "gnumeric-reader.h"
+#include "ods-reader.h"
+
 #include <libpspp/str.h>
 #include <stdio.h>
 #include <string.h>
+#include <gl/xalloc.h>
+#include <gl/c-xvasprintf.h>
+#include <stdlib.h>
+
+struct spreadsheet * 
+spreadsheet_open (const char *filename)
+{
+  struct spreadsheet *ss = NULL;
+
+  ss = ods_probe (filename, true);
+  
+  return ss;
+}
+
+void 
+spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
+{
+}
+
+#define RADIX 26
+
+static void
+reverse (char *s, int len)
+{
+  int i;
+  for (i = 0; i < len / 2; ++i)
+    {
+      char tmp = s[len - i - 1];
+      s[len - i -1] = s[i];
+      s[i] = tmp;
+    }
+}
+
 
 /* Convert a string, which is an integer encoded in base26
    IE, A=0, B=1, ... Z=25 to the integer it represents.
@@ -30,31 +66,91 @@
    ABC = 2 + 2*26 + 1*26^2 ....
 */
 int
-pseudo_base26 (const char *str)
+ps26_to_int (const char *str)
 {
   int i;
   int multiplier = 1;
   int result = 0;
   int len = strlen (str);
 
-  for ( i = len - 1 ; i >= 0; --i)
+  for (i = len - 1 ; i >= 0; --i)
     {
       int mantissa = (str[i] - 'A');
 
-      if ( mantissa < 0 || mantissa > 25 )
-	return -1;
+      assert (mantissa >= 0);
+      assert (mantissa < RADIX);
 
-      if ( i != len - 1)
+      if (i != len - 1)
 	mantissa++;
 
       result += mantissa * multiplier;
-
-      multiplier *= 26;
+      multiplier *= RADIX;
     }
 
   return result;
 }
 
+char *
+int_to_ps26 (int i)
+{
+  char *ret = NULL;
+
+  int lower = 0;
+  long long int base = RADIX;
+  int exp = 1;
+
+  assert (i >= 0);
+
+  while (i > lower + base - 1)
+    {
+      lower += base;
+      base *= RADIX;      
+      assert (base > 0);
+      exp++;
+    }
+
+  i -= lower;
+  i += base;
+
+  ret = xmalloc (exp);
+
+  exp = 0;
+  do
+    {
+      ret[exp++] = (i % RADIX) + 'A';
+      i /= RADIX;
+    }
+  while (i > 1);
+
+  ret[exp]='\0';
+
+  reverse (ret, exp);
+  return ret;
+}
+
+char *
+create_cell_ref (int col0, int row0, int coli, int rowi)
+{
+  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);
+  free (cs0);
+  free (csi);
+
+  return s;
+}
+
 
 /* Convert a cell reference in the form "A1:B2", to
    integers.  A1 means column zero, row zero.
@@ -78,9 +174,9 @@ convert_cell_ref (const char *ref,
     return false;
 
   str_uppercase (startcol);
-  *col0 = pseudo_base26 (startcol);
+  *col0 = ps26_to_int (startcol);
   str_uppercase (stopcol);
-  *coli = pseudo_base26 (stopcol);
+  *coli = ps26_to_int (stopcol);
   *row0 = startrow - 1;
   *rowi = stoprow - 1 ;