Return only requested filters/values

Fixes #65

Author: eduard93

MDX2JSON/REST.cls.xml

@@ -248,6 +248,8 @@ Wrapper for ##class(MDX2JSON.Utils).WriteFiltersForDataSource(pDataSource, pValu
 	set Values = $$$R("Values")
 	set Search = $$$R("Search")
 	
+	#dim RequestedFilters As %ListOfDataTypes = $$$R("RequestedFilters")
+	
 	#dim RelatedFiltersList As %ListOfObjects = $$$R("RelatedFilters")
 	if $IsObject(RelatedFiltersList) {
 		for i=1:1:RelatedFiltersList.Count() {
@@ -256,7 +258,7 @@ Wrapper for ##class(MDX2JSON.Utils).WriteFiltersForDataSource(pDataSource, pValu
 		}
 	}
 
-   	set st = ##class(MDX2JSON.Utils).WriteFiltersForDataSource(DataSource, Values, Search, .RelatedFilters)
+   	set st = ##class(MDX2JSON.Utils).WriteFiltersForDataSource(DataSource, Values, Search, .RelatedFilters, RequestedFilters)
   	return st
 ]]></Implementation>
 </Method>

MDX2JSON/Tests.cls.xml

@@ -8,12 +8,12 @@ Classes with support methods for testing MDX2JSON</Description>
 
 <Parameter name="LastCommit">
 <Type>%String</Type>
-<Default>5e87ba70baf708f159b9c9dcf8eba0b4203981e9</Default>
+<Default>18872dc518d8009bdc105425f541953d2c9d461e</Default>
 </Parameter>
 
 <Parameter name="LastCommitTS">
 <Type>%TimeStamp</Type>
-<Default>2017-04-06 13:37:06.092</Default>
+<Default>2017-05-26 16:20:17.307</Default>
 </Parameter>
 
 <Method name="ProjectLength">

MDX2JSON/Utils.cls.xml

@@ -142,15 +142,24 @@ Get all filters for DeepSee DataSource in JSON format.<br>
 <b>pDataSource</b> - name of DeepSee datasource (cube, pivot, kpi, metric).<br>
 <b>pValues</b> - write all filters' values. Takes time.]]></Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[pDataSource:%String,pValues:%Boolean=0,pSearchKey:%String="",&pRelatedFilters]]></FormalSpec>
+<FormalSpec><![CDATA[pDataSource:%String,pValues:%Boolean=0,pSearchKey:%String="",&pRelatedFilters,pRequestedFilters:%ListOfDataTypes]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set st = ##class(%DeepSee.Dashboard.Utils).%GetFiltersForDataSource(pDataSource,.tFilters)
+	set st = ##class(%DeepSee.Dashboard.Utils).%GetFiltersForDataSource(pDataSource, .tFilters)
 	return:$$$ISERR(st) st
 	return:($d(tFilters)=0) $$$ERROR($$$GeneralError,"Empty Filter values array. DataSource does not exist?")
 
+	if $isobject($g(pRequestedFilters)) {
+		set key = $order(tFilters(""))		
+		for {
+			quit:key=""
+			kill:'pRequestedFilters.Find($lg(tFilters(key),2)) tFilters(key)
+			set key = $order(tFilters(key))
+	   	}
+	}
+
 	if (pValues=1) {
-	set key = $order(tFilters(""))
+		set key = $order(tFilters(""))
 		while (key '= "") {
 			set st = ##class(%DeepSee.Dashboard.Utils).%GetMembersForFilter(pDataSource,$lg(tFilters(key),2),.tMembers,.tDefaultFilterValue,pSearchKey,.pRelatedFilters,0,,.tValueList)
 			return:$$$ISERR(st) st