--- parser3/src/classes/file.C	2001/03/28 09:38:06	1.9
+++ parser3/src/classes/file.C	2001/04/03 05:23:36	1.15
@@ -3,12 +3,13 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.9 2001/03/28 09:38:06 paf Exp $
+	$Id: file.C,v 1.15 2001/04/03 05:23:36 paf Exp $
 */
 
 #include "pa_request.h"
 #include "_file.h"
 #include "pa_vfile.h"
+#include "pa_table.h"
 
 // consts
 
@@ -79,7 +80,7 @@ static void _find(Request& r, const Stri
 		String test_name(pool);
 		for(int j=0; j<i; j++)
 			test_name.APPEND_CONST("../");
-		test_name.append(lfile_name, String::UL_NO);
+		test_name.append(lfile_name, String::UL_CLEAN);
 		if(file_readable(r.absolute(test_name))) {
 			r.write_no_lang(*new(pool) VString(*new(pool) String(test_name)));
 			return;
@@ -100,8 +101,7 @@ static void _load(Request& r, const Stri
 	Pool& pool=r.pool();
 	Value& vfile_name=*static_cast<Value *>(params->get(0));
 
-	// forcing
-	// ^load[this body type]
+	// forcing ^load[this body type]
 	r.fail_if_junction_(true, vfile_name, 
 		method_name, "file name must not be junction");
 
@@ -110,30 +110,50 @@ static void _load(Request& r, const Stri
 	lfile_name.append(vfile_name.as_string(),
 		String::UL_FILE_NAME, true);
 
-	void *data;
-	size_t size;
+	void *data;  size_t size;
 	file_read(pool, r.absolute(lfile_name), data, size, false/*binary*/);
 
 	char *user_file_name=params->size()==1?lfile_name.cstr()
 		:static_cast<Value *>(params->get(1))->as_string().cstr();
-	r.write_no_lang(*new(pool) VFile(pool, data, size, user_file_name));
+	
+	const String *mime_type=0;
+	if(params->size()==3)
+		mime_type=&static_cast<Value *>(params->get(2))->as_string();
+	else {
+		if(r.mime_types) {
+			if(char *cext=strrchr(user_file_name, '.')) {
+				cext++;
+				String sext(pool, cext);
+				if(r.mime_types->locate(0, sext))
+					if(!(mime_type=r.mime_types->item(1)))
+						PTHROW(0, 0,
+						r.mime_types->origin_string(),
+						"MIME-TYPE table column elements must not be empty");
+			}
+		}
+	}
+
+	if(!mime_type)
+		mime_type=new(pool) String(pool, "application/octet-stream");
+
+	static_cast<VFile *>(r.self)->set(data, size, user_file_name, mime_type);
 }
 
 // initialize
 
 void initialize_file_class(Pool& pool, VStateless_class& vclass) {
 	// ^save[file-name]
-	vclass.add_native_method("save", _save, 1, 1);
+	vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
 
 	// ^delete[file-name]
-	vclass.add_native_method("delete", _delete, 1, 1);
+	vclass.add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
 
 	// ^find[file-name]
 	// ^find[file-name]{when-not-found}
-	vclass.add_native_method("find", _find, 1, 2);
+	vclass.add_native_method("find", Method::CT_STATIC, _find, 1, 2);
 
 	// ^load[disk-name]
 	// ^load[disk-name;user-name]
-	// TODO:^load[disk-name;user-name;content-type]
-	vclass.add_native_method("load", _load, 1, 2);
+	// ^load[disk-name;user-name;mime-type]
+	vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 3);
 }