[BACK]Return to VLPExtension.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/VLPExtension.py between versions 1.55 and 1.60

version 1.55, 2006/02/13 16:41:49 version 1.60, 2007/06/29 08:21:16
Line 364  class VLP_subcollection(ECHO_collection) Line 364  class VLP_subcollection(ECHO_collection)
             sort=self.collectionSort(type)              sort=self.collectionSort(type)
                   
             item = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature               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)                                   + """ %s AND not referenceType='%s' """%(online,type)
                                  + """ORDER BY """ + sort)]                                   + """ORDER BY """ + sort)]
                   
             tocItem = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature               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                                   + """AND online = 1 AND referenceType='%s' """%type
                                  + """ORDER BY """ + sort)]                                   + """ORDER BY """ + sort)]
                           
Line 426  class VLP_collection(ECHO_collection): Line 426  class VLP_collection(ECHO_collection):
   
     def generateSubCollections(self,errorsTXT=""):      def generateSubCollections(self,errorsTXT=""):
             """erzeuge subcollectionen"""              """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")              self.REQUEST.RESPONSE.write("<h2>Create Subcollections</h2>\n")
             for found in founds:              for found in founds:
Line 505  class VLP_collection(ECHO_collection): Line 505  class VLP_collection(ECHO_collection):
                 except:                  except:
                         error=sys.exc_info()[0:2]                          error=sys.exc_info()[0:2]
                         RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1]))                          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+=self.generateSubCollections()
         errorsTXT+="/n"          errorsTXT+="\n"
         RESPONSE.write(errorsTXT)          RESPONSE.write(errorsTXT)
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
Line 756  class VLP_resource(ECHO_resource,Cacheab Line 756  class VLP_resource(ECHO_resource,Cacheab
     def dir2index(self):      def dir2index(self):
         """dir to index"""          """dir to index"""
   
         excludeNames=['Icon']          excludeNames=['Icon',':2eD']
                                   
                   
         def calculateName(str):          def calculateName(str):
Removed from v.1.55  
changed lines
  Added in v.1.60

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>