pyLodStorage 0.1.0__tar.gz → 0.1.2__tar.gz

{pylodstorage-0.1.0 → pylodstorage-0.1.2}/PKG-INFO

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

{pylodstorage-0.1.0 → pylodstorage-0.1.2}/lodstorage/query.py

@@ -46,7 +46,7 @@ class QueryResultDocumentation():
         
         
     @staticmethod
-    def uniCode2Latex(text:str)->str:
+    def uniCode2Latex(text:str,withConvert:bool=False)->str:
         '''
         converts unicode text to latex and 
         fixes UTF-8 chars for latex in a certain range:
@@ -56,13 +56,19 @@ class QueryResultDocumentation():
    
         Args:
             text(str): the string to fix
+            withConvert(bool): if unicode to latex libary conversion should be used
         
         Return:
             str: latex presentation of UTF-8 char
         '''
         for code in range(8320,8330):
             text=text.replace(chr(code),f"$_{code-8320}$")
-        return unicode_to_latex(text)
+        if withConvert:
+            latex=unicode_to_latex(text)
+            # workaround {\textbackslash} being returned
+            #latex=latex.replace("{\\textbackslash}",'\\')
+            text=latex
+        return text
     
     @staticmethod
     def wikiDataLink(record,key,value,tablefmt):

{pylodstorage-0.1.0 → pylodstorage-0.1.2}/lodstorage/querymain.py

@@ -3,7 +3,7 @@ Created on 2022-02-13
 
 @author: wf
 '''
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 __date__ = '2020-09-10'
 __updated__ = '2022-02-13'   
 DEBUG = 0
@@ -13,7 +13,7 @@ import sys
 import os
 from argparse import ArgumentParser
 from argparse import RawDescriptionHelpFormatter
-from lodstorage.query import QueryManager
+from lodstorage.query import QueryManager, QueryResultDocumentation
 from lodstorage.sparql import SPARQL
 from lodstorage.csv import CSV
 
@@ -22,6 +22,9 @@ class Format(Enum):
     json = 'json'
     xml = 'xml'
     tsv = 'tsv'
+    latex = 'latex'
+    mediawiki= 'mediawiki'
+    github = 'github'
  
     def __str__(self):
         return self.value
@@ -45,10 +48,17 @@ class QueryMain:
             query=qm.queriesByName[args.queryName]
             if args.language=="sparql":
                 endpoint=SPARQL(query.endpoint)
+                if "wikidata" in query.endpoint:
+                    query.addFormatCallBack(QueryResultDocumentation.wikiDataLink)  
                 qlod=endpoint.queryAsListOfDicts(query.query)
             if args.format is Format.csv:
                 csv=CSV.toCSV(qlod)
                 print(csv)
+            elif args.format is Format.latex or args.format is Format.github or args.format is Format.mediawiki:
+                doc=query.documentQueryResult(qlod, tablefmt=str(args.format),floatfmt=".0f")
+                docstr=doc.asText()
+                print (docstr)
+                
 
 
 def mainSQL(argv=None):

{pylodstorage-0.1.0 → pylodstorage-0.1.2}/pylodstorage.egg-info/PKG-INFO

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

pylodstorage-0.1.2/pylodstorage.egg-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+lodquery = lodstorage.querymain:main
+sparqlquery = lodstorage.querymain:mainSPARQL
+sqlquery = lodstorage.querymain:mainSQL
+

{pylodstorage-0.1.0 → pylodstorage-0.1.2}/setup.py

@@ -11,7 +11,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='pylodstorage',
-    version='0.1.0',
+    version='0.1.2',
 
     packages=['lodstorage',],
     author='Wolfgang Fahl',
@@ -44,9 +44,9 @@ setup(
     ],
     entry_points={
       'console_scripts': [
-        'sparqlquery = lodstorage.query:mainSPARQL',
-        'sqlquery=lodstorage.query:mainSQL',
-        'lodquery=lodstorage.query:main'
+        'sparqlquery = lodstorage.querymain:mainSPARQL',
+        'sqlquery=lodstorage.querymain:mainSQL',
+        'lodquery=lodstorage.querymain:main'
       ],
     },
     long_description=long_description,

pylodstorage-0.1.0/pylodstorage.egg-info/entry_points.txt

@@ -1,5 +0,0 @@
-[console_scripts]
-lodquery = lodstorage.query:main
-sparqlquery = lodstorage.query:mainSPARQL
-sqlquery = lodstorage.query:mainSQL
-