--- parser3/src/include/pa_common.h	2003/01/21 15:51:09	1.89
+++ parser3/src/include/pa_common.h	2003/01/27 15:07:47	1.89.2.4
@@ -8,13 +8,14 @@
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char* IDENT_COMMON_H="$Date: 2003/01/21 15:51:09 $";
+static const char* IDENT_COMMON_H="$Date: 2003/01/27 15:07:47 $";
 
 #include "pa_pool.h"
 #include "pa_string.h"
+#include "pa_hash.h"
+#include "pa_value.h"
 
-class Hash;
-class Value;
+typedef Hash<ConstStringPtr, ValuePtr> HashStringValue;
 
 // replace system s*nprintf with our versions
 #undef vsnprintf 
@@ -79,14 +80,6 @@ extern "C" double sign(double);
 inline double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); }
 #endif
 
-/**
-	$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, bool forced);
-
 /// yields to OS for secs secs and usecs milliseconds
 int pa_sleep(unsigned long secs, unsigned long usecs);
 
@@ -101,7 +94,7 @@ void fix_line_breaks(
 typedef void (*File_read_action)(Pool& pool,
 								 struct stat& finfo,
 								 int f, 
-								 const String& file_spec, const char *fname, bool as_text,
+								 ConstStringPtr file_spec, const char *fname, bool as_text,
 								 void *context);
 
 /**
@@ -111,7 +104,7 @@ typedef void (*File_read_action)(Pool& p
 	
 	@returns true if read OK
 */
-bool file_read_action_under_lock(Pool& pool, const String& file_spec, 
+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);
@@ -121,10 +114,15 @@ bool file_read_action_under_lock(Pool& p
 
   	@returns true if read OK
 */
-char *file_read_text(Pool& pool, 
-					 const String& file_spec, 
+char *file_read_text(Pool& pool, Charset& charset, 
+					 ConstStringPtr file_spec, 
 					 bool fail_on_read_problem=true,
-					 Hash *options=0, Hash** out_fields=0);
+					 HashStringValue* options=0, HashStringValue** out_fields=0);
+
+struct File_read_result {
+	bool success;
+	HashStringValuePtr fields;
+};
 
 /**
 	read specified file using pool, 
@@ -132,10 +130,11 @@ char *file_read_text(Pool& pool,
 
 	@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,
-			   Hash *options=0, Hash** out_fields=0,
+			   HashStringValue* options=0, HashStringValue** out_fields=0,
 			   bool fail_on_read_problem=true);
 
 typedef void (*File_write_action)(int f, void *context);
@@ -149,7 +148,7 @@ typedef void (*File_write_action)(int f,
 	@returns true if locked OK, or false if non-blocking locking failed
 */
 bool file_write_action_under_lock(
-				const String& file_spec, 
+				ConstStringPtr file_spec, 
 				const char *action_name, File_write_action action, void *context,
 				bool as_text=false,
 				bool do_append=false,
@@ -161,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);
@@ -170,21 +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 entry_exists(const char *fname, struct stat *afinfo=0);
-bool entry_exists(const String& file_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(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,
@@ -201,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; }
@@ -212,7 +211,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);
+char *unescape_chars(const char *cp, int len);
 
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);