--- parser3/src/main/pa_request.C 2001/03/18 16:32:25 1.46 +++ parser3/src/main/pa_request.C 2001/03/23 10:27:31 1.69 @@ -1,19 +1,21 @@ -/* - Parser +/** @file + 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.46 2001/03/18 16:32:25 paf Exp $ + $Id: pa_request.C,v 1.69 2001/03/23 10:27:31 paf Exp $ */ #include +#include "pa_sapi.h" +#include "pa_common.h" #include "pa_request.h" #include "pa_wwrapper.h" -#include "pa_common.h" #include "pa_vclass.h" #include "_root.h" -#include "_env.h" #include "_table.h" #include "pa_globals.h" #include "pa_vint.h" @@ -29,6 +31,7 @@ Request::Request(Pool& apool, form(apool), request(apool, *this), response(apool), + cookie(apool), fclasses(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), @@ -41,7 +44,6 @@ Request::Request(Pool& apool, classes().put(*root_class_name, &ROOT); // table class classes().put(*table_class_name, table_class); -// table_class->set_name(*table_class_name); // env class classes().put(*env_class_name, &env); @@ -51,54 +53,56 @@ Request::Request(Pool& apool, classes().put(*request_class_name, &request); // response class classes().put(*response_class_name, &response); + // cookie class + classes().put(*cookie_class_name, &cookie); } -void output_response_attribute(const Hash::Key& akey, Hash::Value *avalue, void *info) { - String *key_to_exclude=static_cast(info); - if(akey==*key_to_exclude || !avalue) +static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, + void *info) { + String *attribute_to_exclude=static_cast(info); + if(aattribute==*attribute_to_exclude) return; - String key(akey); - key.change_lang(String::Untaint_lang::URI); - - String value=static_cast(avalue)->as_string(); - value.change_lang(String::Untaint_lang::URI); + Value& lmeaning=*static_cast(ameaning); + Pool& pool=lmeaning.pool(); - (*service_funcs.output_header_attribute)( - key.cstr(), - value.cstr()); + String attribute(pool); + SAPI::add_header_attribute(pool, + attribute.append(aattribute, String::UL_HEADER, true).cstr(), + attributed_meaning_to_string(lmeaning).cstr()); } -void Request::core(Exception& system_exception, - const char *sys_auto_path1, - const char *sys_auto_path2) { +/** + load MAIN class, execute @main. + MAIN class 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' +*/ +void Request::core(const char *root_auto_path, bool root_auto_fail, + const char *site_auto_path, bool site_auto_fail, + bool header_only) { VStateless_class *main_class=0; bool need_rethrow=false; Exception rethrow_me; TRY { 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); + // loading root auto.p + if(root_auto_path) { + strncpy(auto_filespec, root_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME)); + strcat(auto_filespec, "/" AUTO_FILE_NAME); main_class=use_file( - auto_filespec, false/*ignore possible read problem*/, + auto_filespec, root_auto_fail, main_class_name, main_class); } - // 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); + // loading site auto.p + if(site_auto_path) { + strncpy(auto_filespec, site_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME)); + strcat(auto_filespec, "/" AUTO_FILE_NAME); main_class=use_file( - auto_filespec, false/*ignore possible read problem*/, + auto_filespec, site_auto_fail, main_class_name, main_class); } @@ -112,6 +116,7 @@ void Request::core(Exception& system_exc int post_max_size=value?value:10*0x400*400; form.fill_fields(*this, post_max_size); + cookie.fill_fields(*this); // TODO: load site auto.p files, all assigned bases from upper dir /*char *site_auto_file="Y:\\parser3\\src\\auto.p"; @@ -121,15 +126,7 @@ void Request::core(Exception& system_exc // $MAIN:defaults Value *defaults=main_class?main_class->get_element(*defaults_name):0; - // $defaults.content-type - element=defaults?defaults->get_element(*content_type_name):0; - response.fields().put(*content_type_name, fdefault_content_type=element); - - // there must be some auto.p - if(!main_class) - THROW(0,0, - 0, - "no 'auto.p' found (nither system nor any site's)"); + fdefault_content_type=defaults?defaults->get_element(*content_type_name):0; // compiling requested file main_class=use_file(info.path_translated, true/*don't ignore read problem*/, @@ -149,7 +146,7 @@ void Request::core(Exception& system_exc body_string=&body_value->as_string();// TODO: IMAGE&FILE // OK. write out the result - output_result(*body_string); + output_result(*body_string, header_only); } CATCH(e) { TRY { @@ -161,9 +158,6 @@ void Request::core(Exception& system_exc // reset response response.fields().clear(); - // this is what we'd return in $response:content-type - Value *content_type; - // this is what we'd return in $response:body const String *body_string=0; @@ -202,8 +196,9 @@ void Request::core(Exception& system_exc String source_name(pool(), "source"); Value *source_value=0; if(problem_source) { - String& problem_source_copy=*NEW String(*problem_source); - problem_source_copy.change_lang(flang); + String& problem_source_copy=*NEW String(pool()); + problem_source_copy.append(*problem_source, + flang, true); source_value=NEW VString(problem_source_copy); } frame.store_param(source_name, @@ -220,9 +215,9 @@ void Request::core(Exception& system_exc String type_name(pool(), "type"); Value *type_value; if(e.type()) { - String& type_copy=*NEW String(*e.type()); - type_copy.change_lang(flang); - type_value=NEW VString(type_copy); + String& type_copy=*NEW String(pool()); + type_value=NEW VString(type_copy.append(*e.type(), + flang, true)); } else type_value=NEW VUnknown(pool()); frame.store_param(type_name, type_value); @@ -231,16 +226,13 @@ void Request::core(Exception& system_exc String code_name(pool(), "code"); Value *code_value; if(e.code()) { - String& code_copy=*NEW String(*e.code()); - code_copy.change_lang(flang); - code_value=NEW VString(code_copy); + String& code_copy=*NEW String(pool()); + code_value=NEW VString(code_copy.append(*e.code(), + flang, true)); } else code_value=NEW VUnknown(pool()); frame.store_param(code_name, code_value); - // future $response:content-type= - // content-type from any auto.p - content_type=fdefault_content_type; // future $response:body= // execute ^exception[origin;source;comment;type;code] body_string=execute_method(frame, *method); @@ -277,17 +269,14 @@ void Request::core(Exception& system_exc } // future $response:content-type - String &content_type_value=*NEW String(pool(), "text/plain"); - content_type=NEW VString(content_type_value); + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), "text/plain"))); // future $response:body body_string=NEW String(pool(), buf); } - // set $response:content-type - response.fields().put(*content_type_name, content_type); - // ERROR. write it out - output_result(*body_string); + output_result(*body_string, header_only); } CATCH(e) { // exception in request exception handler @@ -300,26 +289,24 @@ void Request::core(Exception& system_exc // any throw() would try to use zero exception() pointer if(need_rethrow) // there were an exception set for us to rethrow? - system_exception._throw(rethrow_me.type(), rethrow_me.code(), + THROW(rethrow_me.type(), rethrow_me.code(), rethrow_me.problem_source(), rethrow_me.comment()); } -VStateless_class *Request::use_file( - const char *file, bool fail_on_read_problem, +/// @todo find|solve cyclic dependences +VStateless_class *Request::use_file(const char *file, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { - // TODO: обнаружить|решить cyclic dependences - char *source=file_read(pool(), file, fail_on_read_problem); + char *source=file_read_text(pool(), file, fail_on_read_problem); if(!source) return base_class; return use_buf(source, file, 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 char *file, VStateless_class *aclass, const String *name, VStateless_class *base_class) { // compile loaded class @@ -330,11 +317,13 @@ VStateless_class *Request::use_buf( return &cclass; } -void Request::fail_if_junction_(bool is, - Value& value, const String& method_name, char *msg) { +/** + - fail_if_junction(true, junction = fail + - fail_if_junction(false, not junction = fail +*/ +void Request::fail_if_junction_(bool is, Value& value, + const String& method_name, const char *msg) { - // fail_if_junction(true, junction = fail - // fail_if_junction(false, not junction = fail if((value.get_junction()!=0) ^ !is) THROW(0, 0, &method_name, @@ -344,8 +333,8 @@ 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, PATH_DELIMITER_CHAR); - strcat(result, PATH_DELIMITER_STRING); + rsplit(result, '/'); + strcat(result, "/"); strcat(result, file); return result; } @@ -357,20 +346,35 @@ char *Request::absolute(const char *name strcat(result, name); return result; } else - return relative(info.uri, name); + return relative(info.path_translated, name); } -void Request::output_result(const String& body_string) { - // header: response fields - response.fields().foreach(output_response_attribute, /*excluding*/ body_name); +void Request::output_result(const String& body_string, bool header_only) { + // header: cookies + cookie.output_result(); + + // set default content-type + if(fdefault_content_type) + response.fields().put_dont_replace(*content_type_name, fdefault_content_type); + + // prepare header: $response:fields without :body + response.fields().foreach(add_header_attribute, /*excluding*/ body_name); + + // prepare... const char *body=body_string.cstr(); - if(size_t content_length=strlen(body)) { - // header: content-length + size_t content_length=strlen(body); + + // prepare header: content-length + if(content_length) { // useful for redirecting [header "location: http://..."] char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); - (*service_funcs.output_header_attribute)("content-length", - content_length_cstr); - // body - (*service_funcs.output_body)(body, content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); } -} \ No newline at end of file + + // send header + SAPI::send_header(pool()); + + // send body + if(!header_only) + SAPI::send_body(pool(), body, content_length); +}