--- parser3/src/include/pa_stylesheet_connection.h	2001/09/25 09:36:51	1.4
+++ parser3/src/include/pa_stylesheet_connection.h	2002/08/01 11:41:16	1.30
@@ -1,24 +1,23 @@
 /** @file
-	Parser: stylesheet fstylesheet decl.
+	Parser: Stylesheet connection decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_stylesheet_connection.h,v 1.4 2001/09/25 09:36:51 parser Exp $
+	Copyright (c) 2001, 2002 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
 
-#include "pa_config_includes.h"
+static const char* IDENT_STYLESHEET_CONNECTION_H="$Date: 2002/08/01 11:41:16 $";
+
+#include "libxslt/xslt.h"
+#include "libxslt/xsltInternals.h"
+
 #include "pa_pool.h"
-#include "pa_xslt_stylesheet_manager.h"
+#include "pa_stylesheet_manager.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 
-#include <XalanTransformer/XalanTransformer.hpp>
-
 // defines
 
 #define STYLESHEET_FILENAME_STAMP_SUFFIX ".stamp"
@@ -28,45 +27,46 @@
 */
 class Stylesheet_connection : public Pooled {
 
+	friend class Stylesheet_connection_ptr;
+
 public:
 
 	Stylesheet_connection(Pool& pool, const String& afile_spec) : Pooled(pool),
-		ftransformer(new XalanTransformer),
-
 		ffile_spec(afile_spec),
-		time_used(0),
 		prev_disk_time(0),
 		fservices_pool(0),
-		fstylesheet(0) {
+		fstylesheet(0),
+		time_used(0), used(0) {
 	}
 	
 	const String& file_spec() { return ffile_spec; }
 
 	void set_services(Pool *aservices_pool) {
-		time_used=time(0); // they started to use at this time
 		fservices_pool=aservices_pool;
 	}
 	bool expired(time_t older_dies) {
-		return time_used<older_dies;
-	}
-
-	void close() {
-		XSLT_stylesheet_manager->close_connection(ffile_spec, *this);
+		return !used && time_used<older_dies;
 	}
+	time_t get_time_used() { return time_used; }
 
 	void disconnect() { 
-		/*ignore error*/ftransformer->destroyStylesheet(fstylesheet);  fstylesheet=0; 
-
-		// connection effectively useless now, free up some memory
-		delete ftransformer; 
+		xsltFreeStylesheet(fstylesheet);  fstylesheet=0; 
 	}
 
 	bool connected() { return fstylesheet!=0; }
 
-	const XalanCompiledStylesheet& stylesheet() { 
-		if(time_t new_disk_time=get_new_disk_time())
+	xsltStylesheet *stylesheet(bool nocache) { 
+		time_t new_disk_time=get_new_disk_time();
+		if(nocache || new_disk_time)
 			load(new_disk_time);
-		return *fstylesheet; 
+		return fstylesheet; 
+	}
+
+private:
+
+	/// return to cache
+	void close() {
+		stylesheet_manager->close_connection(ffile_spec, *this);
 	}
 
 private:
@@ -79,42 +79,95 @@ private:
 	void load(time_t new_disk_time) {
 		Pool& pool=*fservices_pool;
 
-		int error=ftransformer->compileStylesheet(ffile_spec.cstr(String::UL_FILE_SPEC), fstylesheet);
-		if(error)
-			PTHROW(0, 0,
+		xsltStylesheet *nstylesheet=
+			xsltParseStylesheetFile(BAD_CAST ffile_spec.cstr(String::UL_FILE_SPEC));
+		if(xmlHaveGenericErrors()) {
+			GdomeException exc=0;
+			throw Exception(&ffile_spec, exc);
+		}
+		if(!nstylesheet)
+			throw Exception("file.missing",
 				&ffile_spec,
-				ftransformer->getLastError());
+				"stylesheet failed to load");
 
+		xsltFreeStylesheet(fstylesheet);  
+		fstylesheet=nstylesheet;
 		prev_disk_time=new_disk_time;
 	}
 
 	time_t get_disk_time() {
 		size_t size;
 		time_t atime, mtime, ctime;
-		String stamp_file_spec(ffile_spec); 
+		String 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;
-		if(!file_stat(stat_file_spec, 
+		file_stat(stat_file_spec, 
 			size,
 			atime, mtime, ctime,
-			false/*no exception on global pool[stat_file_spec], please*/))
-			mtime=1; //no file=pseudo non-zero time, see get_new_disk_time
+			true/*exception on error*/);
 		return mtime;
 	}
 
+private: // connection usage methods
+
+	void use() {
+		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;
-	const XalanCompiledStylesheet *fstylesheet;
+	xsltStylesheet *fstylesheet;
 	time_t time_used;
 	time_t prev_disk_time;
 
 private:
 
-	XalanTransformer *ftransformer;
-
 	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;
+	}
 };
 
 #endif