modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

les valeurs None ne sont pas affichées. <break_here/> n'a pas de valeur

This commit is contained in:
Jephté Clain 2016-06-10 01:34:38 +04:00
parent 16c1936e65
commit a49d6e2a24
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ulib/support/cgilsxml.py
View File

@ -15,7 +15,8 @@ import xml.etree.ElementTree as ET
# _u() et datef() sont des fonctions de pyulib, recopiées ici pour ne pas devoir # _u() et datef() sont des fonctions de pyulib, recopiées ici pour ne pas devoir
# dépendre d'une librairie extérieure # dépendre d'une librairie extérieure
def _u(u): def _u(u):
if type(u) not in StringTypes: u = unicode(str(u), 'utf-8', 'strict') if u is None: return None
elif type(u) not in StringTypes: u = unicode(str(u), 'utf-8', 'strict')
elif type(u) is not UnicodeType: u = unicode(u, 'utf-8', 'strict') elif type(u) is not UnicodeType: u = unicode(u, 'utf-8', 'strict')
return u return u
DATEF_MAP = {'%Y': '%(y)04i', '%m': '%(m)02i', '%d': '%(d)02i', '%H': '%(H)02i', '%M': '%(M)02i', '%S': '%(S)02i'} DATEF_MAP = {'%Y': '%(y)04i', '%m': '%(m)02i', '%d': '%(d)02i', '%H': '%(H)02i', '%M': '%(M)02i', '%S': '%(S)02i'}
@ -255,12 +256,16 @@ def print_files(files, fgroups=None, select_group=None, script_name=None, xslt=N
orig_query_string = query_string orig_query_string = query_string
if orig_query_string is not None: if orig_query_string is not None:
query_string = orig_query_string query_string = orig_query_string
params = urlparse.parse_qsl(query_string, keep_blank_values=True) params = []
query_string = _u(query_string) if query_string is not None:
params = urlparse.parse_qsl(query_string, keep_blank_values=True)
fquery_string = filter_query_string(orig_query_string, includes, excludes, prefix) query_string = _u(query_string)
fparams = urlparse.parse_qsl(fquery_string, keep_blank_values=True) fquery_string = orig_query_string
fquery_string = _u(fquery_string) fparams = []
if fquery_string is not None:
fquery_string = filter_query_string(fquery_string, includes, excludes, prefix)
fparams = urlparse.parse_qsl(fquery_string, keep_blank_values=True)
fquery_string = _u(fquery_string)
if includes or excludes or prefix: if includes or excludes or prefix:
xorig = ET.SubElement(xenv, "orig") xorig = ET.SubElement(xenv, "orig")
@ -295,7 +300,8 @@ def print_files(files, fgroups=None, select_group=None, script_name=None, xslt=N
for file in files: for file in files:
if file.dontlist: continue if file.dontlist: continue
current_classifier = (file.group, file.break_on) current_classifier = (file.group, file.break_on)
file.break_here = first or current_classifier != last_classifier if first or current_classifier != last_classifier:
file.break_here = None
last_classifier = current_classifier last_classifier = current_classifier
first = False first = False
xfile = ET.SubElement(xfiles, "file") xfile = ET.SubElement(xfiles, "file")