--- ECHO_content/VLPExtension.py 2007/01/08 17:57:23 1.57 +++ ECHO_content/VLPExtension.py 2007/06/29 08:21:16 1.60 @@ -364,7 +364,7 @@ class VLP_subcollection(ECHO_collection) sort=self.collectionSort(type) item = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature - WHERE volumeid ~ '%s\\M' """%self.getId() + WHERE volumeid ~ '%s\\\\M' """%self.getId() + """ %s AND not referenceType='%s' """%(online,type) + """ORDER BY """ + sort)] @@ -426,7 +426,7 @@ 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)','(Generic Container)'") + founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')") self.REQUEST.RESPONSE.write("

Create Subcollections

\n") for found in founds: @@ -505,10 +505,10 @@ class VLP_collection(ECHO_collection): except: error=sys.exc_info()[0:2] RESPONSE.write("

(ERROR (%s): %s %s)

\n"%(fileName,error[0],error[1])) - errorsTXT+="

File not created:%s "+"(ERROR: %s %s)

"%error + errorsTXT+="

File not created:%s (ERROR: %s %s)

"%(fileName,error[0],error[1]) errorsTXT+=self.generateSubCollections() - errorsTXT+="/n" + errorsTXT+="\n" RESPONSE.write(errorsTXT) if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -756,7 +756,7 @@ class VLP_resource(ECHO_resource,Cacheab def dir2index(self): """dir to index""" - excludeNames=['Icon'] + excludeNames=['Icon',':2eD'] def calculateName(str):