[Spd-devel] SF.net SVN: spd:[272] trunk/src

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

Revision: 272
          http://spd.svn.sourceforge.net/spd/?rev=272&view=rev
Author:   treibholz
Date:     2009-09-07 18:43:16 +0000 (Mon, 07 Sep 2009)

Log Message:
-----------
extended the API a little bit for IDs, so editing and specific deletion will be possible.

TODO: spdCLI needs to sort its output now.

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

Modified: trunk/src/spdCLI.py
===================================================================
--- trunk/src/spdCLI.py	2009-09-06 21:20:39 UTC (rev 271)
+++ trunk/src/spdCLI.py	2009-09-07 18:43:16 UTC (rev 272)
@@ -86,7 +86,7 @@
 					output += table[j][i]
 					output += self.colorReset
 				else: 
-					output += table[j][i]
+					output += str(table[j][i])
 
 				print output
 			print ""

Modified: trunk/src/spdCore.py
===================================================================
--- trunk/src/spdCore.py	2009-09-06 21:20:39 UTC (rev 271)
+++ trunk/src/spdCore.py	2009-09-07 18:43:16 UTC (rev 272)
@@ -261,30 +261,40 @@
 	# dump SQLite in self.__table
 	def dumpSQLite(self): #{{{
 		# quite easy, eh? :-)
-		self.__table = self.findPassword("%")
+		self.__table = self.findPassword("%",output='noID')
 
 	#}}}
 
 	# find a password in SQLite
 	# patterns: list of strings (filter)
-	def findPassword(self,patterns): #{{{
+	def findPassword(self,patterns,output='table'): #{{{
 		cursor = self.__sql.cursor()
 		
 		# create the query 
 		count = 0
 		searchCollumns = '' 
-		for i in self.__table:
-			searchCollumns += i + ','
+		if (output == 'id'):
+			searchCollumns = '__ID'
+			result = { "ID" : []}
 
-		searchCollumns = re.sub(r',$','',searchCollumns)
+		else:
 
+			result = {}
+
+			if (output != "noID" ):
+				result.update({'__ID' : [] })
+			result.update(self.__table)
+
+			for i in result:
+				searchCollumns += i + ','
+
+			searchCollumns = re.sub(r',$','',searchCollumns)
+
 		query = "select " + searchCollumns + " from passwords where " +  self.__buildWhere(patterns) 
-		
 		cursor.execute(query)
 
 		# convert the result in a Dictionary
 		# this looks a little bit unelegant.... FIXME
-		result = self.__table # make a copy
 		for row in cursor:
 			count = 0
 			for i in row:


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