160 vault_record conditionally marshalled, svc search by synonyms

v1/resources/instance_ls.cfc

@@ -80,7 +80,6 @@
 					</cfif>
 				</cfloop>
 			<!--- </cfif> --->
-			<!--- <cfdump var=#local.fieldsToOutput#/><cfabort/> --->
 			
 			<cfset local.fieldsToQueryFor = local.fieldsToOutput/>
 			<cfset local.fieldsShortList=""/>
@@ -136,7 +135,8 @@
 				
 			<m:field_set titleMapOut="local.titleMap" 
 					lengthOut="local.fieldCount" 
-					listOut="definedInstanceFields"
+					nameListOut="local.definedRecordFields"
+					listOut="local.definedQueryFields"
 					fieldsToInclude=#local.fieldsToQueryFor#>				
 				<m:field>to_char(e.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_created</m:field>
 				<m:field>to_char(e.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_updated</m:field>
@@ -195,8 +195,7 @@
 				) as explained_status</m:field>		
 				<m:field>st.version</m:field>
 			</m:field_set>	
-	
-			<!--- <cfdump var=#definedInstanceFields#/><cfabort/> ---> 
+
 		
 			<cfquery name="local.qCnt" result="local.result">
 			select count(*) as cnt
@@ -206,7 +205,7 @@
 				<cfif structIsEmpty(filter)>
 					'' as placeholder
 				<cfelse>
-					#preserveSingleQuotes(definedInstanceFields)#
+					#preserveSingleQuotes(definedQueryFields)#
 				</cfif>
 				from instance e
 				join specification_item i on (e.specification_item_id=i.specification_item_id)		
@@ -248,7 +247,7 @@
 			<cfif listLen(local.fieldsToOutput)>#local.fieldsToOutput#<cfelse>*</cfif> 
 			from (
 			select
-				#preserveSingleQuotes(definedInstanceFields)#	
+				#preserveSingleQuotes(definedQueryFields)#	
 			from instance e
 			join specification_item i on (e.specification_item_id=i.specification_item_id)		
 			join specification s on (i.specification_id=s.specification_id)