X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=statistics%2Frtsurvey.py;h=c1c004e4b291272c3fe19aafa62bf3f7ddbc1261;hp=2f2babd291f7b27e2653ebdc7e18d6e2df39ad27;hb=HEAD;hpb=8814d16dc60e8027c9a30963b47dd77b54efcdbf

diff --git a/statistics/rtsurvey.py b/statistics/rtsurvey.py
index 2f2babd..c1c004e 100755
--- a/statistics/rtsurvey.py
+++ b/statistics/rtsurvey.py
@@ -59,10 +59,16 @@ def get_rt_tickets():
 		return ""
 
 	sql = """SELECT tk.id, tk.Queue, tr.Type, tr.Field, tr.OldValue, tr.NewValue, 
-                    tr.Created, at.id, at.Subject, at.Content
-             FROM Tickets as tk, Transactions as tr 
+                    tr.Created, at.id, at.Subject, at.Content, us.Name
+             FROM Tickets as tk, Transactions as tr, Users as us
              LEFT OUTER JOIN Attachments as at ON tr.id=at.TransactionId 
-             WHERE (tk.Queue=3 OR tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>10000  """
+             WHERE (tk.Queue=3 OR tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>0 AND
+			 us.id=tr.Creator"""
+             #WHERE (tk.Queue=3 OR tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>12506 AND
+             # WHERE (tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>40800 AND 
+             #WHERE (tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>39896 AND tk.id<42241 AND ## (oct15th2008) 
+             #WHERE (tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>40800 AND ## (1st3months)
+             #WHERE (tk.Queue=3 OR tk.Queue=22) AND tk.id=tr.ObjectId AND tk.id>12506  # 12506 jan-1-2006
 
 	print "run query"
 	raw = fetch_from_db(db, sql)
@@ -82,6 +88,7 @@ def get_rt_tickets():
 		attachmentid = x[7]
 		subject = x[8]
 		content = x[9]
+		creator = x[10]
 
 		if ticket_id not in tickets:
 			print "found new ticket_id", ticket_id
@@ -104,6 +111,7 @@ def get_rt_tickets():
 					'newvalue' : newvalue,
 					'datecreated' : datecreated,
 					'attachmentid' : attachmentid,
+					'creator' : creator,
 					'subject' : subject,
 					'content' : content,
 						}
@@ -113,8 +121,6 @@ def get_rt_tickets():
 	print "sort data"
 	list = map(parse_ticket, raw)
 
-	# map(lambda x: { "email":str(x[4]), "lastupdated":str(x[5]), "owner":str(x[7]), }, raw)
-
 	db.close()
 
 
@@ -203,8 +209,8 @@ def main():
 		parser.print_help()
 		sys.exit(1)
 
-	for i,(name, pattern) in enumerate(re_map):
-		print i, name
+	#for i,(name, pattern) in enumerate(re_map):
+	#	print i, name
 
 	if config.runsql:
 		tickets = get_rt_tickets()
@@ -212,9 +218,9 @@ def main():
 	else:
 		print "loading"
 		tickets = database.dbLoad("survey_tickets")
-	print tickets[42171]['transactions'][0]
+	#print tickets[42171]['transactions'][0]
 
-	sort_tickets(tickets, re_map)
+	#sort_tickets(tickets, re_map)
 
 	# for each ticket id
 	#	scan for known keywords and sort into classes