iteration over lists and dictionaries fixed up

LDP/lampadas/pylib/DataLayer.py

@@ -53,7 +53,7 @@ class LampadasList:
 
 	def keys(self):
 		return self.list.keys()
-
+	
 	def items(self):
 		return self.list.items()
 
@@ -91,6 +91,9 @@ class LampadasCollection:
 	def __delitem__(self, key):
 		del self.data[key]
 
+	def keys(self):
+		return self.data.keys()
+
 	def Count(self):
 		return len(self.data)
 

LDP/lampadas/pylib/HTML.py

@@ -27,7 +27,9 @@ class ComboFactory:
 	def ClassesCombo(self, value, lang):
 
 		self.combo = "<select name='class'>\n"
-		for classfoo in L.Classes:
+		keys = L.Classes.keys()
+		for key in keys:
+			classfoo = L.Classes[key]
 			if classfoo == None: break
 			self.combo = self.combo + "<option "
 			if classfoo.ID == value:
@@ -38,22 +40,27 @@ class ComboFactory:
 		self.combo = self.combo + "</select>"
 		return self.combo
 
-	def DocsCombo(self, value):
+	def DocsCombo(self, value, lang=None):
 		self.combo = "<select name='doc'>\n"
-		for doc in L.Docs:
+		keys = L.Docs.keys()
+		for key in keys:
+			doc = L.Docs[key]
 			if doc == None: break
-			self.combo = self.combo + "<option "
-			if doc.ID == value:
-				self.combo = self.combo + "selected "
-			self.combo = self.combo + "value='" + str(doc.ID) + "'>"
-			self.combo = self.combo + doc.Title
-			self.combo = self.combo + "</option>\n"
+			if doc.LanguageCode == lang or lang == None:
+				self.combo = self.combo + "<option "
+				if doc.ID == value:
+					self.combo = self.combo + "selected "
+				self.combo = self.combo + "value='" + str(doc.ID) + "'>"
+				self.combo = self.combo + doc.Title
+				self.combo = self.combo + "</option>\n"
 		self.combo = self.combo + "</select>"
 		return self.combo
 
 
 Factory = ComboFactory()
-output = Factory.ClassesCombo(2,'EN')
+#output = Factory.ClassesCombo(2,'EN')
+#print output
+output = Factory.DocsCombo(2)
 print output
 
 #if __name__ == "__main__":

LDP/lampadas/pylib/UnitTest.py

@@ -81,6 +81,11 @@ class testDocs(unittest.TestCase):
 		self.NewID = DB.Value('SELECT MAX(doc_id) from document')
 		assert self.NewID == self.OldID
 
+		keys = L.Docs.keys()
+		for key in keys:
+			self.Doc = L.Docs[key]
+			assert self.Doc.ID == key
+
 	def testMapping(self):
 		self.Doc = L.Docs[1]
 		assert not self.Doc == None