--- ECHO_content/VLPExtension.py 2005/12/05 14:17:59 1.53 +++ ECHO_content/VLPExtension.py 2007/06/29 08:21:16 1.60 @@ -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("
(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') @@ -754,7 +756,7 @@ class VLP_resource(ECHO_resource,Cacheab def dir2index(self): """dir to index""" - excludeNames=['Icon'] + excludeNames=['Icon',':2eD'] def calculateName(str):