--- parser3/src/main/pa_request.C 2001/05/24 09:29:52 1.136 +++ parser3/src/main/pa_request.C 2001/09/20 14:34:42 1.154 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.136 2001/05/24 09:29:52 parser Exp $ */ +static const char *RCSId="$Id: pa_request.C,v 1.154 2001/09/20 14:34:42 parser Exp $"; #include "pa_config_includes.h" @@ -25,12 +24,14 @@ extern "C" unsigned char pcre_default_ta #include "pa_types.h" #include "pa_vtable.h" #include "pa_vfile.h" +#include "pa_dictionary.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; /// content type of response when no $MAIN:defaults.content-type defined const char *DEFAULT_CONTENT_TYPE="text/html"; +const char *ORIGINS_CONTENT_TYPE="text/plain"; Methoded *MOP_create(Pool&); @@ -42,6 +43,7 @@ Request::Request(Pool& apool, OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), @@ -80,6 +82,8 @@ Request::Request(Pool& apool, /// bases used // form class classes().put(form.get_class()->base()->name(), &form); + // math class + classes().put(math.get_class()->base()->name(), &math); } static void element2ctypes(unsigned char *tables, @@ -141,6 +145,7 @@ static void element2case(unsigned char * from=c; } } + /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -149,21 +154,22 @@ static void element2case(unsigned char * all located classes become children of one another, composing class we name 'MAIN' */ -void Request::core(const char *root_auto_path, bool root_auto_fail, - const char *site_auto_path, bool site_auto_fail, +void Request::core( + const char *root_config_filespec, bool root_config_fail_on_read_problem, + const char *site_config_filespec, bool site_config_fail_on_read_problem, bool header_only) { //_asm { int 3 } bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root auto.p - if(root_auto_path) { + // loading root config + if(root_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(root_config_filespec, 0, "root_config", 0); main_class=use_file( - filespec, root_auto_fail, + filespec, + true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } @@ -172,13 +178,13 @@ void Request::core(const char *root_auto OP.configure_admin(*this); methoded_array->configure_admin(*this); - // loading site auto.p - if(site_auto_path) { + // loading site config + if(site_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); main_class=use_file( - filespec, site_auto_fail, + filespec, + true/*ignore class_path*/, site_config_fail_on_read_problem, main_class_name, main_class); } @@ -186,7 +192,6 @@ void Request::core(const char *root_auto // to the one beside requested file. // all assigned bases from upper dir { - Array ladder(pool()); const char *after=info.path_translated; size_t drlen=strlen(info.document_root); if(memcmp(after, info.document_root, drlen)==0) { @@ -195,28 +200,28 @@ void Request::core(const char *root_auto --after; } + int step=0; while(const char *before=strchr(after, '/')) { - String& step=*NEW String(pool()); + String& sfile_spec=*NEW String(pool()); if(after!=info.path_translated) { - step.APPEND_CLEAN( - info.path_translated, before+1/* / */-info.path_translated, - "path-translated-scanned", ladder.size()); - step << AUTO_FILE_NAME; - ladder+=&step; + sfile_spec.APPEND_CLEAN( + info.path_translated, before-info.path_translated, + "path-translated-scanned", step++); + sfile_spec << "/" AUTO_FILE_NAME; + + main_class=use_file(sfile_spec, + true/*ignore class_path*/, false/*ignore read problem*/, + main_class_name, main_class); } after=before+1; } - for(int i=ladder.size(); --i>=0; ) { - const String& sfile_spec=*ladder.get_string(i); - main_class=use_file(sfile_spec, false/*ignore read problem*/, - main_class_name, main_class); - } } // compile requested file String& spath_translated=*NEW String(pool()); spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); - main_class=use_file(spath_translated, true/*don't ignore read problem*/, + main_class=use_file(spath_translated, + true/*ignore class_path*/, true/*don't ignore read problem*/, main_class_name, main_class); // configure not-root=user options @@ -228,9 +233,14 @@ void Request::core(const char *root_auto // value must be allocated on request's pool for that pool used on // meaning constructing @see attributed_meaning_to_string default_content_type=defaults?defaults->get_element(*content_type_name):0; + if(default_content_type) + if(Hash *hash=default_content_type->get_hash()) + if(Value *vcharset=(Value *)hash->get(*charset_name)) + pool().set_charset(vcharset->as_string()); + if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) - pool().set_tag(table); + pool().set_tag(NEW Dictionary(*table)); // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) @@ -239,18 +249,18 @@ void Request::core(const char *root_auto /* $MAIN:CTYPE[ - $white-space[ + $.white-space[ ^#09^#0A^#0B^#0C^#0D^#20] - $digit[ + $.digit[ 0123456789] - $hex-digit[ + $.hex-digit[ 0123456789ABCDEFabcdef] - $letter[ + $.letter[ ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] - $word[ + $.word[ 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - $lowercase[ + $.lowercase[ AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] ] */ @@ -271,17 +281,18 @@ void Request::core(const char *root_auto pcre_tables=pcre_default_tables; // filling form fields - form.fill_fields(*this); + form.fill_fields_and_tables(*this); // filling cookies cookie.fill_fields(*this); // execute @main[] - const String *body_string=execute_method(*main_class, *main_method_name); + const String *body_string=execute_virtual_method( + *main_class, *main_method_name); if(!body_string) THROW(0,0, - 0, - "'"MAIN_METHOD_NAME"' method not found"); + 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; @@ -292,7 +303,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), value->name(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); frame.store_param(method->name, @@ -301,13 +312,19 @@ void Request::core(const char *root_auto NEW VString(*execute_method(frame, *method)); } - const VFile *body_file=body_vstring_after_post_process->as_vfile(); + bool origins_mode=main_class->get_element(*origins_mode_name)!=0; + + const VFile *body_file=body_vstring_after_post_process->as_vfile( + String::UL_UNSPECIFIED, origins_mode); // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); if(body_value) // there is some $response.body body_file=body_value->as_vfile(); + else if(origins_mode) + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); // OK. write out the result output_result(*body_file, header_only); @@ -343,7 +360,7 @@ void Request::core(const char *root_auto // reset language to default flang=fdefault_lang; if(flang==String::UL_USER_HTML) - flang=String::UL_HTML; // no _ conversions in @exception[params] + flang=String::UL_HTML; // no _ & Co conversions in @exception[params] // reset response response.fields().clear(); @@ -359,7 +376,7 @@ 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(), value->name(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); const String *problem_source=e.problem_source(); @@ -379,7 +396,7 @@ void Request::core(const char *root_auto } #endif frame.store_param(method->name, - origin_value?origin_value:NEW VNothing(pool())); + origin_value?origin_value:NEW VVoid(pool())); // source Value *source_value=0; @@ -390,7 +407,7 @@ void Request::core(const char *root_auto source_value=NEW VString(problem_source_copy); } frame.store_param(method->name, - source_value?source_value:NEW VNothing(pool())); + source_value?source_value:NEW VVoid(pool())); // comment String *comment_value=NEW String(pool(), @@ -405,7 +422,7 @@ void Request::core(const char *root_auto type_value=NEW VString(type_copy.append(*e.type(), flang, true)); } else - type_value=NEW VNothing(pool()); + type_value=NEW VVoid(pool()); frame.store_param(method->name, type_value); // code @@ -415,7 +432,7 @@ void Request::core(const char *root_auto code_value=NEW VString(code_copy.append(*e.code(), flang, true)); } else - code_value=NEW VNothing(pool()); + code_value=NEW VVoid(pool()); frame.store_param(method->name, code_value); // future $response:body= @@ -460,7 +477,7 @@ void Request::core(const char *root_auto body_string=NEW String(pool(), buf); } - const VString body_vstring(*body_string); + VString body_vstring(*body_string); const VFile *body_file=body_vstring.as_vfile(); // ERROR. write it out @@ -482,20 +499,53 @@ void Request::core(const char *root_auto rethrow_me.comment()); } -VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, +VStateless_class *Request::use_file(const String& file_name, + bool ignore_class_path, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { // cyclic dependence check - if(used_files.get(file_spec)) + if(used_files.get(file_name)) return base_class; - used_files.put(file_spec, (Hash::Val *)true); + used_files.put(file_name, (Hash::Val *)true); + const String *file_spec; + if(ignore_class_path) // ignore_class_path? + file_spec=&file_name; + else if(file_name.first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? + file_spec=&absolute(file_name); + else { + file_spec=0; + if(main_class) + if(Value *element=main_class->get_element(*class_path_name)) { + if(element->is_string()) { + file_spec=file_readable(element->as_string(), file_name); // found at class_path? + } else if(Table *table=element->get_table()) { + int size=table->size(); + for(int i=size; i--; ) { + const String& path=*static_cast(table->get(i))->get_string(0); + if(file_spec=file_readable(path, file_name)) + break; // found along class_path + } + } else + THROW(0, 0, + &element->name(), + "must be string or table"); + if(!file_spec) + THROW(0, 0, + &file_name, + "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + } + if(!file_spec) + THROW(0, 0, + &file_name, + "usage failed - no " MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); + } - char *source=file_read_text(pool(), file_spec, fail_on_read_problem); + char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); if(!source) return base_class; - return use_buf(source, file_spec.cstr(), 0/*new class*/, name, base_class); + return use_buf(source, file_spec->cstr(), 0/*new class*/, name, base_class); } VStateless_class *Request::use_buf(const char *source, const char *file, @@ -505,7 +555,7 @@ VStateless_class *Request::use_buf(const VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file); // locate and execute possible @auto[] static method - execute_method(cclass, *auto_method_name, false /*no result needed*/); + execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); return &cclass; }