--- parser3/src/include/pa_stylesheet_connection.h	2002/01/21 16:44:48	1.22
+++ parser3/src/include/pa_stylesheet_connection.h	2003/03/06 12:58:32	1.32.2.3
@@ -1,15 +1,15 @@
 /** @file
 	Parser: Stylesheet connection decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_stylesheet_connection.h,v 1.22 2002/01/21 16:44:48 paf Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_STYLESHEET_CONNECTION_H
 #define PA_STYLESHEET_CONNECTION_H
 
+static const char* IDENT_STYLESHEET_CONNECTION_H="$Date: 2003/03/06 12:58:32 $";
+
 #include "libxslt/xslt.h"
 #include "libxslt/xsltInternals.h"
 
@@ -17,6 +17,7 @@
 #include "pa_stylesheet_manager.h"
 #include "pa_exception.h"
 #include "pa_common.h"
+#include "pa_globals.h"
 
 // defines
 
@@ -25,27 +26,26 @@
 /**	Connection with stylesheet: 
 	remembers time and can figure out that it needs recompilation
 */
-class Stylesheet_connection : public Pooled {
+class Stylesheet_connection: public PA_Object {
+private:
 
-	friend class Stylesheet_connection_ptr;
+	StringPtr ffile_spec;
+	xsltStylesheet *fstylesheet;
+	time_t time_used;
+	time_t prev_disk_time;
 
 public:
 
-	Stylesheet_connection(Pool& pool, const String& afile_spec) : Pooled(pool),
+	Stylesheet_connection(StringPtr afile_spec):
 		ffile_spec(afile_spec),
 		prev_disk_time(0),
-		fservices_pool(0),
 		fstylesheet(0),
-		time_used(0), used(0) {
-	}
+		time_used(0) {}
 	
-	const String& file_spec() { return ffile_spec; }
+	StringPtr file_spec() { return ffile_spec; }
 
-	void set_services(Pool *aservices_pool) {
-		fservices_pool=aservices_pool;
-	}
 	bool expired(time_t older_dies) {
-		return !used && time_used<older_dies;
+		return references()==1/*!used*/ && time_used<older_dies;
 	}
 	time_t get_time_used() { return time_used; }
 
@@ -66,7 +66,7 @@ private:
 
 	/// return to cache
 	void close() {
-		stylesheet_manager->close_connection(ffile_spec, *this);
+		stylesheet_manager.close_connection(ffile_spec, *this);
 	}
 
 private:
@@ -77,16 +77,19 @@ private:
 	}
 
 	void load(time_t new_disk_time) {
-		Pool& pool=*fservices_pool;
-
-		xsltStylesheet *nstylesheet;
-		nstylesheet=xsltParseStylesheetFile(BAD_CAST ffile_spec.cstr(String::UL_FILE_SPEC));
-		if(!nstylesheet || xmlHaveGenericErrors()) {
+		int saved=xmlDoValidityCheckingDefaultValue;//
+		xmlDoValidityCheckingDefaultValue=0;//
+		xsltStylesheet *nstylesheet=
+			xsltParseStylesheetFile(BAD_CAST ffile_spec->cstr(String::UL_FILE_SPEC).get());
+		xmlDoValidityCheckingDefaultValue = saved;//
+		if(xmlHaveGenericErrors()) {
 			GdomeException exc=0;
-			throw Exception(0, 0,
-				&ffile_spec,
-				exc);
+			throw Exception(ffile_spec, exc);
 		}
+		if(!nstylesheet)
+			throw Exception("file.missing",
+				ffile_spec,
+				"stylesheet failed to load");
 
 		xsltFreeStylesheet(fstylesheet);  
 		fstylesheet=nstylesheet;
@@ -96,7 +99,7 @@ private:
 	time_t get_disk_time() {
 		size_t size;
 		time_t atime, mtime, ctime;
-		String stamp_file_spec(ffile_spec); 
+		StringPtr stamp_file_spec(ffile_spec);
 		stamp_file_spec << STYLESHEET_FILENAME_STAMP_SUFFIX;
 		// {file_spec}.stamp modification time OR {file_spec}
 		const String& stat_file_spec=file_readable(stamp_file_spec)?stamp_file_spec:ffile_spec;
@@ -107,65 +110,12 @@ private:
 		return mtime;
 	}
 
-private: // connection usage methods
-
-	void use() {
+	void touch() {
 		time_used=time(0); // they started to use at this time
-		used++;
 	}
-	void unuse() {
-		used--;
-		if(!used)
-			close();
-	}
-
-private: // connection usage data
-
-	int used;
-
-private:
-
-	const String& ffile_spec;
-	xsltStylesheet *fstylesheet;
-	time_t time_used;
-	time_t prev_disk_time;
-
-private:
-
-	Pool *fservices_pool;
 
-private:
-	void *malloc(size_t size) { return fservices_pool->malloc(size); }
-	void *calloc(size_t size) { return fservices_pool->calloc(size); }
 };
 
-/// Auto-object used to track Stylesheet_connection usage
-class Stylesheet_connection_ptr {
-	Stylesheet_connection *fconnection;
-public:
-	explicit Stylesheet_connection_ptr(Stylesheet_connection *aconnection) : 
-		fconnection(aconnection) {
-		fconnection->use();
-	}
-	~Stylesheet_connection_ptr() {
-		fconnection->unuse();
-	}
-	Stylesheet_connection* operator->() {
-		return fconnection;
-	}
-
-	// copying
-	Stylesheet_connection_ptr(const Stylesheet_connection_ptr& src) : fconnection(src.fconnection) {
-		fconnection->use();
-	}
-	Stylesheet_connection_ptr& operator =(const Stylesheet_connection_ptr& src) {
-		// may do without this=src check
-		fconnection->unuse();
-		fconnection=src.fconnection;
-		fconnection->use();
-
-		return *this;
-	}
-};
+DECLARE_OBJECT_PTR(Stylesheet_connection);
 
 #endif