--- ECHO_content/VLPExtension.py	2005/12/05 14:17:59	1.53
+++ ECHO_content/VLPExtension.py	2007/01/08 17:57:23	1.57
@@ -357,19 +357,19 @@ class VLP_subcollection(ECHO_collection)
            
            #content of journals also displayed if not online
            
-            if (type == "(Journal)"):
+            if (type == "(JournalVolume)"):
                online =""
             else:
                online ="AND online = 1"
             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 ('(Book)','(Collection)','(Journal)')")
+            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":