--- parser3/src/include/pa_request.h 2001/07/13 12:13:50 1.92 +++ parser3/src/include/pa_request.h 2001/10/15 11:48:04 1.103 @@ -2,10 +2,9 @@ Parser: request class decl. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.h,v 1.92 2001/07/13 12:13:50 parser Exp $ + $Id: pa_request.h,v 1.103 2001/10/15 11:48:04 parser Exp $ */ #ifndef PA_REQUEST_H @@ -81,10 +80,10 @@ public: BEWARE: may throw exception to you: catch it! */ void core( - const char *root_auto_path, ///< path to system auto.p file - bool root_auto_fail, ///< fail if system auto.p file not found - const char *site_auto_path, ///< path to site auto.p file - bool site_auto_fail, ///< fail if site auto.p file not found + const char *root_config_filespec, ///< system config filespec + bool root_config_fail_on_read_problem, ///< fail if system config file not found + const char *site_config_filespec, ///< site config filespec + bool site_config_fail_on_read_problem, ///< fail if site config file not found bool header_only); /// executes ops @@ -92,7 +91,8 @@ public: /// compiles the file, maybe forcing it's class @a name and @a base_class. VStateless_class *use_file( - const String& file_spec, bool fail_on_read_problem=true, + const String& file_name, + bool ignore_class_path=false, bool fail_on_read_problem=true, const String *name=0, VStateless_class *base_class=0); // core.C /// compiles a @a source buffer @@ -140,6 +140,9 @@ public: /// returns the mime type of 'user_file_name_cstr' const String& mime_type_of(const char *user_file_name_cstr); + /// PCRE character tables + const unsigned char *pcre_tables(); + public: /// info from web server @@ -172,13 +175,10 @@ public: /// connection SQL_Connection *connection; - /// PCRE character tables - unsigned char *pcre_tables; /// classes configured data Hash classes_conf; - private: // core data /// classes @@ -195,6 +195,9 @@ private: // core data */ uint anti_endless_execute_recoursion; + /// charset->pcre_tables + Hash CTYPE; + private: // compile.C VStateless_class& real_compile(COMPILE_PARAMS); @@ -205,7 +208,7 @@ private: // execute.C const Method& method, bool return_cstr=true); const String *execute_virtual_method(Value& aself, const String& method_name, bool return_cstr=true); - const String *execute_nonvirtual_method(VStateless_class& aself, + const String *execute_nonvirtual_method(VStateless_class& aclass, const String& method_name, bool return_cstr=true); Value *get_element(); @@ -278,12 +281,16 @@ public: return get_as(index, false, msg); } /// handy expression auto-processing to double - double as_double(int index, Request& r) { - return get_processed(index, r).as_double(); + double as_double(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_double(); } /// handy expression auto-processing to int - int as_int(int index, Request& r) { - return get_processed(index, r).as_int(); + int as_int(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_int(); + } + /// handy expression auto-processing to bool + bool as_bool(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_bool(); } /// handy string ensurer const String& as_string(int index, const char *msg) { @@ -302,8 +309,8 @@ private: return result; } - Value& get_processed(int index, Request& r) { - return r.process(get(index), + Value& get_processed(int index, const char *msg, Request& r) { + return r.process(as_junction(index, msg), 0/*no name*/, false/*don't intercept string*/); }