Skip to content

Commit

Permalink
Add lang option for glossary delete command
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesni committed May 30, 2012
1 parent 0dfb242 commit 2030547
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
9 changes: 7 additions & 2 deletions zanataclient/zanata.py
Expand Up @@ -887,6 +887,7 @@ def glossary_push(command_options, args):
zanatacmd.csvglossary_push(path, url, username, apikey, locale_map, comments_header)

def glossary_delete(command_options, args):
lang = None
optionsutil = OptionsUtil(command_options)
url, username, apikey = optionsutil.apply_configfiles()
get_version(url, command_options)
Expand All @@ -897,9 +898,13 @@ def glossary_delete(command_options, args):
if command_options.has_key('disablesslcert'):
zanatacmd.disable_ssl_cert_validation()

log.info("Delete all the glossary terms on the server")
if command_options.has_key('lang'):
lang = command_options['lang'][0]['value'].split(',')[0]
log.info("Delete the glossary terms in %s on the server" % lang)
else:
log.info("Delete all the glossary terms on the server")

zanatacmd.delete_glossary(url, username, apikey)
zanatacmd.delete_glossary(url, username, apikey, lang)

command_handler_factories = {
'help': makeHandler(help_info),
Expand Down
6 changes: 3 additions & 3 deletions zanataclient/zanatacmd.py
Expand Up @@ -537,16 +537,16 @@ def csvglossary_push(self, path, url, username, apikey, locale_map, comments_hea
except ZanataException, e:
self.log.error(str(e))

def delete_glossary(self, url, username, apikey):
def delete_glossary(self, url, username, apikey, lang = None):
glossary = GlossaryService(url)

try:
glossary.delete(username, apikey)
glossary.delete(username, apikey, lang)
except UnAvaliableResourceException:
self.log.error("Can not delete glossary terms on the server")
except UnavailableServiceError:
self.log.error("Service Temporarily Unavailable, stop processing!")
except ZanataException, e:
self.log.error(str(e))
else:
self.log.info("Successfully delete all the glossary terms on the server")
self.log.info("Successfully delete the glossary terms on the server")
11 changes: 8 additions & 3 deletions zanataclient/zanatalib/glossaryservice.py
Expand Up @@ -56,13 +56,18 @@ def commit_glossary(self, username, apikey, resources):
else:
raise UnexpectedStatusException('Error', 'Unexpected Status, failed to push')

def delete(self, username, apikey):
def delete(self, username, apikey, lang = None):
headers = {}
headers['X-Auth-User'] = username
headers['X-Auth-Token'] = apikey

res, content = self.restclient.request_delete('/seam/resource/restv1/glossary', headers=headers)

resource = '/seam/resource/restv1/glossary'

if lang:
resource = resource + '/'+lang

res, content = self.restclient.request_delete(resource, headers=headers)

if res['status'] == '200':
return True
elif res['status'] == '401':
Expand Down

0 comments on commit 2030547

Please sign in to comment.