--- parser3/src/main/pa_request.C 2001/07/26 10:47:02 1.146 +++ parser3/src/main/pa_request.C 2001/09/26 10:32:26 1.156 @@ -2,10 +2,10 @@ 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.156 2001/09/26 10:32:26 parser Exp $ */ -static const char *RCSId="$Id: pa_request.C,v 1.146 2001/07/26 10:47:02 parser Exp $"; #include "pa_config_includes.h" @@ -24,6 +24,7 @@ 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"; @@ -144,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 @@ -152,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); } @@ -175,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); } @@ -189,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) { @@ -198,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=0; iget_element(*content_type_name):0; +#ifdef XML + // record default charset + 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()); +#endif + 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)) @@ -242,18 +252,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] ] */ @@ -274,7 +284,7 @@ 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); @@ -492,20 +502,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,