version 1.87, 2008/12/17 12:05:00
|
version 1.88, 2008/12/17 12:12:27
|
Line 586 class VLP_collection(ECHO_collection,Acq
|
Line 586 class VLP_collection(ECHO_collection,Acq
|
col = foundCol |
col = foundCol |
logging.debug("generateSubCollections: subcollection %s exists (%s)"%(repr(col),found.reference)) |
logging.debug("generateSubCollections: subcollection %s exists (%s)"%(repr(col),found.reference)) |
logging.debug(repr([col.title,found.titlerefdisplay,col.label,found.titlerefdisplay])) |
logging.debug(repr([col.title,found.titlerefdisplay,col.label,found.titlerefdisplay])) |
if (unicodify(col.title) != found.titlerefdisplay) or (unicodify(col.label) != found.titlerefdisplay): |
if (unicodify(col.title) != unicodify(found.titlerefdisplay)) or (unicodify(col.label) != unicodify(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!") |
col.aq_parent.manage_delObjects([col.getId()]) |
col.aq_parent.manage_delObjects([col.getId()]) |
Line 740 class VLP_collection(ECHO_collection,Acq
|
Line 740 class VLP_collection(ECHO_collection,Acq
|
errorsTXT+="<p>File not created:%s (ERROR: %s %s)</p>\n"%(fileName,error[0],error[1]) |
errorsTXT+="<p>File not created:%s (ERROR: %s %s)</p>\n"%(fileName,error[0],error[1]) |
return errorsTXT |
return errorsTXT |
|
|
def updateCollection(self,forceUpdate=False,RESPONSE=None): |
def updateCollection(self,forceUpdate=True,RESPONSE=None): |
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
|
|
# update subcollections |
# update subcollections |
Line 807 class VLP_resource(ECHO_resource,Cacheab
|
Line 807 class VLP_resource(ECHO_resource,Cacheab
|
|
|
meta_type="VLP_resource" |
meta_type="VLP_resource" |
|
|
|
def _p_resolveConflict(self,oldstate,savedstate,newstate): |
|
logging.debug("updateCollection: Have to resolve conflict!") |
|
return newstate |
|
|
#vlp_basis="/mpiwg/online/permanent/vlp" |
#vlp_basis="/mpiwg/online/permanent/vlp" |
|
|
|
|
Line 843 class VLP_resource(ECHO_resource,Cacheab
|
Line 847 class VLP_resource(ECHO_resource,Cacheab
|
|
|
if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')): |
if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')): |
|
|
|
|
|
pagesHi = os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')) |
|
if path is None: |
|
return os.path.join(self.vlp_basis,self.resourceID,'pagesHi') |
|
|
|
pages = os.listdir(path) |
|
|
|
if len (pagesHi) > len(pages): |
|
|
|
countHi=0 |
|
for p in pagesHi: |
|
dat,ext = os.path.splitext(p) |
|
if ext.lower() in [".tiff",".tif",".jpg"]: |
|
countHi+=1 |
|
count=0 |
|
for p in pages: |
|
dat,ext = os.path.splitext(p) |
|
if ext.lower() in [".tiff",".tif",".jpg"]: |
|
count+=1 |
|
|
|
if countHi > count: |
|
path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') |
|
|
|
logging.error("pages < pagesHi: %s"%self.resourceID) |
|
if path is None: |
|
|
|
|
if len (os.listdir(self.vlp_basis,self.resourceID,'pagesHi')) > len(os.listdir(path)): |
if len (os.listdir(self.vlp_basis,self.resourceID,'pagesHi')) > len(os.listdir(path)): |
|
|
|
|
Line 850 class VLP_resource(ECHO_resource,Cacheab
|
Line 881 class VLP_resource(ECHO_resource,Cacheab
|
path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') |
path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') |
logging.error("pages < pagesHi: %s"%self.resourceID) |
logging.error("pages < pagesHi: %s"%self.resourceID) |
else: |
else: |
|
|
logging.error("no images: %s"%self.resourceID) |
logging.error("no images: %s"%self.resourceID) |
return None |
return None |
|
|
|
return path |
|
|
|
|
def transcription(self): |
def transcription(self): |
"""show the rendered transcriptiofile""" |
"""show the rendered transcriptiofile""" |
Line 1078 class VLP_resource(ECHO_resource,Cacheab
|
Line 1112 class VLP_resource(ECHO_resource,Cacheab
|
ret="%s: %s"%(str[0],name) |
ret="%s: %s"%(str[0],name) |
return ret |
return ret |
|
|
self.imagePath=self.getImagePath(); |
self.imagePathFull=self.getImagePath(); |
if (selfImagePath is None): |
self.imagePath=self.imagePathFull.split("/")[-1] |
|
if (self.imagePath is None): |
return None |
return None |
|
|
temp=[] |
temp=[] |
ret = os.listdir(self.imagePathj); |
ret = os.listdir(self.imagePathFull) |
|
|
ret.sort() |
ret.sort() |
for x in ret: |
for x in ret: |