[Spd-devel] SF.net SVN: spd:[279] trunk/src/spdCore.py

[<tre...@us...>]

Revision: 279
          http://spd.svn.sourceforge.net/spd/?rev=279&view=rev
Author:   treibholz
Date:     2009-09-09 12:58:06 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Code cleanup

Modified Paths:
--------------
    trunk/src/spdCore.py

Modified: trunk/src/spdCore.py
===================================================================
--- trunk/src/spdCore.py	2009-09-09 12:13:21 UTC (rev 278)
+++ trunk/src/spdCore.py	2009-09-09 12:58:06 UTC (rev 279)
@@ -224,40 +224,27 @@
 		count = 0
 		query = "CREATE TABLE passwords ( __ID INTEGER PRIMARY KEY,"
 		self.__insertStatement = "INSERT into passwords ( "
-		#insertValues = ""
 	
 		for collumns in self.__table:			# first create the table
 			count += 1
 			query += '`' + collumns + "` TEXT"
-			#insertValues += ":" + collumns
 			self.__insertStatement += '`' + collumns + '`'
 			if (count == len(self.__table)):	# write ) if last collumn
 				query += ")"
 				self.__insertStatement += ")"
-				#insertValues += ")"
 			else:								# otherwise write a ,
 				query += ", "
 				self.__insertStatement += ", "
-				#insertValues += ", "
 			
 		cursor.execute(query)
 
 		self.__insertStatement += ' VALUES ('
 
 		for i in range(0,len(self.__table[collumns])):
-			insertValues = ''
-			for collumns in self.__table:
-				#values[collumns] = self.__table[collumns][i]
-				insertValues += "'" + self.__table[collumns][i] + "',"
-
-			insertValues = re.sub(r',$',r'', insertValues)
-			try:	
-				cursor.execute(self.__insertStatement + insertValues + ')')
-			except sqlite3.OperationalError: #DEBUG
-				print "fillSQLite"
-				print insertValues
-
-
+			entry = {}
+			for j in self.__table:
+				entry.update( { j : self.__table[j][i] } )
+			self.addEntry(entry,commit=False)
 	
 		self.__sql.commit()
 	# }}}
@@ -330,7 +317,8 @@
 		try:	
 			cursor.execute(self.__insertStatement + insertValues + ')')
 		except sqlite3.OperationalError: #DEBUG
-			print "fillSQLite"
+			print "addEntry"
+			print entry
 			print insertValues
 
 		if commit:
@@ -341,12 +329,14 @@
 
 	# delete an entry
 	# patterns: list of strings
-	def delEntry(self,patterns): #{{{
+	def delEntry(self,patterns=0,id=-1): #{{{
 		cursor = self.__sql.cursor()
+		
+		if (id < 0 ):
+			query = "delete from passwords where " + self.__buildWhere(patterns) 
+		else:
+			query = "delete from passwords where __ID = " + unicode(id)
 
-		# create the query 
-		query = "delete from passwords where " + self.__buildWhere(patterns) 
-
 		cursor.execute(query)
 	#}}}	
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.