--- parser3/src/main/pa_request.C 2002/05/07 07:23:11 1.204.2.1 +++ parser3/src/main/pa_request.C 2002/06/20 16:31:08 1.211.2.1 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_request.C,v 1.204.2.1 2002/05/07 07:23:11 paf Exp $ + $Id: pa_request.C,v 1.211.2.1 2002/06/20 16:31:08 paf Exp $ */ #include "pa_sapi.h" @@ -19,8 +19,8 @@ #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" -#include "pa_charsets.h" #include "pa_charset.h" +#include "pa_charsets.h" const char *POST_PROCESS_METHOD_NAME="postprocess"; const char *UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; @@ -36,11 +36,6 @@ Methoded *MOP_create(Pool&); // op.C VHash& exception2vhash(Pool& pool, const Exception& e); -static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *) { - charsets->load_charset(akey, static_cast(avalue)->as_string()); -} - // Request::Request(Pool& apool, Info& ainfo, @@ -61,6 +56,7 @@ Request::Request(Pool& apool, info(ainfo), post_data(0), post_size(0), used_files(apool), + configure_admin_done(false), default_content_type(0), mime_types(0), main_class(0), @@ -119,6 +115,38 @@ Request::~Request() { #endif } +static void load_charset(const Hash::Key& akey, Hash::Val *avalue, void *) { + charsets->load_charset(akey, static_cast(avalue)->as_string()); +} +void Request::configure_admin(VStateless_class& conf_class, const String *source) { + if(configure_admin_done) + throw Exception("parser.runtime", + source, + "parser already configured"); + configure_admin_done=true; + + // charsets must only be specified in root config + // so that users would not interfere + + /* $MAIN:CHARSETS[ + $.charsetname1[/full/path/to/charset/file.cfg] + ... + ] + */ + if(Value *vcharsets=conf_class.get_element(*charsets_name)) { + if(Hash *charsets=vcharsets->get_hash(0)) + charsets->for_each(load_charset); + else if(!vcharsets->get_string()) + throw Exception("parser.runtime", + 0, + "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); + } + + // configure root options + // until someone with less privileges have overriden them + OP.configure_admin(*this); + methoded_array->configure_admin(*this); +} /** load MAIN class, execute @main. @@ -132,8 +160,7 @@ Request::~Request() { */ 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, + const char *config_filespec, bool config_fail_on_read_problem, bool header_only) { #ifdef RESOURCES_DEBUG @@ -145,44 +172,13 @@ gettimeofday(&mt[0],NULL); try { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root config - if(root_config_filespec) { + // loading config + if(config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_config_filespec, 0, "root_config", 0); + filespec.APPEND_CLEAN(config_filespec, 0, "config", 0); main_class=use_file( filespec, - true/*ignore class_path*/, root_config_fail_on_read_problem, - main_class_name, main_class); - } - // charsets must only be specified in root config - // so that users would not interfere - if(main_class) { - /* $MAIN:CHARSETS[ - $.charsetname1[/full/path/to/charset/file.cfg] - ... - ] - */ - if(Value *vcharsets=main_class->get_element(*charsets_name)) { - if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset); - else - throw Exception("parser.runtime", - 0, - "$" CHARSETS_NAME " must be hash"); - } - } - // configure root options - // until someone with less privileges have overriden them - OP.configure_admin(*this); - methoded_array->configure_admin(*this); - - // loading site config - if(site_config_filespec) { - String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); - main_class=use_file( - filespec, - true/*ignore class_path*/, site_config_fail_on_read_problem, + true/*ignore class_path*/, config_fail_on_read_problem, main_class_name, main_class); } @@ -313,8 +309,7 @@ t[9]-t[3] // we're returning not result, but error explanation try { // log the beast - const String *problem_source=e.problem_source(); - if(problem_source && problem_source->size()) + if(const String *problem_source=e.problem_source()) SAPI::log(pool(), "%s: " #ifndef NO_STRING_ORIGIN @@ -328,15 +323,14 @@ t[9]-t[3] #endif problem_source->cstr(), e.comment(), - e.type()?e.type():"-" + e.type() ); else SAPI::log(pool(), "%s: " "%s [%s]", info.uri, - e.comment(), - e.type()?e.type():"-" + e.comment(), e.type() ); // reset language to default @@ -399,8 +393,7 @@ t[9]-t[3] // 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) { + if(const String *problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) @@ -412,9 +405,9 @@ t[9]-t[3] printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", problem_source->cstr()); } - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", - e.comment()); - if(const char *type=e.type()) + if(const char *comment=e.comment(true)) + printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); + if(const char *type=e.type(true)) printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type); // future $response:content-type @@ -481,17 +474,31 @@ VStateless_class *Request::use_file(cons if(!source) return base_class; - return use_buf(source, file_spec->cstr(), 0/*new class*/, name, base_class); + return use_buf(source, *file_spec, file_spec->cstr(), 0/*new class*/, name, base_class); } -VStateless_class *Request::use_buf(const char *source, const char *file, + +VStateless_class *Request::use_buf(const char *source, + const String& filespec, const char *filespec_cstr, VStateless_class *aclass, const String *name, VStateless_class *base_class) { // compile loaded class - VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file); + VStateless_class& cclass=COMPILE(source, aclass, name, base_class, filespec_cstr); + + VString *vfilespec=NEW VString(filespec); - // locate and execute possible @auto[] static method - execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); + // locate and execute possible @conf[] static + const Method *method_called; + execute_nonvirtual_method(cclass, + *conf_method_name, vfilespec, + 0/*no result needed*/, &method_called); + if(method_called) + configure_admin(cclass, &method_called->name); + + // locate and execute possible @auto[] static + execute_nonvirtual_method(cclass, + *auto_method_name, vfilespec, + 0/*no result needed*/); return &cclass; } @@ -588,7 +595,7 @@ const String& Request::mime_type_of(cons else throw Exception("parser.runtime", mime_types->origin_string(), - "MIME-TYPE table column elements must not be empty"); + MIME_TYPES_NAME " table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); }