--- parser3/src/include/pa_stylesheet_connection.h	2002/08/01 11:41:16	1.30
+++ parser3/src/include/pa_stylesheet_connection.h	2020/12/11 11:52:20	1.45
@@ -1,51 +1,60 @@
 /** @file
 	Parser: Stylesheet connection decl.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (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: 2002/08/01 11:41:16 $";
+#define IDENT_PA_STYLESHEET_CONNECTION_H "$Id: pa_stylesheet_connection.h,v 1.45 2020/12/11 11:52:20 moko Exp $"
 
 #include "libxslt/xslt.h"
 #include "libxslt/xsltInternals.h"
 
-#include "pa_pool.h"
-#include "pa_stylesheet_manager.h"
-#include "pa_exception.h"
+
+#include "pa_xml_exception.h"
 #include "pa_common.h"
+#include "pa_globals.h"
+#include "pa_xml_io.h"
 
 // defines
 
-#define STYLESHEET_FILENAME_STAMP_SUFFIX ".stamp"
-
 /**	Connection with stylesheet: 
 	remembers time and can figure out that it needs recompilation
 */
-class Stylesheet_connection : public Pooled {
+class Stylesheet_connection: public PA_Object {
 
 	friend class Stylesheet_connection_ptr;
 
+private:
+
+	String::Body ffile_spec;
+	xsltStylesheet *fstylesheet;
+	HashStringBool* dependencies;
+	time_t time_used;
+	time_t prev_disk_time;
+
 public:
 
-	Stylesheet_connection(Pool& pool, const String& afile_spec) : Pooled(pool),
+	Stylesheet_connection(String::Body afile_spec):
 		ffile_spec(afile_spec),
-		prev_disk_time(0),
-		fservices_pool(0),
 		fstylesheet(0),
-		time_used(0), used(0) {
-	}
+		dependencies(0),
+		time_used(0),
+		prev_disk_time(0),
+		used(0)  
+	{}
 	
-	const String& file_spec() { return ffile_spec; }
+	String::Body file_spec() { return ffile_spec; }
 
-	void set_services(Pool *aservices_pool) {
-		fservices_pool=aservices_pool;
+	bool uncachable() {
+		return !dependencies/*means they were external*/;
 	}
+
 	bool expired(time_t older_dies) {
-		return !used && time_used<older_dies;
+		return uncachable() || (!used && time_used<older_dies);
 	}
 	time_t get_time_used() { return time_used; }
 
@@ -55,9 +64,9 @@ public:
 
 	bool connected() { return fstylesheet!=0; }
 
-	xsltStylesheet *stylesheet(bool nocache) { 
-		time_t new_disk_time=get_new_disk_time();
-		if(nocache || new_disk_time)
+	xsltStylesheet *stylesheet() { 
+		time_t new_disk_time=0;
+		if(uncachable() || (new_disk_time=get_new_disk_time()))
 			load(new_disk_time);
 		return fstylesheet; 
 	}
@@ -65,9 +74,7 @@ public:
 private:
 
 	/// return to cache
-	void close() {
-		stylesheet_manager->close_connection(ffile_spec, *this);
-	}
+	void close();
 
 private:
 
@@ -76,41 +83,12 @@ private:
 		return now_disk_time>prev_disk_time?now_disk_time:0;
 	}
 
-	void load(time_t new_disk_time) {
-		Pool& pool=*fservices_pool;
-
-		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,
-				"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);
-		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;
-		file_stat(stat_file_spec, 
-			size,
-			atime, mtime, ctime,
-			true/*exception on error*/);
-		return mtime;
-	}
+	void load(time_t new_disk_time);
+	time_t get_disk_time();
 
 private: // connection usage methods
 
+	int used;
 	void use() {
 		time_used=time(0); // they started to use at this time
 		used++;
@@ -121,24 +99,6 @@ private: // connection usage methods
 			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
@@ -160,6 +120,7 @@ public:
 	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();