Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #44 #87 #71 #88

Merged
merged 7 commits into from
Jan 24, 2019
Merged

Fixes #44 #87 #71 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1354de6
Fixes #44
jgrocha Dec 16, 2017
1acb88a
Fixes #44
jgrocha Dec 16, 2017
c4bf529
Fixes #87
jgrocha Dec 17, 2017
5158de3
xmlNameFixUp returns ascii identifier
jgrocha Dec 17, 2017
d0257df
allow xmlNameFixUp to be called with str or unicode string
jgrocha Dec 17, 2017
5ab467a
fix xmlNameFixUp
jgrocha Dec 22, 2017
2bab791
Merge branch 'master' into fix-utf8-sld
jgrocha Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions geoserverexplorer/gui/gsnameutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@

# noinspection PyPep8Naming
def xmlNameFixUp(name):
# TODO: handle bad unicode characters, too
n = name.replace(u' ', u'_') # doesn't hurt to always do this
if not isinstance(name, unicode):
name = name.decode('utf-8', errors='ignore')
n = unicode(unicodedata.normalize('NFKD', name).encode('ascii','ignore'))
n = re.sub('[ /\\\\]', '_', n)
if not xmlNameIsValid(n) and not n.startswith(u'_'):
rx = QRegExp(r'^(?=XML|\d|\W).*', Qt.CaseInsensitive)
if rx.exactMatch(n):
Expand Down
5 changes: 3 additions & 2 deletions geoserverexplorer/qgis/catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ def publishStyle(self, layer, overwrite = True, name = None):
layer = layers.resolveLayer(layer)
sld, icons = getGsCompatibleSld(layer)
if sld is not None:
name = name if name is not None else layer.name()
name = name.replace(" ", "_")
name = name if name is not None else xmlNameFixUp(layer.name())
if layer.name() != name:
sld = sld.replace(layer.name(), name)
self.uploadIcons(icons)
self.catalog.create_style(name, sld, overwrite)
return sld
Expand Down