Use the gnumeric_reopen function

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

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 6b78dec8e32a9df8fc7675dabc07af8bfb399f31..69dd23689fc6b979d54540c23ae65511b46a885f 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
@@ -105,8 +105,10 @@ struct gnumeric_reader
 {
   struct spreadsheet spreadsheet;
 
+  /* The libxml reader for this instance */
   xmlTextReaderPtr xtr;
 
+  /* An internal state variable */
   enum reader_state state;
 
   int row;
@@ -145,7 +147,7 @@ gnumeric_get_sheet_name (struct spreadsheet *s, int n)
 static void process_node (struct gnumeric_reader *r);
 
 
-const char *
+char *
 gnumeric_get_sheet_range (struct spreadsheet *s, int n)
 {
   int ret;
@@ -279,6 +281,10 @@ process_node (struct gnumeric_reader *r)
            {
              r->state = STATE_SHEET_FOUND;
            }
+         else if (r->target_sheet_index == -1)
+           {
+             r->state = STATE_SHEET_FOUND;
+           }
        }
       break;
     case STATE_SHEET_FOUND:
@@ -421,14 +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;
+  gzFile gz;
+
+  assert (r == NULL || filename == NULL);
 
-  gzFile gz = gzopen (filename, "r");
+  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;
@@ -438,14 +454,24 @@ gnumeric_probe (const char *filename)
                           NULL, NULL, 0);
 
   if (xtr == NULL)
-    return NULL;
+    {
+      gzclose (gz);
+      return NULL;
+    }
 
-  r = xzalloc (sizeof *r);
-  
-  r->xtr = xtr;
-  r->spreadsheet.sheets = -1;
-  r->state = STATE_PRE_INIT;
+  if (r == NULL)
+    {
+      r = xzalloc (sizeof *r);
+      r->spreadsheet.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
@@ -457,17 +483,17 @@ gnumeric_probe (const char *filename)
       process_node (r);
     }
 
-  if (ret != 1)
-    {
-      /* Not a gnumeric spreadsheet */
-      free (r);
-      gzclose (gz);
-      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;
 }
 
@@ -487,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,