--- parser3/src/main/pa_request.C 2001/03/14 09:02:52 1.32 +++ parser3/src/main/pa_request.C 2001/03/18 13:38:48 1.44 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.32 2001/03/14 09:02:52 paf Exp $ + $Id: pa_request.C,v 1.44 2001/03/18 13:38:48 paf Exp $ */ #include @@ -20,41 +20,44 @@ #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, - String::Untaint_lang alang, - const char *adocument_root, - const char *apage_filespec) : Pooled(apool), + Info& ainfo, + String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - root_class(apool), - env_class(apool), - form_class(apool), + ROOT(apool), + env(apool), + form(apool), + request(apool, *this), + response(apool), fclasses(apool), - flang(alang), - fdocument_root(adocument_root), - fpage_filespec(apage_filespec) + fdefault_lang(adefault_lang), flang(adefault_lang), + info(ainfo), + fdefault_content_type(0) { // root superclass, // parent of all classes, // operators holder - initialize_root_class(pool(), root_class); - classes().put(*root_class_name, &root_class); + initialize_root_class(pool(), ROOT); + 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_class); + classes().put(*env_class_name, &env); // form class - classes().put(*form_class_name, &form_class); + classes().put(*form_class_name, &form); + // request class + classes().put(*request_class_name, &request); + // response class + classes().put(*response_class_name, &response); } -char *Request::core(const char *sys_auto_path1, - const char *sys_auto_path2) { - char *result; +void Request::core(Exception& system_exception, + const char *sys_auto_path1, + const char *sys_auto_path2) { VStateless_class *main_class=0; + bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -71,25 +74,40 @@ char *Request::core(const char *sys_auto strcat(auto_filespec, AUTO_FILE_NAME); main_class=use_file( auto_filespec, false/*ignore possible read problem*/, - main_class_name); + main_class_name, main_class); } // loading system auto.p 2 if(sys_auto_path2) { strncpy(auto_filespec, sys_auto_path2, MAX_STRING-strlen(AUTO_FILE_NAME)); strcat(auto_filespec, AUTO_FILE_NAME); - VStateless_class *main_class=use_file( + main_class=use_file( auto_filespec, false/*ignore possible read problem*/, - main_class_name); + main_class_name, main_class); } - // TODO: использовать $MAIN:limits здесь, пока их не сломали враги + Value *element; + // $MAIN:limits hash used here, + // until someone with less privileges have overriden them + Value *limits=main_class?main_class->get_element(*limits_name):0; + // $limits.post_max_size default 10M + element=limits?limits->get_element(*post_max_size_name):0; + int value=element?(size_t)element->get_double():0; + int post_max_size=value?value:10*0x400*400; + + form.fill_fields(*this, post_max_size); // TODO: load site auto.p files, all assigned bases from upper dir - char *site_auto_file="Y:\\parser3\\src\\auto.p"; + /*char *site_auto_file="Y:\\parser3\\src\\auto.p"; main_class=use_file( - site_auto_file, false/*ignore possible read problem*/, - main_class_name, main_class); + site_auto_file, false/*ignore possible read problem* /, + main_class_name, main_class);*/ + + // $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); // there must be some auto.p if(!main_class) @@ -98,21 +116,35 @@ char *Request::core(const char *sys_auto "no 'auto.p' found (nither system nor any site's)"); // compiling requested file - main_class=use_file(fpage_filespec, true/*don't ignore read problem*/, + main_class=use_file(info.path_translated, true/*don't ignore read problem*/, main_class_name, main_class); // execute @main[] - result=execute_method(*main_class, *main_method_name); - if(!result) + const String *body_string=execute_method(*main_class, *main_method_name); + if(!body_string) THROW(0,0, 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)); } CATCH(e) { TRY { // we're returning not result, but error explanation - result=0; + + // reset language to default + flang=fdefault_lang; + // 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; + 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... @@ -121,98 +153,134 @@ char *Request::core(const char *sys_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @exception[origin;source;comment;type;code] - VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); + VMethodFrame frame(pool(), *junction); + frame.set_self(*main_class); const String *problem_source=e.problem_source(); // origin - LOCAL_STRING(origin_name, "origin"); - VString *origin_value=0; + String origin_name(pool(), "origin"); + Value *origin_value=0; #ifndef NO_STRING_ORIGIN - const Origin& origin=problem_source->origin(); - if(origin.file) { - char *buf=(char *)malloc(MAX_STRING); - snprintf(buf, MAX_STRING, "%s(%d): ", - origin.file, 1+origin.line); - String *NEW_STRING(origin_file_line, buf); - origin_value=NEW VString(*origin_file_line); + if(problem_source) { + const Origin& origin=problem_source->origin(); + if(origin.file) { + char *buf=(char *)malloc(MAX_STRING); + snprintf(buf, MAX_STRING, "%s(%d):", + origin.file, 1+origin.line); + String *origin_file_line=NEW String(pool(), + buf, true); + origin_value=NEW VString(*origin_file_line); + } } #endif - frame->store_param(origin_name, origin_value); + frame.store_param(origin_name, + origin_value?origin_value:NEW VUnknown(pool())); // source - LOCAL_STRING(source_name, "source"); - frame->store_param(source_name, - NEW VString(*problem_source)); + 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); + 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()); - frame->store_param(comment_name, + 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(*e.type()); + type_copy.change_lang(flang); + type_value=NEW VString(type_copy); + } else type_value=NEW VUnknown(pool()); - frame->store_param(type_name, type_value); + 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(*e.code()); + code_copy.change_lang(flang); + code_value=NEW VString(code_copy); + } else code_value=NEW VUnknown(pool()); - frame->store_param(code_name, code_value); + frame.store_param(code_name, code_value); - result=execute_method(*frame, *method); + // 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); } } - // couldn't report an error beautifully, doing that ugly - if(!result) { - result=(char *)malloc(MAX_STRING); - result[0]=0; + if(!body_string) { // couldn't report an error beautifully? + // doing that ugly + + // make up result: $origin $source $comment $type $code + char *buf=(char *)malloc(MAX_STRING); size_t printed=0; const String *problem_source=e.problem_source(); if(problem_source) { #ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) - printed+=snprintf(result+printed, MAX_STRING-printed, "%s(%d): ", + printed+=snprintf(buf+printed, MAX_STRING-printed, "%s(%d): ", origin.file, 1+origin.line); #endif - printed+=snprintf(result+printed, MAX_STRING-printed, "'%s' ", + printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", problem_source->cstr()); } - printed+=snprintf(result+printed, MAX_STRING-printed, "%s", + printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", e.comment()); const String *type=e.type(); if(type) { - printed+=snprintf(result+printed, MAX_STRING-printed, " type: %s", + printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type->cstr()); const String *code=e.code(); if(code) - printed+=snprintf(result+printed, MAX_STRING-printed, ", code: %s", + printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", code->cstr()); } + + // future $response:content-type + String &content_type_value=*NEW String(pool(), "text/plain"); + content_type=NEW VString(content_type_value); + // 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)); } CATCH(e) { - // exception in exception handler occured - // probably totally out of memory - // can't say anything about such sad story - // would just return 0 - result=0; + // exception in request exception handler + // remember to rethrow it + rethrow_me=e; need_rethrow=true; } END_CATCH } - END_CATCH + 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? + system_exception._throw(rethrow_me.type(), rethrow_me.code(), + rethrow_me.problem_source(), + rethrow_me.comment()); - return result; } VStateless_class *Request::use_file( @@ -261,10 +329,10 @@ char *Request::relative(const char *path char *Request::absolute(const char *name) { if(name[0]=='/') { - char *result=(char *)malloc(strlen(fdocument_root)+strlen(name)+1); - strcpy(result, fdocument_root); + char *result=(char *)malloc(strlen(info.document_root)+strlen(name)+1); + strcpy(result, info.document_root); strcat(result, name); return result; } else - return relative(fpage_filespec, name); + return relative(info.uri, name); }