--- parser3/src/include/pa_request.h 2001/03/20 18:24:43 1.64.2.3 +++ parser3/src/include/pa_request.h 2001/03/24 10:59:47 1.68 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.h,v 1.64.2.3 2001/03/20 18:24:43 paf Exp $ + $Id: pa_request.h,v 1.68 2001/03/24 10:59:47 paf Exp $ */ #ifndef PA_REQUEST_H @@ -70,10 +70,17 @@ public: /// global classes Hash& classes() { return fclasses; } - /// core request processing - void core(Exception& system_exception, - const char *sys_auto_path1, - const char *sys_auto_path2); + /** + core request processing + + 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 + bool header_only); /// executes ops void execute(const Array& ops); @@ -157,6 +164,9 @@ private: // core data // classes Hash fclasses; + // already used files to avoid cyclic uses + Hash used_files; + // execution stack Stack stack; @@ -180,7 +190,7 @@ private: // lang&raw private: // defaults const String::Untaint_lang fdefault_lang; - Value *fdefault_content_type; + Value *default_content_type; private: // lang manipulation @@ -195,7 +205,7 @@ private: // lang manipulation private: - void output_result(const String& body_string); + void output_result(const String& body_string, bool header_only); }; /// Auto-object used for temporary changing Request::flang.