--- parser3/src/main/pa_request.C 2001/03/18 11:58:20 1.42 +++ parser3/src/main/pa_request.C 2001/03/19 17:56:28 1.56 @@ -1,16 +1,18 @@ -/* - 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.42 2001/03/18 11:58:20 paf Exp $ + $Id: pa_request.C,v 1.56 2001/03/19 17:56:28 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" @@ -20,21 +22,20 @@ #include "pa_vmframe.h" #include "pa_types.h" -#define NEW_STRING(name, value) name=NEW String(pool()); name->APPEND_CONST(value) -#define LOCAL_STRING(name, value) String name(pool()); name.APPEND_CONST(value) - Request::Request(Pool& apool, Info& ainfo, - String::Untaint_lang alang) : Pooled(apool), + String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), ROOT(apool), env(apool), form(apool), request(apool, *this), response(apool), + cookie(apool), fclasses(apool), - flang(alang), - info(ainfo) + fdefault_lang(adefault_lang), flang(adefault_lang), + info(ainfo), + fdefault_content_type(0) { // root superclass, // parent of all classes, @@ -53,6 +54,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::Untaint_lang::HEADER, true); + + (*service_funcs.output_header_attribute)( + attribute.cstr(), + attributed_meaning_string(static_cast(ameaning)).cstr()); } void Request::core(Exception& system_exception, @@ -97,9 +114,8 @@ void Request::core(Exception& system_exc int value=element?(size_t)element->get_double():0; int post_max_size=value?value:10*0x400*400; - //response.fields().put(*content_type_name, TODO); - 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"; @@ -109,10 +125,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; - if(element) - response.fields().put(*content_type_name, element); + fdefault_content_type=defaults?defaults->get_element(*content_type_name):0; // there must be some auto.p if(!main_class) @@ -131,14 +144,28 @@ 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 { // we're returning not result, but error explanation - const String *body_string=0; + + // reset language to default + flang=fdefault_lang; + // reset response + response.fields().clear(); + + // this is what we'd return in $response:body + const String *body_string=0; + if(main_class) { // we've managed to end up with some main_class // maybe we'd be lucky enough as to report an error // in a gracefull way... @@ -152,7 +179,7 @@ void Request::core(Exception& system_exc const String *problem_source=e.problem_source(); // origin - LOCAL_STRING(origin_name, "origin"); + String origin_name(pool(), "origin"); Value *origin_value=0; #ifndef NO_STRING_ORIGIN if(problem_source) { @@ -161,7 +188,8 @@ void Request::core(Exception& system_exc char *buf=(char *)malloc(MAX_STRING); snprintf(buf, MAX_STRING, "%s(%d):", origin.file, 1+origin.line); - String *NEW_STRING(origin_file_line, buf); + String *origin_file_line=NEW String(pool(), + buf, true); origin_value=NEW VString(*origin_file_line); } } @@ -170,54 +198,55 @@ void Request::core(Exception& system_exc origin_value?origin_value:NEW VUnknown(pool())); // source - LOCAL_STRING(source_name, "source"); + String source_name(pool(), "source"); Value *source_value=0; - if(problem_source) - source_value=NEW VString(*problem_source); + if(problem_source) { + 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, source_value?source_value:NEW VUnknown(pool())); // comment - LOCAL_STRING(comment_name, "comment"); - String *NEW_STRING(comment_value, e.comment()); + String comment_name(pool(), "comment"); + String *comment_value=NEW String(pool(), + e.comment(), true); frame.store_param(comment_name, NEW VString(*comment_value)); // type - LOCAL_STRING(type_name, "type"); + String type_name(pool(), "type"); Value *type_value; - if(e.type()) - type_value=NEW VString(*e.type()); - else + if(e.type()) { + 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); // code - LOCAL_STRING(code_name, "code"); + String code_name(pool(), "code"); Value *code_value; - if(e.code()) - code_value=NEW VString(*e.code()); - else + if(e.code()) { + 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); - { - Temp_lang temp_lang(*this, - String::Untaint_lang::HTML_TYPO); - body_string=execute_method(frame, *method); - } + // future $response:body= + // execute ^exception[origin;source;comment;type;code] + body_string=execute_method(frame, *method); } } if(!body_string) { // couldn't report an error beautifully? // doing that ugly - // assign content-type - String &content_type_value=*NEW String(pool()); - content_type_value.APPEND_CONST("text/plain"); - response.fields().put(*content_type_name, - NEW VString(content_type_value)); - // make up result: $origin $source $comment $type $code char *buf=(char *)malloc(MAX_STRING); size_t printed=0; @@ -243,12 +272,16 @@ void Request::core(Exception& system_exc printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", code->cstr()); } - String *error_string=NEW String(pool()); error_string->APPEND_CONST(buf); - body_string=error_string; + + // future $response:content-type + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), "text/plain"))); + // future $response:body + body_string=NEW String(pool(), buf); } - // store 'body' overwriting any response already had - response.fields().put(*body_name, NEW VString(*body_string)); + // ERROR. write it out + output_result(*body_string); } CATCH(e) { // exception in request exception handler @@ -267,11 +300,11 @@ 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); if(!source) return base_class; @@ -291,11 +324,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, @@ -320,3 +355,26 @@ char *Request::absolute(const char *name } else return relative(info.uri, 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); +}