--- parser3/src/main/pa_request.C 2001/06/28 07:41:59 1.139 +++ parser3/src/main/pa_request.C 2001/08/06 16:18:26 1.148 @@ -4,10 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.139 2001/06/28 07:41:59 parser Exp $ */ -static char *RCSId="$Id: pa_request.C,v 1.139 2001/06/28 07:41:59 parser Exp $"; +static const char *RCSId="$Id: pa_request.C,v 1.148 2001/08/06 16:18:26 parser Exp $"; #include "pa_config_includes.h" @@ -26,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&); @@ -43,6 +43,7 @@ Request::Request(Pool& apool, OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), @@ -81,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, @@ -164,7 +167,8 @@ void Request::core(const char *root_auto filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - filespec, root_auto_fail, + filespec, + true/*ignore class_path*/, root_auto_fail, main_class_name, main_class); } @@ -179,7 +183,8 @@ void Request::core(const char *root_auto filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - filespec, site_auto_fail, + filespec, + true/*ignore class_path*/, site_auto_fail, main_class_name, main_class); } @@ -207,9 +212,10 @@ void Request::core(const char *root_auto } after=before+1; } - for(int i=ladder.size(); --i>=0; ) { + for(int i=0; iget_element(*content_type_name):0; 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)) @@ -240,18 +247,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] ] */ @@ -278,11 +285,12 @@ void Request::core(const char *root_auto 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; @@ -293,7 +301,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, @@ -302,13 +310,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); @@ -360,7 +374,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(); @@ -461,7 +475,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 @@ -483,20 +497,51 @@ 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 || file_name.first_char()=='/') { + // ignore_class_path | absolute path, no need to scan MAIN:class_path + file_spec=&file_name; + } else { + file_spec=0; + if(main_class) + if(Value *element=main_class->get_element(*class_path_name)) + 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); + String *test_file_spec=NEW String(path); + *test_file_spec << "/"; + *test_file_spec << file_name; + if(file_readable(*test_file_spec)) { + file_spec=test_file_spec; // found along class_path + break; + } + } + if(!file_spec) + THROW(0, 0, + &file_name, + "not found along " CLASS_PATH_NAME); + } + if(!file_spec) + THROW(0, 0, + &file_name, + "can not be loaded because no " CLASS_PATH_NAME " 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, @@ -506,7 +551,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; }