Commit03f9bbe

authored

Fixes for816891f (#80)

* Update filter-values.js* Update secondary-filter-values.js* Update view-all-items.js

1 parent816891f commit03f9bbeCopy full SHA for 03f9bbe

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -576,6 +576,7 @@ filtervalues = Vue.component('filter-values', {`
`576`	`576`
`577`	`577`	`// Convert the applied filters/time ranges/quantities into SPARQL equivalents`
`578`	`578`	`varfilterString="";`
	`579`	`+varparentFilterString="";`
`579`	`580`	`varnoValueString="";`
`580`	`581`	`for(leti=0;i<this.appliedFilters.length;i++){`
`581`	`582`	`if(this.appliedFilters[i].parentFilterValue){`
`@@ -1036,9 +1037,9 @@ filtervalues = Vue.component('filter-values', {`
`1036`	`1037`	`parameters.delete("sf")`
`1037`	`1038`	`parameters.set("f."+vm.currentFilter.value,"novalue")`
`1038`	`1039`	`vm.noValueURL=window.location.pathname+"?"+parameters`
`1039`		`-// Gets items and their count.`
`1040`		`-varsparqlQuery="SELECT ?value ?valueLabel ?count WHERE {\n"+`
`1041`		`-"{\n"+`
	`1040`	`+// Gets items and their count.`
	`1041`	`+varsparqlQuery="SELECT ?value ?valueLabel ?count\n"+`
	`1042`	`+"WITH{\n"+`
`1042`	`1043`	`"SELECT ?value (COUNT(?value) AS ?count) WHERE {\n"+`
`1043`	`1044`	`this.classSelector+`
`1044`	`1045`	`"?item wdt:"+vm.currentFilter.value+" ?value.\n"+`
`@@ -1050,7 +1051,7 @@ filtervalues = Vue.component('filter-values', {`
`1050`	`1051`	`"}\n";`
`1051`	`1052`	`sparqlQuery+=`
`1052`	`1053`	`"GROUP BY ?value\n"+`
`1053`		`-"ORDER BY DESC (?count)"+`
	`1054`	`+"ORDER BY DESC (?count)\n"+`
`1054`	`1055`	`"LIMIT 1000\n"+`
`1055`	`1056`	`"} AS %results\n"+`
`1056`	`1057`	`"WHERE {\n"+`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,7 @@ secondayFilterValues = Vue.component('secondary-filters', {`
`393`	`393`
`394`	`394`	`// Convert the applied filters/time ranges/quantities into SPARQL equivalents`
`395`	`395`	`varfilterString="";`
	`396`	`+varparentFilterString="";`
`396`	`397`	`varnoValueString="";`
`397`	`398`	`for(leti=0;i<this.appliedFilters.length;i++){`
`398`	`399`	`if(this.appliedFilters[i].parentFilterValue){`
`@@ -635,7 +636,7 @@ secondayFilterValues = Vue.component('secondary-filters', {`
`635`	`636`	`filterString+`
`636`	`637`	`"{ # Current filter\n?item wdt:"+vm.currentFilter.value+" ?temp.\n"+`
`637`	`638`	`(centralSPARQLService ?'' :"SERVICE <"+centralSPARQLService+"> {\n")+`
`638`		`-"?temp (p:"+vm.secondaryFilter.value+"/psv:"+vm.secondaryFilter.value+") ?v.\n"++`
	`639`	`+"?temp (p:"+vm.secondaryFilter.value+"/psv:"+vm.secondaryFilter.value+") ?v.\n"+`
`639`	`640`	`"?v wikibase:quantityAmount ?amount.\n"+`
`640`	`641`	`(centralSPARQLService ?'' :"}\n")+`
`641`	`642`	`"}\n"+`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ viewallitems = Vue.component('view-all-items', {`
`376`	`376`
`377`	`377`	`// Change applied filters/ranges/quantities to SPARQL equivalents`
`378`	`378`	`letfilterString="";`
	`379`	`+letparentFilterString="";`
`379`	`380`	`letnoValueString="";`
`380`	`381`	`for(leti=0;i<this.appliedFilters.length;i++){`
`381`	`382`	`if(this.appliedFilters[i].parentFilterValue){`
`@@ -450,7 +451,7 @@ viewallitems = Vue.component('view-all-items', {`
`450`	`451`	`maxString+="(MAX(?amountValue"+i+") AS ?qua"+i+") ";`
`451`	`452`	`}`
`452`	`453`	`else{`
`453`		`-filterQuantities+="{#quantity range "+i+"\n?value wdt:"+this.appliedQuantities[i].parentFilterValue+" ?temp"+i+".\n"++`
	`454`	`+filterQuantities+="{#quantity range "+i+"\n?value wdt:"+this.appliedQuantities[i].parentFilterValue+" ?temp"+i+".\n"+`
`454`	`455`	`(centralSPARQLService ?"SERVICE <"+centralSPARQLService+"> {\n" :'')+`
`455`	`456`	`"?temp"+i+" (p:"+this.appliedQuantities[i].filterValue+"/psn:"+this.appliedQuantities[i].filterValue+") ?amount"+i+".\n"+`
`456`	`457`	`" ?amount"+i+" wikibase:quantityAmount ?amountValue"+i+".\n}"+`

Comments

(0)