accounts2 PgToLDAP.py,1.4,1.5

[Tom Lynema (lyz)]

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156

Modified Files:
	PgToLDAP.py 
Log Message:
it's actually working



Index: PgToLDAP.py
===================================================================
RCS file: /cvs/fedora/accounts2/PgToLDAP.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PgToLDAP.py	6 Dec 2006 04:22:37 -0000	1.4
+++ PgToLDAP.py	7 Dec 2006 01:40:06 -0000	1.5
@@ -208,7 +208,7 @@
 
     # Copy all users from db to ldap/ldif
     # this will to queries and mappings
-    """
+    
     try:
         if verbose:
             print "Selecting all users from Postgres Database"
@@ -238,7 +238,7 @@
 	    userLdif.append(["mail",[str(user[2])]])
 	    userLdif.append(["sn",[str(user[1])]])
 	    userLdif.append(["fedoraPersonBugzillaMail",[str(user[2])]])
-	    userLdif.append(["cn",[str(user[3])]])
+	    userLdif.append(["cn",[str(user[1])]])
 	    userLdif.append(["givenName",[str(user[3])]])
 	    userLdif.append(["fedoraPersonKeyId",[str(user[4])]])
 	    userLdif.append(["fedoraPersonSshKey",[str(user[5])]])
@@ -251,7 +251,7 @@
 	    userLdif.append(["fedoraPersonApprovalStatus",[str(user[13])]])
 	    userLdif.append(["description",[str(user[14])]]) #this one may be a streach -- original field was internal comments
 	    userLdif.append(["fedoraPersonIrcNick",[str(user[16])]])
-	    userLdif.append(["ou",["Roles"]])
+	    #userLdif.append(["ou",["Roles"]]) Adding an OU instead
 	   
 	    print userLdif
 	    #for userKey in userLdif.keys():
@@ -262,7 +262,11 @@
 
 	    #print userLdif.keys()
 	    #print userLdif.values()
-	    ldifWriter.unparse("cn=" + str(user[3]) +",ou=People,dc=fedoraproject,dc=org" , userLdif )
+	    ldifWriter.unparse("cn=" + str(user[1]) +",ou=People,dc=fedoraproject,dc=org" , userLdif )
+
+	    roleOuLdif = [["objectClass",["organizationalUnit"]] , [ "ou",[ "Roles" ] ] ] 
+	    ldifWriter.unparse("ou=Roles,cn=" + str(user[1]) +",ou=People,dc=fedoraproject,dc=org" , roleOuLdif )		
+
 	    #ldifWriter.unparse("dc=fedoraproject,dc=org, cn=" + user[3] , [ ['ano',['domini']],['uances',['od']] ])
 
 	    #time.sleep (2)
@@ -343,7 +347,7 @@
 
 
     groupCursor.close()        
-    """
+    
     # Select all roles from the DB
     
     try:
@@ -370,7 +374,7 @@
 
 
 	    uidRoleCursor = dbConn.cursor()
-            uidRoleCursor.execute ("SELECT human_name FROM person where id =" + str(role[0]) )
+            uidRoleCursor.execute ("SELECT username FROM person where id =" + str(role[0]) )
             username = uidRoleCursor.fetchone()
             uidRoleCursor.execute ("SELECT name FROM project_group where id =" + str(role[1]) )
             group = uidRoleCursor.fetchone()
@@ -401,7 +405,7 @@
 	    roleLdif.append(["fedoraRoleCreationDate",[str(role[7]) or "None" ]])
 	    roleLdif.append(["fedoraRoleApprovalDate",[str(role[8])]])
 
-	    ldifWriter.unparse("cn=" + group[0] + ",cn=" + str(role[2]) + ",ou=roles, cn=" + username[0] + ",ou=People,dc=fedoraproject,dc=org" , roleLdif )
+	    ldifWriter.unparse("cn=" + group[0] + "+fedoraRoleType=" + str(role[2]) + ",ou=Roles,cn=" + username[0] + ",ou=People,dc=fedoraproject,dc=org" , roleLdif )
 
     roleCursor.close()