--- parser3/src/classes/table.C 2019/11/23 23:48:41 1.349 +++ parser3/src/classes/table.C 2020/12/14 20:58:15 1.352 @@ -5,6 +5,16 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ +#include "pa_config_includes.h" + +#define NO_STRINGSTREAM + +#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC)) +#include +#include "../lib/gc/include/gc_allocator.h" +#define USE_STRINGSTREAM +#endif + #include "classes.h" #include "pa_vmethod_frame.h" @@ -17,12 +27,7 @@ #include "pa_vbool.h" #include "pa_array.h" -#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC)) -#include -#define USE_STRINGSTREAM -#endif - -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.349 2019/11/23 23:48:41 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.352 2020/12/14 20:58:15 moko Exp $"; // class @@ -410,7 +415,7 @@ static void _load(Request& r, MethodPara control_chars.load(*options); // loading text - char *data=file_load_text(r, r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options); + char *data=file_load_text(r, r.full_disk_path(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options); Skip_lines_action skip_lines_action = (control_chars.separator=='#' || control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines; @@ -454,7 +459,6 @@ static void _load(Request& r, MethodPara } #ifdef USE_STRINGSTREAM -#include "../lib/gc/include/gc_allocator.h" typedef std::basic_stringstream, gc_allocator > pa_stringstream; typedef std::basic_string, gc_allocator > pa_string; @@ -633,7 +637,7 @@ static void _save(Request& r, MethodPara --param_index; const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE); - String file_spec=r.absolute(file_name); + String file_spec=r.full_disk_path(file_name); if(do_append && file_exist(file_spec)) output_column_names=false;