--- parser3/src/main/pa_request.C 2001/03/29 08:28:04 1.86 +++ parser3/src/main/pa_request.C 2001/04/06 10:32:20 1.100 @@ -5,17 +5,19 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.86 2001/03/29 08:28:04 paf Exp $ + $Id: pa_request.C,v 1.100 2001/04/06 10:32:20 paf Exp $ */ #include "pa_config_includes.h" +#include + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_vclass.h" -#include "_root.h" +#include "_op.h" #include "_table.h" #include "_file.h" #include "pa_globals.h" @@ -23,6 +25,8 @@ #include "pa_vmframe.h" #include "pa_types.h" #include "pa_vtable.h" +#include "_random.h" +#include "pa_vfile.h" /// $limits.post_max_size default 10M const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; @@ -38,7 +42,7 @@ Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - ROOT(apool), + OP(apool), env(apool), form(apool), request(apool, *this), @@ -50,17 +54,19 @@ Request::Request(Pool& apool, used_files(apool), default_content_type(0), mime_types(0), - html_typo_table(0) + connection(0), protocol2library(0) { // root superclass, // parent of all classes, // operators holder - initialize_root_class(pool(), ROOT); - classes().put(*root_class_name, &ROOT); + initialize_op_class(pool(), OP); + classes().put(*op_class_name, &OP); // table class classes().put(*table_class_name, table_class); // file class classes().put(*file_class_name, file_class); + // random class + classes().put(*random_class_name, random_class); // env class classes().put(*env_class_name, &env); // form class @@ -95,6 +101,8 @@ static void add_header_attribute(const H the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' + + @todo figure out 'setlocale' thread safety */ void Request::core(const char *root_auto_path, bool root_auto_fail, const char *site_auto_path, bool site_auto_fail, @@ -107,7 +115,7 @@ void Request::core(const char *root_auto // loading root auto.p if(root_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(root_auto_path, 0, "root_auto", 0); + filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( filespec, root_auto_fail, @@ -132,7 +140,7 @@ void Request::core(const char *root_auto // loading site auto.p if(site_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(site_auto_path, 0, "site_auto", 0); + filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( filespec, site_auto_fail, @@ -168,7 +176,7 @@ void Request::core(const char *root_auto append_here++/* / */; String& sfile_spec=*NEW String(pool()); - sfile_spec.APPEND(file_spec, 0, "scanned", 0); + sfile_spec.APPEND_CLEAN(file_spec, 0, "scanned", 0); main_class=use_file(sfile_spec, false/*ignore read problem*/, main_class_name, main_class); } else @@ -178,7 +186,7 @@ void Request::core(const char *root_auto // compiling requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND(info.path_translated, 0, "user-request", 0); + spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0); main_class=use_file(spath_translated, true/*don't ignore read problem*/, main_class_name, main_class); @@ -188,13 +196,37 @@ void Request::core(const char *root_auto // meaning constructing @see attributed_meaning_to_string default_content_type=defaults?defaults->get_element(*content_type_name):0; if(Value *element=main_class->get_element(*html_typo_name)) - html_typo_table=element->get_table(); + if(Table *table=element->get_table()) + pool().set_tag(table); + + // $MAIN:SQL.drivers + if(Value *sql=main_class->get_element(*main_sql_name)) + if(Value *element=sql->get_element(*main_sql_drivers_name)) + protocol2library=element->get_table(); // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) mime_types=table; + // $MAIN:LOCALE.ctype[Russian_Russia.1251] +/* +#define LC_ALL 0 +#define LC_COLLATE 1 +#define LC_CTYPE 2 +#define LC_MONETARY 3 +#define LC_NUMERIC 4 +#define LC_TIME 5 +*/ + if(Value *locale=main_class->get_element(*locale_name)) + if(Value *element=locale->get_element(*locale_ctype_name)) { + const String& name=element->as_string(); + if(!setlocale(LC_CTYPE, name.cstr())) + THROW(0, 0, + &name, + "locale is invalid"); + } + // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); if(!body_string) @@ -202,17 +234,34 @@ void Request::core(const char *root_auto 0, "'"MAIN_METHOD_NAME"' method not found"); + VString body_vstring_before_post_process(*body_string); + VString *body_vstring_after_post_process=&body_vstring_before_post_process; + // post-process - // todo + if(Value *value=main_class->get_element(*post_process_method_name)) + if(Junction *junction=value->get_junction()) + if(const Method *method=junction->method) { + // preparing to pass parameters to + // @post-process[data] + VMethodFrame frame(pool(), *junction, false); + frame.set_self(*main_class); + + frame.store_param(method->name, + &body_vstring_before_post_process); + body_vstring_after_post_process= + NEW VString(*execute_method(frame, *method)); + } + + const VFile *body_file=body_vstring_after_post_process->as_vfile(); // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); if(body_value) // there is some $request.body - body_string=&body_value->as_string();// TODO: IMAGE&FILE + body_file=body_value->as_vfile(); // OK. write out the result - output_result(*body_string, header_only); + output_result(*body_file, header_only); } CATCH(e) { // request handling problem // we're returning not result, but error explanation @@ -229,17 +278,17 @@ void Request::core(const char *root_auto problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(), + problem_source->cstr(String::UL_AS_IS), e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + e.type()?e.type()->cstr(String::UL_AS_IS):"-", + e.code()?e.code()->cstr(String::UL_AS_IS):"-" ); else SAPI::log(pool(), "%s [%s %s]", e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + e.type()?e.type()->cstr(String::UL_AS_IS):"-", + e.code()?e.code()->cstr(String::UL_AS_IS):"-" ); // reset language to default @@ -259,12 +308,11 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @exception[origin;source;comment;type;code] - VMethodFrame frame(pool(), *junction); + VMethodFrame frame(pool(), *junction, false); frame.set_self(*main_class); const String *problem_source=e.problem_source(); // origin - String origin_name(pool(), "origin"); Value *origin_value=0; #ifndef NO_STRING_ORIGIN if(problem_source) { @@ -279,11 +327,10 @@ void Request::core(const char *root_auto } } #endif - frame.store_param(origin_name, + frame.store_param(method->name, origin_value?origin_value:NEW VUnknown(pool())); // source - String source_name(pool(), "source"); Value *source_value=0; if(problem_source) { String& problem_source_copy=*NEW String(pool()); @@ -291,18 +338,16 @@ void Request::core(const char *root_auto flang, true); source_value=NEW VString(problem_source_copy); } - frame.store_param(source_name, + frame.store_param(method->name, source_value?source_value:NEW VUnknown(pool())); // comment - String comment_name(pool(), "comment"); String *comment_value=NEW String(pool(), e.comment(), true); - frame.store_param(comment_name, + frame.store_param(method->name, NEW VString(*comment_value)); // type - String type_name(pool(), "type"); Value *type_value; if(e.type()) { String& type_copy=*NEW String(pool()); @@ -310,10 +355,9 @@ void Request::core(const char *root_auto flang, true)); } else type_value=NEW VUnknown(pool()); - frame.store_param(type_name, type_value); + frame.store_param(method->name, type_value); // code - String code_name(pool(), "code"); Value *code_value; if(e.code()) { String& code_copy=*NEW String(pool()); @@ -321,7 +365,7 @@ void Request::core(const char *root_auto flang, true)); } else code_value=NEW VUnknown(pool()); - frame.store_param(code_name, code_value); + frame.store_param(method->name, code_value); // future $response:body= // execute ^exception[origin;source;comment;type;code] @@ -344,18 +388,18 @@ void Request::core(const char *root_auto origin.file, 1+origin.line); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr()); + problem_source->cstr(String::UL_AS_IS)); } printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", e.comment()); const String *type=e.type(); if(type) { printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", - type->cstr()); + type->cstr(String::UL_AS_IS)); const String *code=e.code(); if(code) printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr()); + code->cstr(String::UL_AS_IS)); } // future $response:content-type @@ -365,8 +409,11 @@ void Request::core(const char *root_auto body_string=NEW String(pool(), buf); } + const VString body_vstring(*body_string); + const VFile *body_file=body_vstring.as_vfile(); + // ERROR. write it out - output_result(*body_string, header_only); + output_result(*body_file, header_only); } CATCH(e) { // exception in request exception handler @@ -378,11 +425,10 @@ void Request::core(const char *root_auto END_CATCH // do not use pool() after this point - no exception handler set // any throw() would try to use zero exception() pointer - if(need_rethrow) // there were an exception set for us to rethrow? + if(need_rethrow) // were there an exception for us to rethrow? THROW(rethrow_me.type(), rethrow_me.code(), rethrow_me.problem_source(), rethrow_me.comment()); - } VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, @@ -446,21 +492,35 @@ const String& Request::absolute(const St return relative(info.path_translated, relative_name); } -void Request::output_result(const String& body_string, bool header_only) { +void Request::output_result(const VFile& body_file, bool header_only) { // header: cookies cookie.output_result(); - // set default content-type - response.fields().put_dont_replace(*content_type_name, - default_content_type?default_content_type - :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); + // set content-type + if(String *body_file_content_type=static_cast( + body_file.fields().get(*vfile_mime_type_name))) { + // body file content type + response.fields().put(*content_type_name, body_file_content_type); + } else { + // default content type + response.fields().put_dont_replace(*content_type_name, + default_content_type?default_content_type + :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); + } + + // content-disposition + if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) { + VHash& vhash=*NEW VHash(pool()); + vhash.hash().put(*content_disposition_filename_name, vfile_name); + response.fields().put(*content_disposition_name, &vhash); + } // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, /*excluding*/ body_name); // prepare... - const char *body=body_string.cstr(); - size_t content_length=strlen(body); + const void *body=body_file.value_ptr(); + size_t content_length=body_file.value_size(); // prepare header: content-length if(content_length) { // useful for redirecting [header "location: http://..."]