--- parser3/src/include/pa_common.h	2002/08/01 11:26:46	1.78
+++ parser3/src/include/pa_common.h	2003/01/24 08:19:09	1.89.2.2
@@ -1,18 +1,21 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char* IDENT_COMMON_H="$Id: pa_common.h,v 1.78 2002/08/01 11:26:46 paf Exp $";
+static const char* IDENT_COMMON_H="$Date: 2003/01/24 08:19:09 $";
 
 #include "pa_pool.h"
 #include "pa_string.h"
 
+template<typename K, typename V> class Hash;
+typedef Hash<ConstStringPtr, ConstStringPtr> StringHash;
+
 class Value;
 
 // replace system s*nprintf with our versions
@@ -89,23 +92,48 @@ void fix_line_breaks(
 					 size_t& size ///< may change! used to speedup next actions
 					 );
 
+typedef void (*File_read_action)(
+								 struct stat& finfo,
+								 int f, 
+								 ConstStringPtr file_spec, CharPtr fname, bool as_text,
+								 void *context);
+
+/**
+	shared-lock specified file, 
+	do actions under lock.
+	if fail_on_read_problem is true[default] throws an exception
+	
+	@returns true if read OK
+*/
+bool file_read_action_under_lock(ConstStringPtr file_spec, 
+				const char *action_name, File_read_action action, void *context,
+				bool as_text=false,
+				bool fail_on_read_problem=true);
 /**
 	read specified text file using pool, 
 	if fail_on_read_problem is true[default] throws an exception
+
+  	@returns true if read OK
 */
-char *file_read_text(Pool& pool, 
-					 const String& file_spec, 
-					 bool fail_on_read_problem=true);
+char *file_read_text(Pool& pool,
+					 ConstStringPtr file_spec, 
+					 bool fail_on_read_problem=true,
+					 StringHash* options=0, StringHash** out_fields=0);
 
 /**
 	read specified file using pool, 
 	if fail_on_read_problem is true[default] throws an exception
+
+	@returns true if read OK
 */
-bool file_read(Pool& pool, const String& file_spec, 
-			   void*& data, size_t& size, 
+bool file_read(Pool& pool,
+			   ConstStringPtr file_spec, 
+			   void *& ptr, size_t& size, 
 			   bool as_text,
-			   bool fail_on_read_problem=true,
-			   size_t offset=0, size_t limit=0);
+			   StringHash* options=0, StringHash** out_fields=0,
+			   bool fail_on_read_problem=true);
+
+typedef void (*File_write_action)(int f, void *context);
 
 /**
 	lock specified file exclusively, 
@@ -116,8 +144,8 @@ bool file_read(Pool& pool, const String&
 	@returns true if locked OK, or false if non-blocking locking failed
 */
 bool file_write_action_under_lock(
-				const String& file_spec, 
-				const char *action_name, void (*action)(int, void *), void *context=0,
+				ConstStringPtr file_spec, 
+				const char *action_name, File_write_action action, void *context,
 				bool as_text=false,
 				bool do_append=false,
 				bool do_block=true,
@@ -128,7 +156,7 @@ bool file_write_action_under_lock(
 	throws an exception in case of problems
 */
 void file_write(
-				const String& file_spec,
+				ConstStringPtr file_spec,
 				const void *data, size_t size, 
 				bool as_text,
 				bool do_append=false);
@@ -137,19 +165,21 @@ void file_write(
 	delete specified file 
 	throws an exception in case of problems
 */
-bool file_delete(const String& file_spec, bool fail_on_read_problem=true);
+bool file_delete(ConstStringPtr file_spec, bool fail_on_read_problem=true);
 /**
 	move specified file 
 	throws an exception in case of problems
 */
-void file_move(const String& old_spec, const String& new_spec);
+void file_move(ConstStringPtr old_spec, ConstStringPtr new_spec);
 
-bool file_readable(const String& file_spec);
-bool dir_readable(const String& file_spec);
-String *file_readable(const String& path, const String& name);
-bool file_executable(const String& file_spec);
+bool entry_exists(const char *fname, struct stat *afinfo=0);
+bool entry_exists(ConstStringPtr file_spec);
+bool file_readable(ConstStringPtr file_spec);
+bool dir_readable(ConstStringPtr file_spec);
+String *file_readable(ConstStringPtr path, ConstStringPtr name);
+bool file_executable(ConstStringPtr file_spec);
 
-bool file_stat(const String& file_spec, 
+bool file_stat(ConstStringPtr file_spec, 
 			   size_t& rsize, 
 			   time_t& ratime,
 			   time_t& rmtime,
@@ -166,7 +196,7 @@ char *getrow(char **row_ref,char delim='
 char *lsplit(char *string, char delim);
 char *lsplit(char **string_ref,char delim);
 char *rsplit(char *string, char delim);
-char *format(Pool& pool, double value, char *fmt);
+char *format(double value, char *fmt);
 
 #ifndef max
 inline int max(int a, int b) { return a>b?a:b; }
@@ -177,15 +207,7 @@ inline size_t min(size_t a, size_t b){ r
 
 size_t stdout_write(const void *buf, size_t size);
 
-char *unescape_chars(Pool& pool, const char *cp, int len);
-
-/**
-	$content-type[text/html] -> 
-		content-type: text/html
-	$content-type[$value[text/html] charset[windows-1251]] -> 
-		content-type: text/html; charset=windows-1251
-*/
-const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang);
+char *unescape_chars(const char *cp, int len);
 
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);