--- cdli/cdli_files.py	2008/10/13 10:45:02	1.98
+++ cdli/cdli_files.py	2008/10/15 07:48:05	1.99
@@ -228,11 +228,22 @@ class BasketContent(SimpleItem):
         """content"""
         self.contentList=content[0:]
     
-    def getContent(self):
+    def getContent(self,filtered=True):
         """get content"""
-        
-        return self.contentList
-    
+        ret=[]
+	if filtered:
+	    for x in self.contentList:
+                if not((x[0] is None) or (x[1] is None)):
+                        ret.append(x)
+            return ret
+    	
+	else:
+	    return self.contentList
+
+    def allContent(self):
+        """get all content"""
+        return self.getContent(filtered=False)
+
     def setContent(self,content):
         self.contentList=content[0:]