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

Diff for /ECHO_content/VLPExtension.py between versions 1.78 and 1.79

version 1.78, 2008/10/08 08:35:20 version 1.79, 2008/10/08 10:18:04
Line 565  class VLP_collection(ECHO_collection,Acq Line 565  class VLP_collection(ECHO_collection,Acq
         for found in founds:          for found in founds:
             try:              try:
                 litid = str(found.reference)                  litid = str(found.reference)
                 foundCol=self.ZopeFind(self,obj_ids=[litid])                  foundCol=self.findObjFromLitName(litid)
                   #foundCol=self.ZopeFind(self,obj_ids=[litid])
                 if foundCol:                  if foundCol:
                     col = foundCol[0][1]                      col = foundCol
                     logging.debug("generateSubCollections: subcollection %s exists (%s)"%(col.getId(),found.reference))                      logging.debug("generateSubCollections: subcollection %s exists (%s)"%(repr(col),found.reference))
                     if (col.title != found.titlerefdisplay) or (col.label != found.titlerefdisplay):                      if (col.title != found.titlerefdisplay) or (col.label != found.titlerefdisplay):
                         # subcollection seems to have changed                              # subcollection seems to have changed    
                         logging.debug("generateSubCollections: subcollection has changed, recreating!")                          logging.debug("generateSubCollections: subcollection has changed, recreating!")
                         self.manage_delObjects([foundCol[0][0]])                          col.aq_parent.manage_delObjects([col.getId()])
                         manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay)                          manage_addVLP_subCollection(self.getOrCreateFolderForFile(litid),litid,found.titlerefdisplay,found.titlerefdisplay)
                 else:                  else:
                     logging.debug("generateSubCollections: creating new subcollection %s"%found.reference)                      logging.debug("generateSubCollections: creating new subcollection %s"%found.reference)
                     manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay)                      manage_addVLP_subCollection(self.getOrCreateFolderForFile(litid),litid,found.titlerefdisplay,found.titlerefdisplay)
                                   
                 #teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter)                  #teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter)
                 if os.path.exists(os.path.join(self.vlp_basis,litid)):                  if os.path.exists(os.path.join(self.vlp_basis,litid)):
                     logging.debug("generateSubCollections: found frontmatter in %s"%litid)                      logging.debug("generateSubCollections: found frontmatter in %s"%litid)
                     obj=getattr(self,litid)                      obj=self.findObjFromLitName(litid)
                     if not self.ZopeFind(obj,obj_ids=[litid]):                      if not self.ZopeFind(obj,obj_ids=[litid]):
                         metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta"                          metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta"
                         newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','')                          newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','')
Removed from v.1.78  
changed lines
  Added in v.1.79

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