--- parser3/src/main/pa_request.C 2003/02/17 11:42:32 1.245.2.22 +++ parser3/src/main/pa_request.C 2003/03/07 14:56:59 1.245.2.31 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/02/17 11:42:32 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/03/07 14:56:59 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -16,6 +16,10 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" +#include "pa_venv.h" +#include "pa_vmath.h" +#include "pa_vstatus.h" +#include "pa_vrequest.h" #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" @@ -79,7 +83,7 @@ VHashPtr exception2vhash(Pool& pool, con // Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, - uchar adefault_lang, bool status_allowed): + String_UL adefault_lang, bool status_allowed): // private fpool(apool), anti_endless_execute_recoursion(0), @@ -109,6 +113,9 @@ Request::Request(Pool& apool, SAPI_Info& response(new VResponse(fpool, arequest_info, charsets)), cookie(new VCookie), + // private + configure_admin_done(false), + // private defaults fdefault_lang(adefault_lang), // private mime types @@ -122,12 +129,12 @@ Request::Request(Pool& apool, SAPI_Info& classes().put(main_class->name(), main_class); // classes: // table, file, random, mail, image, ... - methoded_array.register_directly_used(*this); + methoded_array().register_directly_used(*this); /// methodless // env class classes().put(StringPtr(new String(ENV_CLASS_NAME)), - ValuePtr(new VEnv(asapi_info))); + ValuePtr(new VEnv(pool(), asapi_info))); // status class if(status_allowed) classes().put(StringPtr(new String(STATUS_CLASS_NAME)), @@ -149,7 +156,7 @@ Request::Request(Pool& apool, SAPI_Info& classes().put(mail->get_class()->base_class()->name(), mail); // math class { - ValuePtr math(new VMail); + ValuePtr math(new VMath); classes().put(math->get_class()->base_class()->name(), math); } } @@ -158,7 +165,7 @@ Request::~Request() { #ifdef XML // if for some strange reason xml generic errors failed to be reported, free them up if(const char* xml_generic_errors=xmlGenericErrors()) { - SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors); + SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors); free((void *)xml_generic_errors); } #endif @@ -196,7 +203,7 @@ void Request::configure_admin(VStateless // configure method_frame options // until someone with less privileges have overriden them - methoded_array.configure_admin(*this); + methoded_array().configure_admin(*this); } /** @@ -271,7 +278,7 @@ gettimeofday(&mt[0],NULL); configure_admin(*main_class, StringPtr(0)); // configure not-method_frame=user options - methoded_array.configure_user(*this); + methoded_array().configure_user(*this); // $MAIN:MIME-TYPES if(ValuePtr element=main_class->get_element(mime_types_name, *main_class, false)) @@ -311,7 +318,7 @@ gettimeofday(&mt[2],NULL); if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); + VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); frame.ref(); frame.set_self(main_class); frame.store_param(body_vstring_before_post_process); @@ -409,20 +416,20 @@ t[9]-t[3] if(const Method *method=junction->method) { // preparing to pass parameters to // @unhandled_exception[exception;stack] - VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); + VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); frame.ref(); frame.set_self(main_class); // $exception frame.store_param(exception2vhash(pool(), e)); // $stack[^table::set{name origin}] - Table::columns_type stack_trace_columns; + Table::columns_type stack_trace_columns(new ArrayString); *stack_trace_columns+=StringPtr(new String("name")); *stack_trace_columns+=StringPtr(new String("file")); *stack_trace_columns+=StringPtr(new String("lineno")); TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); Array_iterator tracei(exception_trace); while(tracei.has_next()) { - Table::element_type row; + Table::element_type row(new ArrayString); StringPtr name=tracei.next(); *row+=name; // name column @@ -430,9 +437,9 @@ t[9]-t[3] const String_fragment::Origin& origin=name->origin(); if(origin.file) { *row+=StringPtr(new String(origin.file, 0, true)); // file column - char *buf=(char *)malloc(MAX_NUMBER); - size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); - *row+=StringPtr(new String(buf, buf_size, true)); // line column + *row+=StringPtr(new String( + pool().format_integer(1+origin.line), + 0, true)); // line column } #endif *stack_trace+=row; @@ -450,7 +457,7 @@ t[9]-t[3] // doing that ugly // make up result: $origin $source $comment $type $code - char *buf=(char *)malloc(MAX_STRING); + char *buf=new(pool()) char[MAX_STRING]; size_t printed=0; if(StringPtr problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN @@ -551,12 +558,11 @@ VStateless_classPtr Request::use_buf(VSt // locate and execute possible @conf[] static VStringPtr vfilespec(new VString(filespec)); - const Method *method_called; - execute_nonvirtual_method(cclass, + Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, - false/*no result needed*/, &method_called); - if(method_called) - configure_admin(cclass, method_called->name); + false/*no string result needed*/); + if(executed.method) + configure_admin(cclass, executed.method->name); // locate and execute possible @auto[] static execute_nonvirtual_method(cclass, @@ -675,3 +681,31 @@ StringPtr Request::mime_type_of(const ch bool Request::origins_mode() { return main_class->get_element(origins_mode_name, *main_class, false)!=0; // $ORIGINS mode } + +GdomeDOMString_auto_ptr Request::transcode(StringPtr s) { + return charsets.source().transcode(s); +} + +StringPtr Request::transcode(GdomeDOMString* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ) { + return charsets.source().transcode(pool(), s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); +} + +StringPtr Request::transcode(xmlChar* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ) { + return charsets.source().transcode(pool(), s +#ifndef NO_STRING_ORIGIN + , origin +#endif + ); +}