pyLodStorage 0.0.71__tar.gz → 0.0.73__tar.gz

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/PKG-INFO

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

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/lodstorage/entity.py

@@ -305,12 +305,12 @@ SELECT ?eventId ?acronym ?series ?title ?year ?country ?city ?startDate ?endDate
                 pass
         elif mode is StoreMode.SPARQL:
             startTime=time.time()
-            # @ FIXME make abstract 
-            self.showProgress ("storing %d events for %s to %s" % (len(self.events),self.name,self.mode))    
+            msg=f"storing {len(listOfDicts)} {self.entityPluralName} to {self.config.mode} ({self.config.endpoint})"
+            self.showProgress (msg) 
+            # @ FIXME make abstract /configurable
             entityType="cr:Event"
-            prefixes="PREFIX cr: <http://cr.bitplan.com/>"
-            primaryKey="eventId"
-            self.sparql.insertListOfDicts(listOfDicts, entityType, primaryKey, prefixes,limit=limit,batchSize=batchSize)
+            prefixes=self.config.prefix
+            self.sparql.insertListOfDicts(listOfDicts, entityType, self.primaryKey, prefixes,limit=limit,batchSize=batchSize)
             self.showProgress ("store for %s done after %5.1f secs" % (self.name,time.time()-startTime))
         elif mode is StoreMode.SQL:
             startTime=time.time()

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/lodstorage/query.py

@@ -47,7 +47,7 @@ class QueryResultDocumentation():
         '''
         text=f"{self.title}\n{self.query.description}\n{self.sourceCodeHeader}\n{self.sourceCode}{self.tryItMarkup}\n{self.resultHeader}\n{self.result}"
         return text
-        
+
 class Query(object):
     ''' a Query e.g. for SPAQRL '''
     
@@ -105,7 +105,6 @@ class Query(object):
             markup=r"\href{%s}{%s}" % (url,title) 
         return markup
         
-    
     def prefixToLink(self,lod:list,prefix:str,tablefmt:str):
         '''
         convert url prefixes to link according to the given table format
@@ -121,11 +120,11 @@ class Query(object):
                 value=record[key]
                 if value is not None and isinstance(value,str) and value.startswith(prefix):
                     item=value.replace(prefix,"")
-                    item=urllib.parse.quote(item)
+                    uqitem=urllib.parse.unquote(item)
                     if tablefmt=="latex":
-                        link=item
+                        link=uqitem
                     else:
-                        link=self.getLink(value,item,tablefmt)
+                        link=self.getLink(value,uqitem,tablefmt)
                     record[key]=link
           
         
@@ -176,9 +175,9 @@ class Query(object):
         if withSourceCode:
             tryItMarkup=self.getLink(tryItUrl, "try it!", tablefmt)
             if tablefmt=="github":
-                title=f"**{self.title}**"
-                sourceCodeHeader="**query**"
-                resultHeader="**result**"
+                title=f"## {self.title}"
+                sourceCodeHeader="### query"
+                resultHeader="## result"
                 sourceCode=f"""```sql
 {self.query}
 ```"""

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/lodstorage/sparql.py

@@ -175,18 +175,18 @@ class SPARQL(object):
         if startTime is None:
             startTime=batchStartTime
         rdfprefix="PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-        insertCommand='%s%s\nINSERT DATA {\n' % (rdfprefix,prefixes)
+        insertCommand=f'{rdfprefix}{prefixes}\nINSERT DATA {{\n'
         for index,record in enumerate(listOfDicts):
             if not primaryKey in record:
-                errors.append("missing primary key %s in record %d" % (primaryKey,index))
+                errors.append(f"missing primary key {primaryKey} in record {index}")
             else:    
                 primaryValue=record[primaryKey]
                 if primaryValue is None:
-                    errors.append("primary key %s value is None in record %d" % (primaryKey,index))    
+                    errors.append(f"primary key {primaryKey} value is None in record {index}")    
                 else:    
                     encodedPrimaryValue=self.getLocalName(primaryValue)
-                    tSubject="%s__%s" %(entityType,encodedPrimaryValue)
-                    insertCommand+='  %s rdf:type "%s".\n' %(tSubject,entityType)
+                    tSubject=f"{entityType}__{encodedPrimaryValue}" 
+                    insertCommand+=f'  {tSubject} rdf:type "{entityType}".\n' 
                     for keyValue in record.items():
                         key,value=keyValue
                         # convert key if necessary
@@ -194,7 +194,7 @@ class SPARQL(object):
                         valueType=type(value)
                         if self.debug:
                             print("%s(%s)=%s" % (key,valueType,value))
-                        tPredicate="%s_%s" % (entityType,key)
+                        tPredicate=f"{entityType}_{key}" 
                         tObject=value    
                         if valueType == str:
                             escapedString=self.controlEscape(value)

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/pylodstorage.egg-info/PKG-INFO

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

{pylodstorage-0.0.71 → pylodstorage-0.0.73}/setup.py

@@ -11,7 +11,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='pylodstorage',
-    version='0.0.71',
+    version='0.0.73',
 
     packages=['lodstorage',],
     author='Wolfgang Fahl',