Fix history deletion method in Galaxy check script

This commit is contained in:
Nate Coraor
2009-05-05 13:03:23 -04:00
parent a9e976277e
commit a6cc479643
+2 -19
View File
@@ -141,15 +141,8 @@ class Browser:
print "Remaining datasets ids:", " ".join( p.dids )
raise Exception, "History still contains datasets after attempting to delete them"
if new_history:
self.get("/root/history_options")
p = hidParser()
p.feed(tc.browser.get_html())
if p.hid is None:
print "Unable to determine hid to delete old history"
sys.exit(1)
else:
self.get("/root/history_delete?id=%s" % p.hid)
tc.save_cookies(self.cookie_jar)
self.get("/history/delete_current")
tc.save_cookies(self.cookie_jar)
def check_redir(self, url):
try:
@@ -334,16 +327,6 @@ class didParser(htmllib.HTMLParser):
self.dids.append( i[1].rsplit("historyItemContainer-", 1)[1] )
dprint("got a dataset id: %s" % self.dids[-1])
class hidParser(htmllib.HTMLParser):
def __init__(self):
htmllib.HTMLParser.__init__(self, formatter.NullFormatter())
self.hid = None
def start_a(self, attrs):
for i in attrs:
if i[0] == "href" and i[1].startswith("/root/history_delete"):
self.hid = i[1].rsplit("=", 1)[1]
dprint("got a history id: %s" % self.hid)
class loggedinParser(htmllib.HTMLParser):
def __init__(self):
htmllib.HTMLParser.__init__(self, formatter.NullFormatter())