[glom: 15/15] Merged form import_csv_refactored

[Murray Cumming <murrayc src gnome org>]

commit 3f69a7f22f8d094ae3c99add5200fca26af6e713
Merge: 41b2c46... 46e76d6...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 25 18:10:23 2009 +0200

    Merged form import_csv_refactored

 ChangeLog                                          |   77 +++
 Makefile_glom.am                                   |   14 +-
 Makefile_tests.am                                  |   12 +-
 glom/frame_glom.cc                                 |    4 +-
 glom/import_csv.cc                                 |  324 ------------
 glom/import_csv.h                                  |  131 -----
 glom/import_csv/csv_parser.cc                      |  558 ++++++++++++++++++++
 glom/import_csv/csv_parser.h                       |  201 +++++++
 glom/{ => import_csv}/dialog_import_csv.cc         |  381 +++-----------
 glom/{ => import_csv}/dialog_import_csv.h          |   52 +-
 .../{ => import_csv}/dialog_import_csv_progress.cc |    0
 glom/{ => import_csv}/dialog_import_csv_progress.h |    0
 glom/import_csv/file_encodings.cc                  |  148 ++++++
 glom/import_csv/file_encodings.h                   |   62 +++
 glom/libglom/data_structure/glomconversions.cc     |    2 +-
 glom/mode_design/iso_codes.h                       |    3 +-
 po/POTFILES.in                                     |    5 +-
 tests/import/test_parsing.cc                       |  157 +++---
 tests/import/test_signals.cc                       |   60 +-
 tests/import/utils.cc                              |   93 ++++-
 tests/import/utils.h                               |   22 +-
 tests/test_parsing_time.cc                         |    4 +-
 22 files changed, 1388 insertions(+), 922 deletions(-)
---
diff --cc ChangeLog
index 2c01562,891f1c2..8d8b152
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,60 +1,67 @@@
 +2009-09-25  Murray Cumming  <murrayc murrayc com>
 +
 +	Fix the build with gtkmm < 2.18.
 +	
 +	* glom/utility_widgets/flowtable.cc: Correct the use of 
 +	GTKMM_MINOR_VERSION to fix the build with older gtkmm versions.
 +
+ 2009-09-25  Murray Cumming  <murrayc murrayc-desktop>
+ 
+ 	Import tests: Fixed.
+ 
+ 	* tests/import/utils.[h|cc]: run_parser_from_buffer(): Added a 
+ 	version that takes a std::string, to make the common case more robust.
+ 	* tests/import/test_parsing.cc:
+ 	* tests/import/test_signals.cc: Fix the tests by not incorrectly 
+ 	taking the length of the raw arrays, which caused the temp files to 
+ 	contain garbage.
+ 
+ 2009-09-25  Murray Cumming  <murrayc murrayc-desktop>
+ 
+ 	Import tests: Handle encoding errors.
+ 
+ 	* tests/import/utils.cc: Handle signal_encoding_error too, because this
+ 	is one way that the parser can stop.
+ 	Increase the timeout because an infinite loop is unlikely (and not 
+ 	currently happening).
+ 
+ 2009-09-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	tests/import/: Small cleanup.
+ 
+ 	* tests/import/test_parsing.cc:
+ 	* tests/import/utils.[h|cc]: Use a sigc::slot instead of the ugly 
+ 	(because not typedefed) function pointer type.
+ 
+ 2009-09-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Removed some debug output.
+ 
+ 	* glom/libglom/data_structure/glomconversions.cc: parse_time():
+ 	* tests/test_parsing_time.cc: Removed debug output.
+ 
+ 2009-09-25  Michael Hasselmann  <michaelh openismus com>
+ 
+ 	Import: Changed the signature of line_scanned handler
+ 	
+ 	* glom/import_csv/dialog_import_csv.[h|cc]: Changed the signare of
+ 	on_parser_line_scanned, to use CsvParser::type_row_strings. It does not
+ 	change anything, as the handler didn't even use the parameters.
+ 
+ 	Import: Fixed tests to fit new parser API
+ 	
+ 	* glom/import_csv/csv_parser.[h|cc]: Added a finished_parsing signal since the
+ 	max_row count logic is flawed
+ 	(https://bugzilla.gnome.org/show_bug.cgi?id=588233#c16). Also moved common
+ 	parts of on_stream_read(.) (now on_buffer_read(.)) into
+ 	copy_buffer_and_continue_reading(.), to avoid copy'n'paste bugs.
+ 	
+ 	* tests/import/utils.[h|cc]: Added mainloop functionality to trigger the idle
+ 	parse sequence of the CsvParser for the testcases.
+ 	
+ 	* tests/import/test_[parsing,signals].cc: Fixed the tests to fit new parser
+ 	API.
+ 
  1.12.0:
  
  2009-09-25  Murray Cumming  <murrayc murrayc com>