[Mydatabasepilot-cvs] MyDatabasePilot MyDatabasePilot.cfm,1.11,1.12

[<nan...@us...>]

Update of /cvsroot/mydatabasepilot/MyDatabasePilot
In directory sc8-pr-cvs1:/tmp/cvs-serv32435

Modified Files:
	MyDatabasePilot.cfm 
Log Message:
Internal Structure Changed:
[ 738029 ] Convert Query/fieldList.cfm to a CUSTOM TAG

Index: MyDatabasePilot.cfm
===================================================================
RCS file: /cvsroot/mydatabasepilot/MyDatabasePilot/MyDatabasePilot.cfm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MyDatabasePilot.cfm	14 May 2003 03:23:16 -0000	1.11
--- MyDatabasePilot.cfm	15 May 2003 03:47:56 -0000	1.12
***************
*** 13,30 ****
  <!---||| Reset session variables if new database was requested |||--->
  <!--- Check to see if this template was called by FORM_LogintoDB with a new dataSource --->
! <cfif IsDefined("Form.dataSource")>
  	<!--- Initiate an Exclusive lock to ensure the integrity of session variables --->
! 	<cflock timeout = "30" throwontimeout="no" type = "exclusive" scope = "session">
  		<!--- Using the values submitted by the login in form, --->
  		<!--- trim leading and trailing white spaces and --->
  		<!--- overwrite the session variables used for database connection --->
! 		<cfset session.dataSource = #Trim(Form.dataSource)#>	<!--- Data Source --->
! 		<cfset session.userName = #Trim(Form.userName)#>		<!--- User Name --->		
! 		<cfset session.password = #Trim(Form.password)#>		<!--- Password --->
  		<!--- Set the loggedIn Flag to True --->
! 		<cfset session.loggedIn = 1>
  		<!--- Find out the Database Name and Overwrite dbName Variable --->
  		<cfinclude template="Query/LockRequired/thisDatabaseName.cfm">
! 		<cfset session.dbName = "#thisDatabaseName.databaseName#">
  	</cflock>
  </cfif>
--- 13,30 ----
  <!---||| Reset session variables if new database was requested |||--->
  <!--- Check to see if this template was called by FORM_LogintoDB with a new dataSource --->
! <cfif IsDefined("FORM.dataSource")>
  	<!--- Initiate an Exclusive lock to ensure the integrity of session variables --->
! 	<cflock timeout = "30" throwontimeout="no" type = "exclusive" scope = "SESSION">
  		<!--- Using the values submitted by the login in form, --->
  		<!--- trim leading and trailing white spaces and --->
  		<!--- overwrite the session variables used for database connection --->
! 		<cfset SESSION.dataSource = #Trim(FORM.dataSource)#>	<!--- Data Source --->
! 		<cfset SESSION.userName = #Trim(FORM.userName)#>		<!--- User Name --->		
! 		<cfset SESSION.password = #Trim(FORM.password)#>		<!--- Password --->
  		<!--- Set the loggedIn Flag to True --->
! 		<cfset SESSION.loggedIn = 1>
  		<!--- Find out the Database Name and Overwrite dbName Variable --->
  		<cfinclude template="Query/LockRequired/thisDatabaseName.cfm">
! 		<cfset SESSION.dbName = "#thisDatabaseName.databaseName#">
  	</cflock>
  </cfif>
***************
*** 38,49 ****
  	<cfcase value="ShowTables">
  		<!--- Initiate a Read Only lock to ensure the integrity of session variables --->
! 		<cflock timeout=20 throwontimeout="no" type="readonly" scope="session">
  			<!--- Get List of Table Names --->
! 			<cfmodule template="Query/tableList.cfm" queryName="tableList" datasource="#session.dataSource#" username="#session.userName#" password="#session.password#">
  		</cflock>
  	</cfcase>
  	
  	<!---||| If ShowFields ... |||--->
! 	<cfcase value="ShowFields"><cfinclude template="Query/fieldList.cfm"></cfcase>
  	
  	<!---||| If ShowRecords ... |||--->
--- 38,64 ----
  	<cfcase value="ShowTables">
  		<!--- Initiate a Read Only lock to ensure the integrity of session variables --->
! 		<cflock timeout=20 throwontimeout="no" type="readonly" scope="SESSION">
  			<!--- Get List of Table Names --->
! 			<cfmodule template="Query/tableList.cfm"
! 				queryName="tableList"
! 				datasource="#SESSION.dataSource#"
! 				username="#SESSION.userName#"
! 				password="#SESSION.password#">
  		</cflock>
  	</cfcase>
  	
  	<!---||| If ShowFields ... |||--->
! 	<cfcase value="ShowFields">
! 		<!--- Initiate a Read Only lock to ensure the integrity of session variables --->
! 		<cflock timeout=20 throwontimeout="no" type="readonly" scope="SESSION">
! 			<!--- Get List of Field Names and Their Properties --->
! 			<cfmodule template="Query/fieldList.cfm"
! 				queryName="fieldList"
! 				datasource="#SESSION.dataSource#"
! 				username="#SESSION.userName#"
! 				password="#SESSION.password#"
! 				table="#URL.table#">
! 		</cflock>
! 	</cfcase>
  	
  	<!---||| If ShowRecords ... |||--->
***************
*** 94,99 ****
  		</cfif>
  		
! 		<!--- Generate a field list for the current table --->
! 		<cfinclude template="Query/fieldList.cfm">
  		<!--- Retrieve the requested records --->
  		<cfset queryName = "selectedData">
--- 109,122 ----
  		</cfif>
  		
! 		<!--- Initiate a Read Only lock to ensure the integrity of session variables --->
! 		<cflock timeout=20 throwontimeout="no" type="readonly" scope="SESSION">
! 			<!--- Get List of Field Names --->
! 			<cfmodule template="Query/fieldList.cfm"
! 				queryName="fieldList"
! 				datasource="#SESSION.dataSource#"
! 				username="#SESSION.userName#"
! 				password="#SESSION.password#"
! 				table="#URL.table#">
! 		</cflock>
  		<!--- Retrieve the requested records --->
  		<cfset queryName = "selectedData">