fixes

sparqlunicorn · Jan 30, 2024 · 6e0a97a · 6e0a97a
1 parent e1016e4
commit 6e0a97a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/sparqlunicorn_ontdoc/docgeneration.py b/src/sparqlunicorn_ontdoc/docgeneration.py
@@ -392,6 +392,12 @@ def generateOntDocForNameSpace(self, prefixnamespace,dataformat="HTML"):
                 tree["core"]["data"].append(tr)
         voidstats["http://rdfs.org/ns/void#classes"]=len(classidset)
         voidstats["http://rdfs.org/ns/void#triples"] = len(self.graph)
+        for stat in voidstats:
+            if (URIRef(voidds),URIRef(stat),None) in self.graph:
+                self.graph.set((URIRef(voidds), URIRef(stat),
+                       Literal(int(self.graph.value(URIRef(voidds),URIRef(stat)))+voidstats[stat], datatype="http://www.w3.org/2001/XMLSchema#integer")))
+            else:
+                self.graph.add((URIRef(voidds),URIRef(stat),Literal(voidstats[stat],datatype="http://www.w3.org/2001/XMLSchema#integer")))
         voidgraph=VoidExporter.createVoidDataset(self.datasettitle,prefixnamespace,self.deploypath,self.outpath,self.licenseuri,self.modtime,self.labellang,voidstats,subjectstorender,self.graph,self.prefixes,tree,predmap,nonnscount,instancecount,self.startconcept)
         self.voidstatshtml=VoidExporter.toHTML(voidstats,self.deploypath)
         self.graph+=voidgraph["graph"]

diff --git a/src/sparqlunicorn_ontdoc/export/data/voidexporter.py b/src/sparqlunicorn_ontdoc/export/data/voidexporter.py
@@ -7,7 +7,7 @@
 class VoidExporter:
 
     @staticmethod
-    def createVoidDataset(dsname,prefixnamespace,deploypath,outpath,licenseuri,modtime,language,stats,subjectstorender,prefixes,graph,classtree=None,propstats=None,nonnscount=None,objectmap=None,startconcept=None):
+    def createVoidDataset(dsname,prefixnamespace,deploypath,outpath,licenseuri,modtime,language,stats,subjectstorender,prefixes,classtree=None,propstats=None,nonnscount=None,objectmap=None,startconcept=None):
         g=Graph()
         if dsname==None or dsname=="":
             dsname="dataset"
@@ -40,12 +40,6 @@ def createVoidDataset(dsname,prefixnamespace,deploypath,outpath,licenseuri,modti
         if startconcept!=None and startconcept!="":
             g.add((URIRef(voidds), URIRef("http://rdfs.org/ns/void#rootResource"), URIRef(startconcept.replace("index.html",""))))
             g.add((URIRef(voidds), URIRef("http://rdfs.org/ns/void#exampleResource"), URIRef(startconcept.replace("index.html",""))))
-        for stat in stats:
-            if (URIRef(voidds),URIRef(stat),None) in graph:
-                graph.set((URIRef(voidds), URIRef(stat),
-                       Literal(int(graph.value(URIRef(voidds),URIRef(stat)))+stats[stat], datatype="http://www.w3.org/2001/XMLSchema#integer")))
-            else:
-                g.add((URIRef(voidds),URIRef(stat),Literal(stats[stat],datatype="http://www.w3.org/2001/XMLSchema#integer")))
         g.add((URIRef(voidds), URIRef("http://rdfs.org/ns/void#uriSpace"),
               Literal(prefixnamespace,datatype="http://www.w3.org/2001/XMLSchema#string")))
         for ns_prefix, namespace in g.namespaces():