--- parser3/src/main/pa_request.C 2001/03/13 16:38:24 1.27 +++ parser3/src/main/pa_request.C 2001/03/15 11:09:49 1.39 @@ -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.27 2001/03/13 16:38:24 paf Exp $ + $Id: pa_request.C,v 1.39 2001/03/15 11:09:49 paf Exp $ */ #include @@ -15,17 +15,24 @@ #include "_root.h" #include "_env.h" #include "_table.h" -#include "core.h" - -#include - -Request::Request(Pool& apool) : Pooled(apool), +#include "pa_globals.h" +#include "pa_vint.h" +#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), stack(apool), root_class(apool), env_class(apool), form_class(apool), fclasses(apool), - flang(String::Untaint_lang::HTML_TYPO) + flang(alang), + info(ainfo) { // root superclass, // parent of all classes, @@ -40,28 +47,56 @@ Request::Request(Pool& apool) : Pooled(a classes().put(*env_class_name, &env_class); // form class classes().put(*form_class_name, &form_class); - - // web - // TODO: ifdef WIN32 flip \\ to / - document_root="Y:/parser3/src/"; - page_filespec="Y:/parser3/src/test.p"; } -void Request::core() { +char *Request::core(const char *sys_auto_path1, + const char *sys_auto_path2) { + char *result; + VStateless_class *main_class=0; TRY { - // loading system auto.p - char *sys_auto_file="C:\\temp\\auto.p"; - VStateless_class *main_class=use_file( - sys_auto_file, false/*ignore possible read problem*/, - main_class_name); + char *auto_filespec=(char *)malloc(MAX_STRING); + + // load MAIN class, + // it consists of all the auto.p files we'd manage to find + // plus + // the file user requested us to process + // all located classes become children of one another, + // composing class we name 'MAIN' + + // loading system auto.p 1 + if(sys_auto_path1) { + strncpy(auto_filespec, sys_auto_path1, MAX_STRING-strlen(AUTO_FILE_NAME)); + strcat(auto_filespec, AUTO_FILE_NAME); + main_class=use_file( + auto_filespec, false/*ignore possible read problem*/, + main_class_name, main_class); + } - // TODO: использовать $MAIN:limits здесь, пока их не сломали враги + // 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); + main_class=use_file( + auto_filespec, false/*ignore possible read problem*/, + main_class_name, main_class); + } + + // $MAIN:limits hash used here, + // until someone with less privileges have overriden them + Value *limits=main_class?main_class->get_element(*limits_name):0; + Value *element; + // $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_class.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);*/ // there must be some auto.p if(!main_class) @@ -70,43 +105,128 @@ void Request::core() { "no 'auto.p' found (nither system nor any site's)"); // compiling requested file - main_class=use_file(page_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[] - char *result=execute_method(*main_class, *main_method_name, - true /*result needed*/); + result=execute_method(*main_class, *main_method_name); if(!result) THROW(0,0, 0, "'"MAIN_METHOD_NAME"' method not found"); - - printf("result-----------------\n%sEOF----------------\n", result); } CATCH(e) { - printf("\nERROR: "); - const String *problem_source=e.problem_source(); + TRY { + // we're returning not result, but error explanation + result=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... + if(Value *value=main_class->get_element(*exception_method_name)) + if(Junction *junction=value->get_junction()) + if(const Method *method=junction->method) { + // preparing to pass parameters to + // @exception[origin;source;comment;type;code] + VMethodFrame frame(pool(), *junction); + frame.set_self(*main_class); + + const String *problem_source=e.problem_source(); + // origin + LOCAL_STRING(origin_name, "origin"); + Value *origin_value=0; #ifndef NO_STRING_ORIGIN - if(problem_source) { - const Origin& origin=problem_source->origin(); - if(origin.file) - printf("%s(%d): ", - origin.file, 1+origin.line); - printf("'%s' ", - problem_source->cstr()); - } + 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 *NEW_STRING(origin_file_line, buf); + origin_value=NEW VString(*origin_file_line); + } + } #endif - printf("%s", e.comment()); - const String *type=e.type(); - if(type) { - printf(" type: %s", type->cstr()); - const String *code=e.code(); - if(code) - printf(", code: %s", code->cstr()); + frame.store_param(origin_name, + origin_value?origin_value:NEW VUnknown(pool())); + + // source + LOCAL_STRING(source_name, "source"); + Value *source_value=0; + if(problem_source) + source_value=NEW VString(*problem_source); + 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, + NEW VString(*comment_value)); + + // type + LOCAL_STRING(type_name, "type"); + Value *type_value; + if(e.type()) + type_value=NEW VString(*e.type()); + else + type_value=NEW VUnknown(pool()); + frame.store_param(type_name, type_value); + + // code + LOCAL_STRING(code_name, "code"); + Value *code_value; + if(e.code()) + code_value=NEW VString(*e.code()); + else + code_value=NEW VUnknown(pool()); + frame.store_param(code_name, code_value); + + result=execute_method(frame, *method); + } + } + + // couldn't report an error beautifully, doing that ugly + if(!result) { + result=(char *)malloc(MAX_STRING); + result[0]=0; + 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): ", + origin.file, 1+origin.line); +#endif + printed+=snprintf(result+printed, MAX_STRING-printed, "'%s' ", + problem_source->cstr()); + } + printed+=snprintf(result+printed, MAX_STRING-printed, "%s", + e.comment()); + const String *type=e.type(); + if(type) { + printed+=snprintf(result+printed, MAX_STRING-printed, " type: %s", + type->cstr()); + const String *code=e.code(); + if(code) + printed+=snprintf(result+printed, MAX_STRING-printed, ", code: %s", + code->cstr()); + } + } + } + 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; } - printf("\n"); + END_CATCH } END_CATCH + + return result; } VStateless_class *Request::use_file( @@ -147,18 +267,18 @@ void Request::fail_if_junction_(bool is, char *Request::relative(const char *path, const char *file) { char *result=(char *)malloc(strlen(path)+strlen(file)+1); strcpy(result, path); - rsplit(result,'/'); - strcat(result, "/"); + rsplit(result, PATH_DELIMITER_CHAR); + strcat(result, PATH_DELIMITER_STRING); strcat(result, file); return result; } char *Request::absolute(const char *name) { if(name[0]=='/') { - char *result=(char *)malloc(strlen(document_root)+strlen(name)+1); - strcpy(result, document_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(page_filespec, name); + return relative(info.request_uri, name); }