Merge branch '21-stats-feiler' into 'master'

Resolve "stats feiler"

Closes #21

See merge request !21

services/stats/html.template

@@ -19,8 +19,8 @@
 
 		<div style="height: 800px;" id="klasser"></div>
 						
-		<script src="http://code.highcharts.com/highcharts.js"></script>
-		<script src="http://code.highcharts.com/modules/exporting.js"></script>
+		<script src="https://code.highcharts.com/highcharts.js"></script>
+		<script src="https://code.highcharts.com/modules/exporting.js"></script>
 
 		<script type="text/javascript">
 				
@@ -48,16 +48,6 @@
     });
 });
 </script>
-<!--
-    <h2>Steder knyttet til våre samlinger</h2>
-    <p class="lead">Disse stedene har vi fått plassert på kartet, men mange steder er ikke plassert.</p>
-
-<div class="row">
-<div class="col-md-12">
-{{models.main|GoogleMaps:"lat,long,label"}}
-</div>
-</div>
--->
 
 		<div style="height: 500px;" id="emner"></div>
 

services/stats/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 . }
+SELECT ?total ?label
+WHERE {
+  GRAPH <urn:x-arq:UnionGraph>  {
+      {SELECT ?class (COUNT(?s) AS ?total) WHERE {
+         ?s a ?class.
+         FILTER(?class NOT IN (ubbont:DigitalResource, ore:Aggregation, ubbont:Page, owl:DatatypeProperty, owl:ObjectProperty, owl:FunctionalProperty, rdfs:Class, owl:Class)). } 
+      GROUP BY ?class ORDER BY desc(?total) LIMIT 50}    
+    ?class rdfs:label ?label .
+    FILTER(LANG(?label) = "")
 }
-GRAPH ubbont:ubbont {
-?class rdfs:label ?label .
-FILTER(LANG(?label) = "")
-}
-}
-GROUP BY ?label
-HAVING (COUNT(?class) > 1)
-ORDER BY desc(?total)
+}