Rewrite Import Dialog.

[pspp] / src / data / any-writer.c

diff --git a/src/data/any-writer.c b/src/data/any-writer.c
index b398c70f8ece923455b9fa0b5d62f41e90814a10..170702bab36c333f4d9e4bb54aca596e70f70e25 100644 (file)
--- a/src/data/any-writer.c
+++ b/src/data/any-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 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
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "data/dataset-writer.h"
 #include "data/file-handle-def.h"
 #include "data/file-name.h"
 #include "data/por-file-writer.h"
-#include "data/scratch-writer.h"
 #include "data/sys-file-writer.h"
 #include "libpspp/assertion.h"
 #include "libpspp/message.h"
@@ -49,7 +49,7 @@ any_writer_open (struct file_handle *handle, struct dictionary *dict)
         struct casewriter *writer;
         char *extension;
 
-        extension = fn_extension (fh_get_file_name (handle));
+        extension = fn_extension (handle);
         str_lowercase (extension);
 
         if (!strcmp (extension, ".por"))
@@ -67,8 +67,8 @@ any_writer_open (struct file_handle *handle, struct dictionary *dict)
       msg (ME, _("The inline file is not allowed here."));
       return NULL;
 
-    case FH_REF_SCRATCH:
-      return scratch_writer_open (handle, dict);
+    case FH_REF_DATASET:
+      return dataset_writer_open (handle, dict);
     }
 
   NOT_REACHED ();