--- parser3/src/classes/table.C	2001/03/20 07:34:30	1.22
+++ parser3/src/classes/table.C	2001/03/24 15:57:57	1.25
@@ -5,10 +5,10 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.22 2001/03/20 07:34:30 paf Exp $
+	$Id: table.C,v 1.25 2001/03/24 15:57:57 paf Exp $
 */
 
-#include <string.h>
+#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "_table.h"
@@ -35,21 +35,18 @@ static void set_or_load(
 		method_name, is_load?"file name must not be junction":"body must be junction");
 
 	// data or file_name
-	char *ldata_or_filename;
+	char *data;
 	if(is_load) {
 		// forcing untaint language
 		String lfile_name(pool);
-		lfile_name.append(vdata_or_filename->as_string(),
-			String::Untaint_lang::FILE_NAME, true);
-		ldata_or_filename=lfile_name.cstr();
+		lfile_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true);
+		// loading text
+		data=file_read_text(pool, r.absolute(lfile_name));
 	} else {
 		// suggesting untaint language
-		Temp_lang temp_lang(r, String::Untaint_lang::TABLE);
-		ldata_or_filename=r.process(*vdata_or_filename).as_string().cstr();
+		Temp_lang temp_lang(r, String::UL_TABLE);
+		data=r.process(*vdata_or_filename).as_string().cstr();
 	}
-	// data
-	char *data=is_load?
-		file_read_text(pool, r.absolute(ldata_or_filename)/*\, false*/):ldata_or_filename;
 
 	// parse columns
 	Array *columns;
@@ -109,7 +106,7 @@ static void _save(Request& r, const Stri
 	// forcing untaint language
 	String lfile_name(pool);
 	lfile_name.append(vfile_name->as_string(),
-		String::Untaint_lang::FILE_NAME, true);
+		String::UL_FILE_NAME, true);
 
 	Table& table=static_cast<VTable *>(r.self)->table();
 
@@ -121,7 +118,7 @@ static void _save(Request& r, const Stri
 				if(column)
 					sdata.APPEND_CONST("\t");
 				sdata.append(*static_cast<String *>(columns->quick_get(column)), 
-					String::Untaint_lang::TABLE);
+					String::UL_TABLE);
 			}
 		} else { // nameless table
 			int size=table.size()?static_cast<Array *>(table.get(0))->size():0;
@@ -143,14 +140,14 @@ static void _save(Request& r, const Stri
 			if(column)
 				sdata.APPEND_CONST("\t");
 			sdata.append(*static_cast<String *>(row->quick_get(column)), 
-				String::Untaint_lang::TABLE);
+				String::UL_TABLE);
 		}
 		sdata.APPEND_CONST("\n");
 	}
 
 	// write
 	char *cdata=sdata.cstr();
-	file_write(pool, r.absolute(lfile_name.cstr()), cdata, strlen(cdata), true, true);
+	file_write(pool, r.absolute(lfile_name), cdata, strlen(cdata), true);
 }
 
 static void _count(Request& r, const String&, Array *) {