--- parser3/src/include/pa_common.h	2002/08/15 12:05:36	1.80
+++ parser3/src/include/pa_common.h	2003/01/29 12:57:36	1.89.2.5
@@ -1,19 +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="$Date: 2002/08/15 12:05:36 $";
+static const char* IDENT_COMMON_H="$Date: 2003/01/29 12:57:36 $";
 
 #include "pa_pool.h"
 #include "pa_string.h"
+#include "pa_hash.h"
+#include "pa_value.h"
 
-class Value;
+typedef Hash<ConstStringPtr, ValuePtr> HashStringValue;
 
 // replace system s*nprintf with our versions
 #undef vsnprintf 
@@ -89,23 +91,53 @@ void fix_line_breaks(
 					 size_t& size ///< may change! used to speedup next actions
 					 );
 
+typedef void (*File_read_action)(Pool& pool,
+								 struct stat& finfo,
+								 int f, 
+								 ConstStringPtr file_spec, const char *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(Pool& pool, 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, Charset& charset, 
+					 ConstStringPtr file_spec, 
+					 bool fail_on_read_problem=true,
+					 HashStringValue* options=0, HashStringValue** out_fields=0);
+
+struct File_read_result {
+	bool success;
+	HashStringValuePtr fields;
+};
 
 /**
 	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, 
+File_read_result file_read(Pool& pool, Charset& charset, 
+			   ConstStringPtr file_spec, 
+			   char *& ptr, size_t& size, 
 			   bool as_text,
-			   bool fail_on_read_problem=true,
-			   size_t offset=0, size_t limit=0);
+			   HashStringValue* options=0, HashStringValue** out_fields=0,
+			   bool fail_on_read_problem=true);
+
+typedef void (*File_write_action)(int f, void *context);
 
 /**
 	lock specified file exclusively, 
@@ -116,8 +148,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 +160,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 +169,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);
+ConstStringPtr 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 +200,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);
+const char *format(Pool& pool, double value, char *fmt);
 
 #ifndef max
 inline int max(int a, int b) { return a>b?a:b; }