--- parser3/src/main/pa_request.C 2001/03/18 13:38:48 1.44 +++ parser3/src/main/pa_request.C 2001/03/20 17:21:53 1.61.2.1 @@ -1,19 +1,20 @@ -/* - Parser +/** @file + Parser: request class main part. @see compile.C and execute.C. + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.44 2001/03/18 13:38:48 paf Exp $ + $Id: pa_request.C,v 1.61.2.1 2001/03/20 17:21:53 paf Exp $ */ #include +#include "pa_common.h" #include "pa_request.h" #include "pa_wwrapper.h" -#include "pa_common.h" #include "pa_vclass.h" #include "_root.h" -#include "_env.h" #include "_table.h" #include "pa_globals.h" #include "pa_vint.h" @@ -29,6 +30,7 @@ Request::Request(Pool& apool, form(apool), request(apool, *this), response(apool), + cookie(apool), fclasses(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), @@ -41,7 +43,6 @@ Request::Request(Pool& apool, classes().put(*root_class_name, &ROOT); // table class classes().put(*table_class_name, table_class); -// table_class->set_name(*table_class_name); // env class classes().put(*env_class_name, &env); @@ -51,6 +52,22 @@ Request::Request(Pool& apool, classes().put(*request_class_name, &request); // response class classes().put(*response_class_name, &response); + // cookie class + classes().put(*cookie_class_name, &cookie); +} + +static void output_response_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, + void *info) { + String *attribute_to_exclude=static_cast(info); + if(aattribute==*attribute_to_exclude) + return; + + String attribute(aattribute.pool()); + attribute.append(aattribute, String::UL_HEADER, true); + + (*service_funcs.output_header_attribute)( + attribute.cstr(), + attributed_meaning_string(static_cast(ameaning)).cstr()); } void Request::core(Exception& system_exception, @@ -96,6 +113,7 @@ void Request::core(Exception& system_exc int post_max_size=value?value:10*0x400*400; form.fill_fields(*this, post_max_size); + cookie.fill_fields(*this); // TODO: load site auto.p files, all assigned bases from upper dir /*char *site_auto_file="Y:\\parser3\\src\\auto.p"; @@ -105,9 +123,7 @@ void Request::core(Exception& system_exc // $MAIN:defaults Value *defaults=main_class?main_class->get_element(*defaults_name):0; - // $defaults.content-type - element=defaults?defaults->get_element(*content_type_name):0; - response.fields().put(*content_type_name, fdefault_content_type=element); + fdefault_content_type=defaults?defaults->get_element(*content_type_name):0; // there must be some auto.p if(!main_class) @@ -126,8 +142,14 @@ void Request::core(Exception& system_exc 0, "'"MAIN_METHOD_NAME"' method not found"); - // store 'body' unless response already have one - response.fields().put_dont_replace(*body_name, NEW VString(*body_string)); + // 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 + + // OK. write out the result + output_result(*body_string); } CATCH(e) { TRY { @@ -139,9 +161,6 @@ void Request::core(Exception& system_exc // reset response response.fields().clear(); - // this is what we'd return in $response:content-type - Value *content_type; - // this is what we'd return in $response:body const String *body_string=0; @@ -180,8 +199,9 @@ void Request::core(Exception& system_exc String source_name(pool(), "source"); Value *source_value=0; if(problem_source) { - String& problem_source_copy=*NEW String(*problem_source); - problem_source_copy.change_lang(flang); + String& problem_source_copy=*NEW String(pool()); + problem_source_copy.append(*problem_source, + flang, true); source_value=NEW VString(problem_source_copy); } frame.store_param(source_name, @@ -198,9 +218,9 @@ void Request::core(Exception& system_exc String type_name(pool(), "type"); Value *type_value; if(e.type()) { - String& type_copy=*NEW String(*e.type()); - type_copy.change_lang(flang); - type_value=NEW VString(type_copy); + String& type_copy=*NEW String(pool()); + type_value=NEW VString(type_copy.append(*e.type(), + flang, true)); } else type_value=NEW VUnknown(pool()); frame.store_param(type_name, type_value); @@ -209,16 +229,13 @@ void Request::core(Exception& system_exc String code_name(pool(), "code"); Value *code_value; if(e.code()) { - String& code_copy=*NEW String(*e.code()); - code_copy.change_lang(flang); - code_value=NEW VString(code_copy); + String& code_copy=*NEW String(pool()); + code_value=NEW VString(code_copy.append(*e.code(), + flang, true)); } else code_value=NEW VUnknown(pool()); frame.store_param(code_name, code_value); - // future $response:content-type= - // content-type from any auto.p - content_type=fdefault_content_type; // future $response:body= // execute ^exception[origin;source;comment;type;code] body_string=execute_method(frame, *method); @@ -255,16 +272,14 @@ void Request::core(Exception& system_exc } // future $response:content-type - String &content_type_value=*NEW String(pool(), "text/plain"); - content_type=NEW VString(content_type_value); + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), "text/plain"))); // future $response:body body_string=NEW String(pool(), buf); } - // store $response:content-type - response.fields().put(*content_type_name, content_type); - // store $response:body - response.fields().put(*body_name, NEW VString(*body_string)); + // ERROR. write it out + output_result(*body_string); } CATCH(e) { // exception in request exception handler @@ -283,12 +298,12 @@ void Request::core(Exception& system_exc } +/// @todo find|solve cyclic dependences VStateless_class *Request::use_file( const char *file, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { - // TODO: обнаружить|решить cyclic dependences - char *source=file_read(pool(), file, fail_on_read_problem); + char *source=file_read_text(pool(), file, fail_on_read_problem); if(!source) return base_class; @@ -307,11 +322,13 @@ VStateless_class *Request::use_buf( return &cclass; } +/** + - fail_if_junction(true, junction = fail + - fail_if_junction(false, not junction = fail +*/ void Request::fail_if_junction_(bool is, Value& value, const String& method_name, char *msg) { - // fail_if_junction(true, junction = fail - // fail_if_junction(false, not junction = fail if((value.get_junction()!=0) ^ !is) THROW(0, 0, &method_name, @@ -334,5 +351,28 @@ char *Request::absolute(const char *name strcat(result, name); return result; } else - return relative(info.uri, name); + return relative(info.path_translated, name); +} + +void Request::output_result(const String& body_string) { + // header: cookies + cookie.output_result(); + + // set default content-type + if(fdefault_content_type) + response.fields().put_dont_replace(*content_type_name, fdefault_content_type); + + // header: $response:fields without :body + response.fields().foreach(output_response_attribute, /*excluding*/ body_name); + + // prepare + const char *body=body_string.cstr(); + size_t content_length=strlen(body); + + // header: content-length + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); + (*service_funcs.output_header_attribute)("content-length", content_length_cstr); + // body + (*service_funcs.output_body)(body, content_length); }