061 cfflush fix for file export

Application.cfc

@@ -89,7 +89,7 @@
 		<!--- global settings --->
 
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.060"/>
+		<cfset request.APP_VERSION="0.00.061"/>
 		<cfset request.STAND=getStand()/>		
 		
 		<cflock scope="application" type="readonly" timeout=3>

conf.cfm

@@ -0,0 +1,5 @@
+<cfdump var=#{
+    "Template Charset (File compilation)": getPageContext().getConfig().getTemplateCharset(),
+    "Web Charset (Forms, URLs, Responses)": getPageContext().getConfig().getWebCharset(),
+    "Resource Charset (File system reads/writes)": getPageContext().getConfig().getResourceCharset()
+}#/>

payg.cfm

@@ -27,7 +27,8 @@
 	where p.type=3 AND aa.is_actual
 	order by p.code
 </cfquery>
-<cfoutput>qCode:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qCode:#getTickCount()-request.startTickCount#</cfoutput>
+<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <!--- <cfdump var=#qCode#/> --->
 <cfquery name="qContragent" datasource="dwh" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
@@ -36,10 +37,11 @@
 	where k."__deletedAt" IS NULL
 </cfquery>
 
-<cfoutput>qContragent:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qContragent:#getTickCount()-request.startTickCount#</cfoutput>
+<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 <!--- <cfif isDefined("DEBUG")>
 	<cfdump var=#qContragent#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif> --->
 <!--- нужны компании, которые есть в пейге --->
 
@@ -60,17 +62,17 @@
 	order by k.id_klienta, p.code
 </cfquery>
 <!--- здесь имеем список кодов с ценами и WZ. Каждому коду можно поставить в соответствие запрос, который даст по нему выборку. Изредка один запрос может вывести 2 кода, но разбить на 2 запроса легко. Кроме того, запросы можно объединить через union в один - может быть, так будет лучше читаться (быстрее выполняться не будет) --->
-<cfoutput>qSpec:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qSpec:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qSpec#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 <!--- siv means specification item version --->
 <cfquery name="qSivAge" datasource="dwh" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 	select max(dt_load) as dt_load from elma.deals_services
 </cfquery>
-<cfoutput>qSivAge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qSivAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 
 <cfquery name="qComputing" datasource="billing-vc" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
@@ -101,18 +103,18 @@
 	order by m.clientid, vdc.name;
 </cfquery>
 
-<cfoutput>qComputing:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qComputing:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qComputing#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 <cfquery name="qComputingAge" datasource="billing-vc" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 	select max(capacity_resource.timestamp) as dt_load from ngcloud_ru.capacity_resource
 </cfquery>
 
-<cfoutput>qComputingAge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qComputingAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 
 <!--- переделать storage_profile_types с расшифровкой ssd, sata, можно прямо до каталожного кода --->
@@ -153,18 +155,18 @@
 	order by m.clientid, vdc.name, storage_profile_types.name;
 </cfquery>
 
-<cfoutput>qStorage:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qStorage:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qStorage#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 
 <cfquery name="qStorageAge" datasource="billing-vc" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 	select max(capacity_storage.timestamp) as dt_load from ngcloud_ru.capacity_storage
 </cfquery>
-<cfoutput>qStorageAge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qStorageAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <!--- 
 "placement"	"size_gb"	"get_10k"	"put_10k"	"bytes_sent_gb"
@@ -195,18 +197,18 @@ HOT_FREE_LIMIT	1	10	1	100
 	order by bucket_stat.owner, bucket_stat.placement_id;
 </cfquery>
 
-<cfoutput>qS3Vol:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qS3Vol:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfif isDefined("DEBUG")>	
 	<cfdump var=#qS3Vol#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 <cfquery name="qS3VolAge" datasource="billing-s3" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 	select max(timestamp_addition) as dt_load from s3billing.bucket_stat
 </cfquery>
 
-<cfoutput>qS3VolAge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qS3VolAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfquery name="qS3OpsTrf" datasource="billing-s3">
 select	
@@ -283,18 +285,18 @@ select
 	order by user_info.name, bucket_info.placement_id;
 </cfquery>
 
-<cfoutput>qS3OpsTrf:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qS3OpsTrf:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qS3OpsTrf#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 <cfquery name="qS3OpsTrfAge" datasource="billing-s3" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 	select max(time) as dt_load from s3billing.usage_bucket_by_user 
 </cfquery>
 
-<cfoutput>qS3OpsTrfAge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qS3OpsTrfAge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 
 <cfquery name="qUnifiedMetric" dbType="query" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
@@ -329,11 +331,11 @@ order by wz, code
 </cfquery>
 
 
-<cfoutput>qUnifiedMetric:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qUnifiedMetric:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qUnifiedMetric#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>
 
 
@@ -393,10 +395,10 @@ ORDER BY wz,code
 <!--- <cfdump var=#qCharge#/> --->
 
 
-<cfoutput>qCharge:#getTickCount()-request.startTickCount#</cfoutput><cfflush/>
+<cfoutput>qCharge:#getTickCount()-request.startTickCount#</cfoutput><cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 <cfif isDefined("DEBUG")>
 	<cfdump var=#qCharge#/>
-	<cfflush/>
+	<cfif !isDefined("output_xls") AND !isDefined("output_json")><cfflush/></cfif>
 </cfif>