Rename sheets to n_sheets

[pspp] / src / data / gnumeric-reader.c

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index c87a749a1b4d983585a2e2667dacb48a928814a9..fa00804293a04bc2078e4ae36d5cd3e880a6553e 100644 (file)
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2012, 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
@@ -98,8 +98,6 @@ struct sheet_detail
 
   int maxcol;
   int maxrow;
-
-  z_off_t offset;
 };
 
 
@@ -107,9 +105,10 @@ struct gnumeric_reader
 {
   struct spreadsheet spreadsheet;
 
+  /* The libxml reader for this instance */
   xmlTextReaderPtr xtr;
-  gzFile gz;
 
+  /* An internal state variable */
   enum reader_state state;
 
   int row;
@@ -139,7 +138,7 @@ const char *
 gnumeric_get_sheet_name (struct spreadsheet *s, int n)
 {
   struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
-  assert (n < s->sheets);
+  assert (n < s->n_sheets);
 
   return gr->sheets[n].name;
 }
@@ -154,7 +153,7 @@ gnumeric_get_sheet_range (struct spreadsheet *s, int n)
   int ret;
   struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
   
-  assert (n < s->sheets);
+  assert (n < s->n_sheets);
 
   while ( 
         (gr->sheets[n].stop_col == -1)
@@ -190,7 +189,7 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 
   caseproto_unref (r->proto);
 
-  for (i = 0; i < r->spreadsheet.sheets; ++i)
+  for (i = 0; i < r->spreadsheet.n_sheets; ++i)
     {
       xmlFree (r->sheets[i].name);
     }
@@ -218,7 +217,7 @@ process_node (struct gnumeric_reader *r)
          XML_READER_TYPE_ELEMENT  == r->node_type)
        {
          r->state = STATE_SHEET_COUNT;
-         r->spreadsheet.sheets = 0;
+         r->spreadsheet.n_sheets = 0;
        }
       break;
 
@@ -227,11 +226,10 @@ process_node (struct gnumeric_reader *r)
          XML_READER_TYPE_ELEMENT  == r->node_type)
        {
          struct sheet_detail *sd ;
-         r->spreadsheet.sheets++;
-         r->sheets = xrealloc (r->sheets, r->spreadsheet.sheets * sizeof *r->sheets);
-         sd = &r->sheets[r->spreadsheet.sheets - 1];
+         r->spreadsheet.n_sheets++;
+         r->sheets = xrealloc (r->sheets, r->spreadsheet.n_sheets * sizeof *r->sheets);
+         sd = &r->sheets[r->spreadsheet.n_sheets - 1];
          sd->start_col = sd->stop_col = sd->start_row = sd->stop_row = -1;
-         sd->offset = -1;
        }
       else if (0 == xmlStrcasecmp (name, _xml("gnm:SheetNameIndex")) &&
          XML_READER_TYPE_END_ELEMENT  == r->node_type)
@@ -240,7 +238,7 @@ process_node (struct gnumeric_reader *r)
        }
       else if (XML_READER_TYPE_TEXT == r->node_type)
        {
-         r->sheets [r->spreadsheet.sheets - 1].name = xmlTextReaderValue (r->xtr);
+         r->sheets [r->spreadsheet.n_sheets - 1].name = xmlTextReaderValue (r->xtr);
        }
       break;
 
@@ -250,7 +248,6 @@ process_node (struct gnumeric_reader *r)
        {
          ++r->sheet_index;
          r->state = STATE_SHEET_START;
-         r->sheets[r->sheet_index].offset = gztell (r->gz);
        }
       break;
     case STATE_SHEET_START:
@@ -430,15 +427,24 @@ gnumeric_destroy (struct spreadsheet *s)
   gnm_file_casereader_destroy (NULL, s);
 }
 
-struct spreadsheet *
-gnumeric_probe (const char *filename)
-{
+
+static struct gnumeric_reader *
+gnumeric_reopen (struct gnumeric_reader *r, const char *filename)
+{  
   int ret;
-  struct gnumeric_reader *r = NULL;
-  xmlTextReaderPtr xtr;
 
+  xmlTextReaderPtr xtr;
   gzFile gz;
-  gz = gzopen (filename, "r");
+
+  assert (r == NULL || filename == NULL);
+
+  if (r && r->xtr)
+    xmlFreeTextReader (r->xtr);
+
+  if (filename)
+    gz = gzopen (filename, "r");
+  else
+    gz = gzopen ( r->spreadsheet.file_name, "r");
 
   if (NULL == gz)
     return NULL;
@@ -453,16 +459,19 @@ gnumeric_probe (const char *filename)
       return NULL;
     }
 
-  r = xzalloc (sizeof *r);
-  
-  r->gz = gz;
-  r->xtr = xtr;
-  r->spreadsheet.sheets = -1;
-  r->state = STATE_PRE_INIT;
+  if (r == NULL)
+    {
+      r = xzalloc (sizeof *r);
+      r->spreadsheet.n_sheets = -1;
+      r->spreadsheet.file_name = filename;
+    }
 
   r->target_sheet = NULL;
   r->target_sheet_index = -1;
 
+  r->row = r->col = -1;
+  r->state = STATE_PRE_INIT;
+  r->xtr = xtr;
 
   /* Advance to the start of the workbook.
      This gives us some confidence that we are actually dealing with a gnumeric
@@ -474,17 +483,17 @@ gnumeric_probe (const char *filename)
       process_node (r);
     }
 
-  if (ret != 1)
-    {
-      /* Not a gnumeric spreadsheet */
-      xmlFreeTextReader (r->xtr);
-      free (r);
-      return NULL;
-    }
-    
   r->spreadsheet.type = SPREADSHEET_GNUMERIC;
-  r->spreadsheet.file_name = filename;
-  
+
+  return r;
+}
+
+
+struct spreadsheet *
+gnumeric_probe (const char *filename)
+{
+  struct gnumeric_reader *r = gnumeric_reopen (NULL, filename);
+
   return &r->spreadsheet;
 }
 
@@ -504,6 +513,9 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet,
 
   r = (struct gnumeric_reader *) (spreadsheet);
 
+  if (r->row != -1)
+    r = gnumeric_reopen (r, NULL);
+
   if ( opts->cell_range )
     {
       if ( ! convert_cell_ref (opts->cell_range,