--- parser3/src/main/pa_request.C	2002/04/18 14:35:13	1.203
+++ parser3/src/main/pa_request.C	2002/04/29 05:59:33	1.205
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.C,v 1.203 2002/04/18 14:35:13 paf Exp $
+	$Id: pa_request.C,v 1.205 2002/04/29 05:59:33 paf Exp $
 */
 
 #include "pa_sapi.h"
@@ -265,17 +265,17 @@ gettimeofday(&mt[2],NULL);
 						NEW VString(execute_method(frame, *method));
 				}
 
-		bool origins_mode=main_class->get_element(*origins_mode_name)!=0;
+		bool lorigins_mode=origins_mode();
 
 		const VFile *body_file=body_vstring_after_post_process->as_vfile(
-			String::UL_UNSPECIFIED, origins_mode);
+			String::UL_UNSPECIFIED, lorigins_mode);
 
 		// extract response body
 		Value *body_value=static_cast<Value *>(
 			response.fields().get(*body_name));
 		if(body_value) // there is some $response.body
 			body_file=body_value->as_vfile();
-		else if(origins_mode)
+		else if(lorigins_mode)
 			response.fields().put(*content_type_name, 
 				NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE)));
 
@@ -309,8 +309,7 @@ t[9]-t[3]
 		// we're returning not result, but error explanation
 		try {
 			// log the beast
-			const String *problem_source=e.problem_source();
-			if(problem_source && problem_source->size())
+			if(const String *problem_source=e.problem_source())
 				SAPI::log(pool(),
 					"%s: "
 #ifndef NO_STRING_ORIGIN
@@ -394,8 +393,7 @@ t[9]-t[3]
 				// make up result: $origin $source $comment $type $code
 				char *buf=(char *)malloc(MAX_STRING);
 				size_t printed=0;
-				const String *problem_source=e.problem_source();
-				if(problem_source) {
+				if(const String *problem_source=e.problem_source()) {
 #ifndef NO_STRING_ORIGIN
 					const Origin& origin=problem_source->origin();
 					if(origin.file)