pyLodStorage 0.3.5__tar.gz → 0.3.7__tar.gz

{pylodstorage-0.3.5/pylodstorage.egg-info → pylodstorage-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.3.5
+Version: 0.3.7
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.3.5 → pylodstorage-0.3.7}/lodstorage/trulytabular.py

@@ -333,6 +333,8 @@ WHERE
 }}"""
         try:
             count=self.sparql.getValue(query, "count")
+            # workaround https://github.com/ad-freiburg/qlever/issues/717
+            count=int(count)
         except Exception as ex:
             self.error=ex
             count=None
@@ -535,19 +537,16 @@ ORDER BY DESC (?count)
         # work around https://github.com/RDFLib/sparqlwrapper/issues/211
         if "described at" in propertyLabel:
             propertyLabel=propertyLabel.replace("described at","describ'd at")
-        sparql=f"""
-# Count all {self.asText(long=True)} items
-# with the given {propertyLabel}({propertyId}) https://www.wikidata.org/wiki/Property:{propertyId} 
-SELECT ?item ?itemLabel (COUNT (?value) AS ?count)
+        sparql=f"""SELECT ?item ?itemLabel (COUNT (?value) AS ?count)
 WHERE
 {{
   # instance of {self.item.qlabel}
   ?item wdt:P31 wd:{self.itemQid}.{self.where}
   ?item rdfs:label ?itemLabel.
-  filter (lang(?itemLabel) = "en").
+  FILTER (LANG(?itemLabel) = "{self.lang}").
   # {propertyLabel}
   ?item {wdProperty.getPredicate()} ?value.
-}} GROUP by ?item ?itemLabel
+}} GROUP BY ?item ?itemLabel
 """
         if asFrequency:
             freqDesc="frequencies"
@@ -561,6 +560,10 @@ ORDER BY DESC (?frequency)"""
             sparql=f"""{sparql}
 HAVING (COUNT (?value) > 1)
 ORDER BY DESC(?count)"""
+        sparql=f"""# Count all {self.asText(long=True)} items
+# with the given {propertyLabel}({propertyId}) https://www.wikidata.org/wiki/Property:{propertyId} 
+{WikidataItem.getPrefixes()}
+"""+sparql
         title=f"non tabular entries for {self.item.qlabel}/{propertyLabel}:{freqDesc}"
         name=f"NonTabular {self.item.qlabel}/{propertyLabel}:{freqDesc}"
         query=Query(query=sparql,name=name,title=title)

{pylodstorage-0.3.5 → pylodstorage-0.3.7}/lodstorage/version.py

@@ -9,7 +9,7 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.3.5'
+    version='0.3.7'
     date = '2020-09-10'
-    updated = '2022-07-30'
+    updated = '2022-07-31'
     description='python List of Dict (Table) Storage library'

{pylodstorage-0.3.5 → pylodstorage-0.3.7/pylodstorage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.3.5
+Version: 0.3.7
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl