--- ECHO_content/VLPExtension.py	2006/01/20 15:12:57	1.54
+++ ECHO_content/VLPExtension.py	2007/06/29 08:21:16	1.60
@@ -364,12 +364,12 @@ class VLP_subcollection(ECHO_collection)
             sort=self.collectionSort(type)
         
             item = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature 
-                                 WHERE volumeid = '%s' """%self.getId()
+                                 WHERE volumeid ~ '%s\\\\M' """%self.getId()
                                  + """ %s AND not referenceType='%s' """%(online,type)
                                  + """ORDER BY """ + sort)]
         
             tocItem = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature 
-                                 WHERE volumeid = '%s' """%self.getId()
+                                 WHERE reference = '%s' """%self.getId()
                                  + """AND online = 1 AND referenceType='%s' """%type
                                  + """ORDER BY """ + sort)]
             
@@ -426,10 +426,11 @@ class VLP_collection(ECHO_collection):
 
     def generateSubCollections(self,errorsTXT=""):
             """erzeuge subcollectionen"""
-            founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('Edited Book'),'(Book)','(Collection)','(JournalVolume)')")
+            founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')")
             
             self.REQUEST.RESPONSE.write("<h2>Create Subcollections</h2>\n")
             for found in founds:
+
                     try:
                             foundCol=self.ZopeFind(self,obj_ids=[found.reference])
                             if foundCol:
@@ -475,6 +476,7 @@ class VLP_collection(ECHO_collection):
         files=os.listdir(self.vlp_basis)
 
         errorsTXT+="<h3>New Ressources</h3>"
+
         for fileName in files:
             
             if fileName[0:3]=="lit":
@@ -503,10 +505,10 @@ class VLP_collection(ECHO_collection):
                 except:
                         error=sys.exc_info()[0:2]
                         RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1]))
-                        errorsTXT+="<p>File not created:%s  "+"(ERROR: %s %s)</p>"%error
+                        errorsTXT+="<p>File not created:%s  (ERROR: %s %s)</p>"%(fileName,error[0],error[1])
                                 
         errorsTXT+=self.generateSubCollections()
-        errorsTXT+="/n"
+        errorsTXT+="\n"
         RESPONSE.write(errorsTXT)
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -754,7 +756,7 @@ class VLP_resource(ECHO_resource,Cacheab
     def dir2index(self):
         """dir to index"""
 
-        excludeNames=['Icon']
+        excludeNames=['Icon',':2eD']
                 
         
         def calculateName(str):