Commit 97970ea3 authored by Łukasz Nowak's avatar Łukasz Nowak

Revert "Encode to hex."

This reverts commit e1b80468 and 5057e18a.

Hex is longer then normal text and can faster lead to tag longer then 255
characters, which is deadly.
parent 5ea5776c
...@@ -93,7 +93,7 @@ if (instance_xml == empty_parameter) or (instance_xml.startswith(empty_parameter ...@@ -93,7 +93,7 @@ if (instance_xml == empty_parameter) or (instance_xml.startswith(empty_parameter
hosting_subscription_portal_type = "Hosting Subscription"\n hosting_subscription_portal_type = "Hosting Subscription"\n
\n \n
tag = "%s_%s_inProgress" % (person.getUid(), \n tag = "%s_%s_inProgress" % (person.getUid(), \n
software_title.encode(\'hex\'))\n software_title)\n
\n \n
if (portal.portal_activities.countMessageWithTag(tag) > 0):\n if (portal.portal_activities.countMessageWithTag(tag) > 0):\n
# The software instance is already under creation but can not be fetched from catalog\n # The software instance is already under creation but can not be fetched from catalog\n
......
796 797
\ No newline at end of file \ No newline at end of file
...@@ -62,7 +62,7 @@ hosting_subscription = instance.getSpecialiseValue(portal_type="Hosting Subscrip ...@@ -62,7 +62,7 @@ hosting_subscription = instance.getSpecialiseValue(portal_type="Hosting Subscrip
\n \n
# Instance can be moved from one requester to another\n # Instance can be moved from one requester to another\n
# Prevent creating two instances with the same title\n # Prevent creating two instances with the same title\n
tag = "%s_%s_inProgress" % (hosting_subscription.getUid(), software_title.encode(\'hex\'))\n tag = "%s_%s_inProgress" % (hosting_subscription.getUid(), software_title)\n
if (portal.portal_activities.countMessageWithTag(tag) > 0):\n if (portal.portal_activities.countMessageWithTag(tag) > 0):\n
# The software instance is already under creation but can not be fetched from catalog\n # The software instance is already under creation but can not be fetched from catalog\n
# As it is not possible to fetch informations, it is better to raise an error\n # As it is not possible to fetch informations, it is better to raise an error\n
......
...@@ -82,7 +82,7 @@ else:\n ...@@ -82,7 +82,7 @@ else:\n
\n \n
# Instance can be moved from one requester to another\n # Instance can be moved from one requester to another\n
# Prevent creating two instances with the same title\n # Prevent creating two instances with the same title\n
tag = "%s_%s_inProgress" % (hosting_subscription.getUid(), software_title.encode(\'hex\'))\n tag = "%s_%s_inProgress" % (hosting_subscription.getUid(), software_title)\n
if (portal.portal_activities.countMessageWithTag(tag) > 0):\n if (portal.portal_activities.countMessageWithTag(tag) > 0):\n
# The software instance is already under creation but can not be fetched from catalog\n # The software instance is already under creation but can not be fetched from catalog\n
# As it is not possible to fetch informations, it is better to raise an error\n # As it is not possible to fetch informations, it is better to raise an error\n
......
43 42
\ No newline at end of file \ No newline at end of file
...@@ -221,7 +221,7 @@ def BrowserID_checkUserExistence(self): ...@@ -221,7 +221,7 @@ def BrowserID_checkUserExistence(self):
except KeyError: except KeyError:
return False return False
user = user_dict['login'] user = user_dict['login']
tag = '%s_user_creation_in_progress' % user.encode('hex') tag = '%s_user_creation_in_progress' % user
person_list = getUserByLogin(self.getPortalObject(), user) person_list = getUserByLogin(self.getPortalObject(), user)
if len(person_list) == 0: if len(person_list) == 0:
if self.getPortalObject().portal_activities.countMessageWithTag(tag) == 0: if self.getPortalObject().portal_activities.countMessageWithTag(tag) == 0:
......
394 395
\ No newline at end of file \ No newline at end of file
...@@ -458,7 +458,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin): ...@@ -458,7 +458,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
'test_vifib_customer').getUid() 'test_vifib_customer').getUid()
software_title = sequence['root_software_instance_title'] software_title = sequence['root_software_instance_title']
tag = "%s_%s_inProgress" % (person_uid, tag = "%s_%s_inProgress" % (person_uid,
software_title.encode('hex')) software_title)
self.assertNotEqual(0, self.portal.portal_activities. self.assertNotEqual(0, self.portal.portal_activities.
countMessageWithTag(tag)) countMessageWithTag(tag))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment