Merge branch '22-about-page-har-treig-sporring-og-far-noen-ganger-timeout' into 'master'

Resolve "about page har treig spørring og får noen ganger timeout"

Closes #22

See merge request !24

services/about-marcus/html.template

@@ -5,8 +5,8 @@
 	<h1>Om Marcus</h1>
 		<div class="col-md-6 pull-right">
 							<div id="klasser">
-						<script src="http://d3js.org/d3.v3.min.js"></script>
-						<script src="http://dimplejs.org/dist/dimple.v2.1.0.min.js"></script>
+						<script src="https://d3js.org/d3.v3.min.js"></script>
+						<script src="/js/dimple.v2.1.0.min.js"></script>
 						<script type="text/javascript">
 							var svg = dimple.newSvg("#klasser", 800, 430);
 							var data = [

services/about-marcus/queries/main.query

-SELECT ?label ?lat ?long  WHERE {
-GRAPH <urn:x-arq:UnionGraph>  {
-?s geo:long ?long .
-?s geo:lat ?lat .
-OPTIONAL { ?s skos:prefLabel ?label . }
-OPTIONAL { ?s rdfs:label ?label . }
-}
-}
\ No newline at end of file

services/about-marcus/queries/quantity.query

 SELECT ?label (COUNT(?class) AS ?total) WHERE {
 GRAPH <urn:x-arq:UnionGraph>  {
 ?s a ?class .
-?class rdfs:label ?label . 
-FILTER(LANG(?label) = "")
-MINUS { ?s a ubbont:DigitalResource . }
-MINUS { ?s a ubbont:Page . }
+FILTER (?class NOT IN ( ubbont:DigitalResource , ubbont:Page , ore:Aggregation))
+?class rdfs:label ?label .
+FILTER(LANG(?label) = "").
 }
 }
 GROUP BY ?label
-HAVING (COUNT(?class) > 1)
-ORDER BY desc(?total)
\ No newline at end of file
+HAVING (?total > 1)
+ORDER BY desc(?total)
+LIMIT 50