--- parser3/src/main/pa_common.C	2002/06/10 09:24:36	1.109
+++ parser3/src/main/pa_common.C	2002/08/15 12:05:36	1.117
@@ -3,18 +3,13 @@
 
 	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_common.C,v 1.109 2002/06/10 09:24:36 paf Exp $
 */
 
+static const char* IDENT_COMMON_C="$Date: 2002/08/15 12:05:36 $";
+
 #include "pa_common.h"
-#include "pa_types.h"
 #include "pa_exception.h"
-#include "pa_pool.h"
 #include "pa_globals.h"
-#include "pa_value.h"
-#include "pa_hash.h"
-#include "pa_string.h"
 
 #ifdef WIN32
 #	include <windows.h>
@@ -137,7 +132,17 @@ bool file_read(Pool& pool, const String&
 	//   they delay update till open, so we would receive "!^test[" string
 	//   if would do stat, next open.
     if((f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0) {
-		lock_shared_blocking(f);		
+		if(lock_shared_blocking(f)!=0) {
+			Exception e("file.lock",
+					&file_spec, 
+					"shared lock failed: %s (%d), actual filename '%s'", 
+						strerror(errno), errno, fname);
+			unlock(f);
+			close(f);
+			if(fail_on_read_problem)
+				throw e;
+			return false;
+		}
 		if(stat(fname, &finfo)!=0) {
 			Exception e("file.missing",
 					&file_spec, 
@@ -216,7 +221,8 @@ bool file_write_action_under_lock(
 				const char *action_name, void (*action)(int, void *), void *context,
 				bool as_text,
 				bool do_append,
-				bool do_block) {
+				bool do_block,
+				bool fail_on_lock_problem) {
 	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	int f;
 	if(access(fname, W_OK)!=0) // no
@@ -227,7 +233,13 @@ bool file_write_action_under_lock(
 		|(as_text?_O_TEXT:_O_BINARY)
 		|(do_append?O_APPEND:O_TRUNC), 0664))>=0) {
 		if((do_block?lock_exclusive_blocking(f):lock_exclusive_nonblocking(f))!=0) {
+			Exception e("file.lock",
+				&file_spec, 
+				"shared lock failed: %s (%d), actual filename '%s'", 
+				strerror(errno), errno, fname);
 			close(f);
+			if(fail_on_lock_problem)
+				throw e;
 			return false;
 		}
 
@@ -265,8 +277,13 @@ struct File_write_action_info {
 #endif
 static void file_write_action(int f, void *context) {
 	File_write_action_info& info=*static_cast<File_write_action_info *>(context);
-	if(info.size) 
-		write(f, info.data, info.size);
+	if(info.size) {
+		int written=write(f, info.data, info.size);
+		if(written<0)
+			throw Exception(0,
+				0,
+				"write failed: %s (%d)",  strerror(errno), errno);
+	}
 }
 void file_write(
 				const String& file_spec, 
@@ -484,43 +501,6 @@ char *unescape_chars(Pool& pool, const c
 	return s;
 }
 
-/// used by attributed_meaning_to_string / append_attribute_subattribute
-struct Attributed_meaning_info {
-	String *header; // header line being constructed
-	String::Untaint_lang lang; // language in which to append to that line
-};
-static void append_attribute_subattribute(const Hash::Key& akey, Hash::Val *avalue, 
-										  void *info) {
-	if(akey==VALUE_NAME)
-		return;
-
-	Attributed_meaning_info& ami=*static_cast<Attributed_meaning_info *>(info);
-
-	// ...; charset=windows1251
-	*ami.header << "; ";
-	ami.header->append(akey, ami.lang);
-	*ami.header << "=";
-	ami.header->append(static_cast<Value *>(avalue)->as_string(), ami.lang);
-}
-const String& attributed_meaning_to_string(Value& meaning, 
-										   String::Untaint_lang lang) {
-	String &result=*new(meaning.pool()) String(meaning.pool());
-	if(Hash *hash=meaning.get_hash(0)) {
-		// $value(value) $subattribute(subattribute value)
-		if(Value *value=static_cast<Value *>(hash->get(*value_name)))
-			result.append(value->as_string(), lang, true);
-
-		Attributed_meaning_info attributed_meaning_info={
-			&result,
-			lang
-		};
-		hash->for_each(append_attribute_subattribute, &attributed_meaning_info);
-	} else // result value
-		result.append(meaning.as_string(), lang, true);
-
-	return result;
-}
-
 #ifdef WIN32
 void back_slashes_to_slashes(char *s) {
 	if(s)