--- parser3/src/classes/file.C	2001/04/17 19:00:27	1.27
+++ parser3/src/classes/file.C	2001/04/28 15:22:38	1.35
@@ -5,11 +5,11 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.27 2001/04/17 19:00:27 paf Exp $
+	$Id: file.C,v 1.35 2001/04/28 15:22:38 paf Exp $
 */
 
+#include "classes.h"
 #include "pa_request.h"
-#include "_file.h"
 #include "pa_vfile.h"
 #include "pa_table.h"
 #include "pa_vint.h"
@@ -17,11 +17,28 @@
 
 // consts
 
-const int FIND_MONKEY_MAX_HOPS=10;
+// defines
+
+#define FILE_CLASS_NAME "file"
+
+// class
+
+class MFile : public Methoded {
+public: // VStateless_class
+	
+	Value *create_new_value(Pool& pool) { return new(pool) VFile(pool); }
+
+public: // Methoded
+	bool used_directly() { return true; }
 
-// global var
+public:
+	MFile(Pool& pool);
 
-VStateless_class *file_class;
+};
+
+// consts
+
+const int FIND_MONKEY_MAX_HOPS=10;
 
 // methods
 
@@ -102,10 +119,21 @@ static void append_env_pair(const Hash::
 	Hash& hash=*static_cast<Hash *>(info);
 	hash.put(key, &static_cast<Value *>(value)->as_string());
 }
-/// ^exec[file-name]
-/// ^exec[file-name;env hash]
-/// ^exec[file-name;env hash;cmd;line;arg;s]
-/// @test header to $fields. waits for header '\' tricks
+
+static void pass_cgi_header_attribute(Array::Item *value, void *info) {
+	String& string=*static_cast<String *>(value);
+	Hash& hash=*static_cast<Hash *>(info);
+	int colon_pos=string.pos(":", 1);
+	if(colon_pos>0)
+		hash.put(string.mid(0, colon_pos), 
+		new(string.pool()) VString(string.mid(colon_pos+1, string.size())));
+}
+/**
+	^exec[file-name]
+	^exec[file-name;env hash]
+	^exec[file-name;env hash;cmd;line;arg;s]
+	@todo fix `` in perl - they produced flipping consoles and no output to perl
+*/
 static void _cgi(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -176,16 +204,20 @@ static void _cgi(Request& r, const Strin
 
 	const String in(pool, r.post_data, r.post_size);
 	String out(pool);
+	//out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body");
+	//out<<in;
 	String& err=*new(pool) String(pool);
-	int exit_code=pa_exec(script_name, &env, argv,
-		in, out, err);
+	int exit_code=pa_exec(script_name, &env, argv, in, out, err);
 
 	VFile& self=*static_cast<VFile *>(r.self);
 	// construct with 'out' body and header
 	int delim_size;
-	int pos=out.pos("\n\n", delim_size=2);
-	if(pos<0)
-		pos=out.pos("\r\n\r\n", delim_size=4);
+	const char *eol_marker="\r\n"; size_t eol_marker_size=2;
+	int pos=out.pos("\r\n\r\n", delim_size=4);
+	if(pos<0) {
+		eol_marker="\n"; eol_marker_size=1;
+		pos=out.pos("\n\n", delim_size=2);
+	}
 	if(pos<0) {
 		delim_size=0; // calm down, compiler
 		PTHROW(0, 0,
@@ -200,7 +232,12 @@ static void _cgi(Request& r, const Strin
 	// body
 	self.set(false/*not tainted*/, body.cstr(String::UL_AS_IS), body.size());
 
-	// todo header to $fields. waits for header '\' tricks
+	// header to $fields
+	{
+		Array rows(pool);
+		header.split(rows, 0, eol_marker, eol_marker_size, String::UL_CLEAN);
+		rows.for_each(pass_cgi_header_attribute, &self.fields());
+	}
 
 	// $exit-code
 	self.fields().put(
@@ -217,28 +254,41 @@ static void _cgi(Request& r, const Strin
 	}
 }
 
-// initialize
+// constructor
+
+MFile::MFile(Pool& apool) : Methoded(apool) {
+	set_name(*NEW String(pool(), FILE_CLASS_NAME));
+
 
-void initialize_file_class(Pool& pool, VStateless_class& vclass) {
 	// ^save[file-name]
-	vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
 
 	// ^delete[file-name]
-	vclass.add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
+	add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
 
 	// ^find[file-name]
 	// ^find[file-name]{when-not-found}
-	vclass.add_native_method("find", Method::CT_STATIC, _find, 1, 2);
+	add_native_method("find", Method::CT_STATIC, _find, 1, 2);
 
 	// ^load[disk-name]
 	// ^load[disk-name;user-name]
-	vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
 
 	// ^stat[disk-name]
-	vclass.add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);
+	add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);
 
 	// ^exec[file-name]
 	// ^exec[file-name;env hash]
 	// ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]
-	vclass.add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5);
+	add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5);
+}
+
+// global variable
+
+Methoded *file_class;
+
+// creator
+
+Methoded *MFile_create(Pool& pool) {
+	return file_class=new(pool) MFile(pool);
 }