--- parser3/src/include/pa_request.h 2009/07/29 05:01:46 1.196 +++ parser3/src/include/pa_request.h 2010/05/20 04:35:59 1.199 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2009/07/29 05:01:46 $"; +static const char * const IDENT_REQUEST_H="$Date: 2010/05/20 04:35:59 $"; #include "pa_pool.h" #include "pa_hash.h" @@ -189,6 +189,7 @@ public: /// global classes HashString& classes() { return fclasses; } + Value* get_class(const String& name); /** core request processing @@ -218,13 +219,17 @@ public: anti_endless_execute_recoursion--; } + /// + void use_file_directly(VStateless_class& aclass, + const String& file_spec, + bool fail_on_read_problem=true, + bool fail_on_file_absence=true); // pa_request.C + /// compiles the file, maybe forcing it's class @a name and @a base_class. void use_file(VStateless_class& aclass, - const String& file_name, - const String* main_alias=0, - bool ignore_class_path=false, - bool fail_on_read_problem=true, - bool fail_on_file_absence=true); // pa_request.C + const String& file_name, + const String* use_filespec); // pa_request.C + /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, @@ -243,7 +248,8 @@ public: return process(input_value, intercept_string).as_value(); } //@} - + const String* get_method_filename(const Method* method); + const String* get_used_filename(uint file_no); #define DEFINE_DUAL(modification) \ void write_##modification##_lang(StringOrValue dual) { \ @@ -529,12 +535,6 @@ public: // defines for externs -#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding" -#define CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_ATTACHMENT "attachment" -#define CONTENT_DISPOSITION_INLINE "inline" -#define CONTENT_DISPOSITION_FILENAME_NAME "filename" - #define EXCEPTION_HANDLED_PART_NAME "handled" @@ -544,12 +544,6 @@ 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_attachment; -extern const String content_disposition_inline; -extern const String content_disposition_filename_name; - extern const String exception_type_part_name; extern const String exception_source_part_name; extern const String exception_comment_part_name;