--- parser3/src/classes/table.C	2001/04/28 13:49:14	1.67
+++ parser3/src/classes/table.C	2001/05/07 13:29:47	1.71
@@ -5,14 +5,14 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.67 2001/04/28 13:49:14 paf Exp $
+	$Id: table.C,v 1.71 2001/05/07 13:29:47 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
 #include "pcre.h"
 
-#include "pa_methoded.h"
+#include "classes.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
@@ -28,13 +28,13 @@
 
 class MTable : public Methoded {
 public: // VStateless_class
-	
 	Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); }
 
 public:
 	MTable(Pool& pool);
-	bool used_directly() { return true; }
 
+public: // Methoded
+	bool used_directly() { return true; }
 };
 
 // methods
@@ -411,7 +411,6 @@ static void _join(Request& r, const Stri
 	}
 }
 
-/// ^table:sql{query}[(count[;offset])]
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -487,8 +486,6 @@ static void _sql(Request& r, const Strin
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
-/// ^table:dir[path]
-/// ^table:dir[path][regexp]
 static void _dir(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -548,7 +545,7 @@ static void _dir(Request& r, const Strin
 			char *file_name_cstr=(char *)r.malloc(file_name_size);
 			memcpy(file_name_cstr, ffblk.ff_name, file_name_size);
 			String &file_name=*new(pool) String(pool);
-			file_name.APPEND_TAINTED(file_name_cstr, file_name_size, 
+			file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME,
 				method_name.origin().file, method_name.origin().line);
 		
 			Array& row=*new(pool) Array(pool);