projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
str: Change "char" to "byte" in function names.
[pspp]
/
src
/
ui
/
gui
/
executor.c
diff --git
a/src/ui/gui/executor.c
b/src/ui/gui/executor.c
index 711e9563b849f16bd973860642e52dd433a0c538..7b4d10cf9f3e06f59bf1439dd9891cc6a859e227 100644
(file)
--- a/
src/ui/gui/executor.c
+++ b/
src/ui/gui/executor.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009 Free Software Foundation
+ Copyright (C) 2007, 2009
, 2010
Free Software Foundation
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
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
@@
-23,7
+23,7
@@
#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
-#include <output/
manag
er.h>
+#include <output/
driv
er.h>
#include "psppire-output-window.h"
extern struct dataset *the_dataset;
#include "psppire-output-window.h"
extern struct dataset *the_dataset;
@@
-45,7
+45,7
@@
execute_syntax (struct getl_interface *sss)
gboolean retval = TRUE;
struct casereader *reader;
gboolean retval = TRUE;
struct casereader *reader;
-
size_t value_cnt
;
+
const struct caseproto *proto
;
casenumber case_cnt;
unsigned long int lazy_serial;
casenumber case_cnt;
unsigned long int lazy_serial;
@@
-62,9
+62,9
@@
execute_syntax (struct getl_interface *sss)
needed. If the data store casereader is never needed, then
it is reused the next time syntax is run, without wrapping
it in another layer. */
needed. If the data store casereader is never needed, then
it is reused the next time syntax is run, without wrapping
it in another layer. */
-
value_cnt = psppire_data_store_get_value_count
(the_data_store);
+
proto = psppire_data_store_get_proto
(the_data_store);
case_cnt = psppire_data_store_get_case_count (the_data_store);
case_cnt = psppire_data_store_get_case_count (the_data_store);
- reader = lazy_casereader_create (
value_cnt
, case_cnt,
+ reader = lazy_casereader_create (
proto
, case_cnt,
create_casereader_from_data_store,
the_data_store, &lazy_serial);
proc_set_active_file_data (the_dataset, reader);
create_casereader_from_data_store,
the_data_store, &lazy_serial);
proc_set_active_file_data (the_dataset, reader);
@@
-95,6
+95,8
@@
execute_syntax (struct getl_interface *sss)
lex_destroy (lexer);
lex_destroy (lexer);
+ proc_execute (the_dataset);
+
psppire_dict_replace_dictionary (the_data_store->dict,
dataset_dict (the_dataset));
psppire_dict_replace_dictionary (the_data_store->dict,
dataset_dict (the_dataset));
@@
-102,9
+104,7
@@
execute_syntax (struct getl_interface *sss)
if (!lazy_casereader_destroy (reader, lazy_serial))
psppire_data_store_set_reader (the_data_store, reader);
if (!lazy_casereader_destroy (reader, lazy_serial))
psppire_data_store_set_reader (the_data_store, reader);
- som_flush ();
-
- psppire_output_window_reload ();
+ output_flush ();
return retval;
}
return retval;
}