--- parser3/src/classes/file.C 2002/08/06 09:49:04 1.94 +++ parser3/src/classes/file.C 2002/08/20 14:20:36 1.96 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_FILE_C="$Date: 2002/08/06 09:49:04 $"; +static const char* IDENT_FILE_C="$Date: 2002/08/20 14:20:36 $"; #include "pa_config_includes.h" @@ -119,12 +119,10 @@ static void _move(Request& r, const Stri static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& vmode_name=params-> as_no_junction(0, "mode must not be code"); - Value& vfile_name=params->as_no_junction(1, "file name must not be code"); - - const String& lfile_name=vfile_name.as_string(); + const String& lfile_name=r.absolute(params->as_no_junction(1, "file name must not be code").as_string()); void *data; size_t size; - file_read(pool, r.absolute(lfile_name), data, size, + file_read(pool, lfile_name, data, size, vmode_name.as_string()==TEXT_MODE_NAME); char *user_file_name=params->size()>2? @@ -461,7 +459,7 @@ static void _find(Request& r, const Stri // easy way if(file_readable(r.absolute(*file_spec))) { - r.write_no_lang(*file_spec); + r.write_assign_lang(*file_spec); return; } @@ -476,7 +474,7 @@ static void _find(Request& r, const Stri local_test_name<<*(dirname=&dirname->mid(0, after_monkey_slash)); local_test_name<