--- parser3/src/include/pa_request.h 2005/08/09 08:14:50 1.179 +++ parser3/src/include/pa_request.h 2009/05/04 09:26:08 1.192 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2005/08/09 08:14:50 $"; +static const char * const IDENT_REQUEST_H="$Date: 2009/05/04 09:26:08 $"; #include "pa_pool.h" #include "pa_hash.h" @@ -18,6 +18,7 @@ static const char * const IDENT_REQUEST_ #include "pa_request_info.h" #include "pa_request_charsets.h" #include "pa_sapi.h" +#include "pa_vconsole.h" #ifdef RESOURCES_DEBUG #include @@ -33,7 +34,6 @@ const size_t pseudo_file_no__process=1; class Temp_lang; class Methoded; class VMethodFrame; -class GdomeDOMString_auto_ptr; class VMail; class VForm; class VResponse; @@ -64,6 +64,12 @@ public: const Operation::Origin origin() const { return forigin; } }; + enum Skip { + SKIP_NOTHING, + SKIP_BREAK, + SKIP_CONTINUE + }; + private: Pool fpool; public: @@ -99,11 +105,11 @@ private: element_type bottom_value() { return get(bottom_index()); } void clear() { - ftop=fbottom=0; + fused=fbottom=0; } bool is_empty() { - return ftop==fbottom; + return fused==fbottom; } const element_type extract_origin(const String*& problem_source); @@ -145,6 +151,7 @@ public: //@} /// interrupted flag, raised on signals [SIGPIPE] bool finterrupted; + Skip fskip; public: uint register_file(String::Body file_spec); @@ -194,12 +201,14 @@ public: /// executes ops void execute(ArrayOperation& ops); // execute.C + void op_call(VMethodFrame &frame); + void op_call_write(VMethodFrame &frame); /// execute ops with anti-recoursion check void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) { // anti_endless_execute_recoursion if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { anti_endless_execute_recoursion=0; // give @exception a chance - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, //&name, "call canceled - endless recursion detected"); } @@ -223,6 +232,7 @@ public: /// processes any code-junction there may be inside of @a value StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C + void process_write(Value& input_value); // execute.C //@{ convinient helpers const String& process_to_string(Value& input_value) { return process(input_value, true/*intercept_string*/).as_string(); @@ -287,7 +297,7 @@ public: /// returns current SQL connection if any SQL_Connection* connection(bool fail_on_error=true) { if(fail_on_error && !fconnection) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "outside of 'connect' operator"); @@ -297,6 +307,9 @@ public: void set_interrupted(bool ainterrupted) { finterrupted=ainterrupted; } bool get_interrupted() { return finterrupted; } + void set_skip(Skip askip) { fskip=askip; } + Skip get_skip() { return fskip; } + public: /// info from web server @@ -318,6 +331,8 @@ public: VResponse& response; /// $cookie:elements VCookie& cookie; + /// $console + VConsole& console; /// classes configured data Hash classes_conf; @@ -343,7 +358,7 @@ public: // status read methods StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); //{ for @conf[filespec] and @auto[filespec] and parser://method/call const String* execute_method(Value& aself, - const Method& method, VString* optional_param, + const Method& method, Value* optional_param, bool do_return_string); struct Execute_nonvirtual_method_result { const String* string; @@ -351,7 +366,8 @@ public: // status read methods Execute_nonvirtual_method_result(): string(0), method(0) {} }; Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString* optional_param, + const String& method_name, + VString* optional_param, bool do_return_string); //} @@ -359,13 +375,11 @@ public: // status read methods public: // charset helpers /// @see Charset::transcode - GdomeDOMString_auto_ptr transcode(const String& s); + xmlChar* transcode(const String& s); /// @see Charset::transcode - GdomeDOMString_auto_ptr transcode(const String::Body s); + xmlChar* transcode(const String::Body s); /// @see Charset::transcode - const String& transcode(GdomeDOMString* s); - /// @see Charset::transcode - const String& transcode(xmlChar* s); + const String& transcode(const xmlChar* s); #endif @@ -380,15 +394,15 @@ private: private: // compile.C - VStateless_class& compile(VStateless_class* aclass, + ArrayClass& compile(VStateless_class* aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset); private: // execute.C - void put_element(Value& ncontext, const String& name, Value& value); - Value& get_element(Value& ncontext, const String& name, bool can_call_operator); + void put_element(Value& ncontext, const String& name, Value* value); + Value& get_element(Value& ncontext, const String& name); private: // defaults @@ -499,9 +513,12 @@ public: // defines for externs +#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding" #define CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_VALUE "attachment" +#define CONTENT_DISPOSITION_ATTACHMENT "attachment" +#define CONTENT_DISPOSITION_INLINE "inline" #define CONTENT_DISPOSITION_FILENAME_NAME "filename" + #define EXCEPTION_HANDLED_PART_NAME "handled" @@ -510,8 +527,11 @@ public: extern const String main_method_name; extern const String auto_method_name; extern const String body_name; + +extern const String content_transfer_encoding_name; extern const String content_disposition_name; -extern const String content_disposition_value; +extern const String content_disposition_attachment; +extern const String content_disposition_inline; extern const String content_disposition_filename_name; extern const String exception_type_part_name;