version 1.83, 2008/11/16 12:15:42
|
version 1.84, 2008/11/20 10:45:14
|
Line 520 class VLP_collection(ECHO_collection,Acq
|
Line 520 class VLP_collection(ECHO_collection,Acq
|
|
|
actual_url=request['ACTUAL_URL'] |
actual_url=request['ACTUAL_URL'] |
lastActual=actual_url.split("/")[-1] |
lastActual=actual_url.split("/")[-1] |
|
logging.debug("pub_trav:"+actual_url) |
|
|
if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk |
if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk |
# umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird |
# umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird |
Line 531 class VLP_collection(ECHO_collection,Acq
|
Line 531 class VLP_collection(ECHO_collection,Acq
|
return "LIt not found" |
return "LIt not found" |
else: |
else: |
|
|
logging.error("request:"+repr(ob)) |
logging.debug("request:"+repr(ob)) |
request.response.setStatus(200) |
request.response.setStatus(200) |
#if (lastActual=="index_meta"): |
#if (lastActual=="index_meta"): |
# logging.debug("index_meta requested") |
# logging.debug("index_meta requested") |
Line 582 class VLP_collection(ECHO_collection,Acq
|
Line 582 class VLP_collection(ECHO_collection,Acq
|
if foundCol: |
if foundCol: |
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)) |
if (col.title != found.titlerefdisplay) or (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): |
# 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 611 class VLP_collection(ECHO_collection,Acq
|
Line 612 class VLP_collection(ECHO_collection,Acq
|
error=sys.exc_info()[0:2] |
error=sys.exc_info()[0:2] |
logging.error("generateSubCollections: ERROR in %s"%litid) |
logging.error("generateSubCollections: ERROR in %s"%litid) |
if RESPONSE is not None: |
if RESPONSE is not None: |
|
RESPONSE.write("<p>(ERROR updateII(%s): %s %s TXT: %s)\n</p>"%(litid,error[0],error[1],sys.exc_info()[2])) |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(litid,error[0],error[1])) |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(litid,error[0],error[1])) |
#logging.error("generateSubCollections: %s %s"%error) |
logging.error("generateSubCollections: %s %s"%error) |
#self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1]))) |
self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1]))) |
errorsTXT+="<p>ERROR: No subcollection of %s (ERROR: %s %s)</p>\n"%(litid,error[0],error[1]) |
errorsTXT+="<p>ERROR: No subcollection of %s (ERROR: %s %s)</p>\n"%(litid,error[0],error[1]) |
#errorsTXT+="<p>No subcollection of %s "%litid+"(ERROR: %s %s)</p>"%error |
errorsTXT+="<p>No subcollection of %s "%litid+"(ERROR: %s %s)</p>"%error |
|
|
return errorsTXT |
return errorsTXT |
|
|
Line 653 class VLP_collection(ECHO_collection,Acq
|
Line 655 class VLP_collection(ECHO_collection,Acq
|
|
|
return current |
return current |
|
|
def updateCollection(self,forceUpdate=False,RESPONSE=None): |
def changeOrAddResources(self,forceUpdate=False,RESPONSE=None): |
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
"""changes ord updates all resources found in the file system""" |
|
|
errorsTXT="<h2>Errors</h2>" |
errorsTXT="<h2>Errors</h2>" |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.setHeader('Content-Type','text/html') |
RESPONSE.setHeader('Content-Type','text/html') |
Line 711 class VLP_collection(ECHO_collection,Acq
|
Line 714 class VLP_collection(ECHO_collection,Acq
|
except: |
except: |
error=sys.exc_info()[0:2] |
error=sys.exc_info()[0:2] |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.write("(ERROR (%s): %s %s) "%(fileName,error[0],error[1])) |
RESPONSE.write("(ERROR Update(%s): %s %s %s) "%(fileName,error[0],error[1],sys.exc_info()[2])) |
errorsTXT+="<p>ERROR creating index for %s "%fileName+"(ERROR: %s %s)</p>\n"%error |
errorsTXT+="<p>ERROR creating index for %s "%fileName+"(ERROR: %s %s)</p>\n"%error |
|
|
# update pageSizeSum for subcollections |
# update pageSizeSum for subcollections |
Line 730 class VLP_collection(ECHO_collection,Acq
|
Line 733 class VLP_collection(ECHO_collection,Acq
|
error=sys.exc_info()[0:2] |
error=sys.exc_info()[0:2] |
logging.error("updateCollection: ERROR in %s (%s %s)"%(fileName,error[0],error[1])) |
logging.error("updateCollection: ERROR in %s (%s %s)"%(fileName,error[0],error[1])) |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1])) |
RESPONSE.write("(ERROR updateII(%s): %s %s %s) "%(fileName,error[0],error[1],sys.exc_info()[2])) |
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 |
|
|
|
def updateCollection(self,forceUpdate=False,RESPONSE=None): |
|
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
|
|
# update subcollections |
# update subcollections |
|
errorsTXT="" |
|
errorsTXT+=self.changeOrAddResources(forceUpdate, RESPONSE); |
errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE) |
errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE) |
errorsTXT+="\n" |
errorsTXT+="\n" |
if RESPONSE is not None: |
if RESPONSE is not None: |