--- ECHO_content/ECHO_collection.py 2010/10/13 13:10:19 1.310 +++ ECHO_content/ECHO_collection.py 2012/01/04 13:23:00 1.314 @@ -21,6 +21,7 @@ import tempfile import zipfile import re import os,shutil +import traceback import OFS.Image from types import * from OFS.Cache import Cacheable @@ -917,6 +918,12 @@ class ECHO_collection(CatalogAware, Fold pt.content_type="text/html" return pt() + def changeMetaLinks(self): + """change form""" + pt=zptFile(self, 'zpt/changeMetaLinkForm') + pt.content_type="text/html" + return pt() + def changeTitles(self): """change form""" pt=zptFile(self, 'zpt/changeTitleForm') @@ -972,6 +979,7 @@ class ECHO_collection(CatalogAware, Fold try: ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + logging resource[1].metalink=argv[resource[1].getId()][0:] except: pass @@ -1036,19 +1044,53 @@ class ECHO_collection(CatalogAware, Fold except: pass return ret + + def changeMetaLinksInCollection(self): + """change all lables of a collection""" + ret="" + argv=self.REQUEST.form + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink']) + for resource in resources: + + try: + ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + resource[1].metalink=argv[resource[1].getId()][0:] + except: + pass + return ret - def importCollection(self,path=None,viewerUrl=None,metaDataUrl=None,replacePathPermanent=None,replacePathExperimental=None,RESPONSE=None): + def importCollection(self,path=None,viewerUrl=None,metaDataUrl=None,replacePathPermanent=None,replacePathExperimental=None,folderListFile=None,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" - if path is None: + if (path is None) & (folderListFile is None): pt=zptFile(self, 'zpt/importCollection.zpt') return pt() - files=os.listdir(path) + + + if (path !=""): + files=os.listdir(path) + pathToFolder=path; + else: + pathToFolder=""; + files=[]; + for fileLine in folderListFile.readlines(): + for fileLine2 in fileLine.split("\r"): + logging.debug("append:"+fileLine2) + files.append(fileLine2) + ret="" for fileName in files: if fileName: + logging.debug("split:"+fileName); + if(pathToFolder==""): # pfad ist leer, da filename aud folderlistfile dann: + splitted=fileName.split("/"); + path="/".join(splitted[0:-1]); + fileName=splitted[-1].rstrip().lstrip(); + + if (replacePathExperimental and replacePathExperimental!=''): path=re.sub(replacePathExperimental,"/mpiwg/online/experimental",path) @@ -1058,20 +1100,38 @@ class ECHO_collection(CatalogAware, Fold link=viewerUrl%(path+"/"+fileName+"/pageimg") - metalink=metaDataUrl+"/"+path+"/"+fileName+"/index.meta" - try: - - #link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb" - - newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'','book','','','','','','') - self._setObject(fileName,newObj) + metalink=metaDataUrl+re.sub("/mpiwg/online/","",path+"/"+fileName+"/index.meta") - genObj=getattr(self,fileName) - #genObj.createIndexFile() - ret+="OK:"+fileName+"
" + #metalink=metaDataUrl+"/"+path+"/"+fileName+"/index.meta" + + newindexMeta =re.sub("/mpiwg/online/","",path+"/"+fileName) + + try: + type=self.metadata.getBibTypeFromIndexMeta(newindexMeta) + + try: + + #link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb" + logging.debug("create:"+fileName); + logging.debug("type:"+type); + newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'',type,'','','','','','') + self._setObject(fileName,newObj) + + genObj=getattr(self,fileName) + #genObj.createIndexFile() + ret+="OK:"+fileName+"
" + except: + exc_type, exc_value, exc_traceback = sys.exc_info(); + #logging.error("%s %s %s"%[sys.exc_info()[0],ssys.exc_info()[1],; + traceback.print_exception(exc_type, exc_value, exc_traceback, + limit=2, file=sys.stdout) + ret+="ERROR:"+fileName+"
" except: - print "ERROR" - ret+="ERROR:"+fileName+"
" + exc_type, exc_value, exc_traceback = sys.exc_info(); + #logging.error("%s %s %s"%[sys.exc_info()[0],ssys.exc_info()[1],; + traceback.print_exception(exc_type, exc_value, exc_traceback, + limit=2, file=sys.stdout) + ret+="not a file ERROR:"+fileName+"
" return ret @@ -1120,32 +1180,21 @@ class ECHO_collection(CatalogAware, Fold RESPONSE.write("") for resource in resources: - - done,msg=resource[1].changeViewer(newViewer) - if done: - if RESPONSE is not None: - RESPONSE.write("

OK: %s"%resource[0]) - else: - if RESPONSE is not None: - RESPONSE.write("

ERROR: %s (%s)"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg)) + resource[1].newViewer=newViewer; + +# done,msg=resource[1].changeViewer(newViewer) +# if done: +# if RESPONSE is not None: +# RESPONSE.write("

OK: %s"%resource[0]) +# else: +# if RESPONSE is not None: +# RESPONSE.write("

ERROR: %s (%s)"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg)) if RESPONSE is not None: RESPONSE.write("

Done

") - def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None): - """change the templates""" - - resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) - - for resource in resources: - - resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix) - - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - def setStartpageFolderForm(self): """Form for changing the startpage""" @@ -1437,6 +1486,8 @@ class ECHO_collection(CatalogAware, Fold {'label':'Main Config','action':'ECHO_collection_config'}, {'label':'Change Labels','action':'changeLabels'}, {'label':'Change Titles','action':'changeTitles'}, + {'label':'Change MetaLinks','action':'changeMetaLinks'}, + {'label':'Change Image Viewer','action':'changeViewerTemplateSetsForm'}, {'label':'Localize','action':'localizeObjects'}, {'label':'Change Weights','action':'changeWeights'}, {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'}, @@ -1444,7 +1495,6 @@ class ECHO_collection(CatalogAware, Fold {'label':'Graphic Coords','action':'ECHO_graphicEntry'}, {'label':'create resources from XML','action':'createRessourcesFromXMLForm'}, {'label':'Set Startpage','action':'setStartpageFolderForm'}, - {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'}, {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, {'label':'ImportCollection','action':'importCollection'}, {'label':'Copy MD for indexing and search','action':'copySearchFields'}, @@ -1475,7 +1525,7 @@ class ECHO_collection(CatalogAware, Fold security.declarePublic('changeECHO_collection') - def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True): + def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True,fullTextBasisUrl=None): """Aenderung der Properties""" self.secondaryLink=secondaryLink @@ -1487,6 +1537,7 @@ class ECHO_collection(CatalogAware, Fold self.prefix=prefix[0:] self.suffix=suffix[0:] self.setIsVisible(isVisible) + self.fullTextBasisUrl=fullTextBasisUrl setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight) @@ -1495,6 +1546,9 @@ class ECHO_collection(CatalogAware, Fold if RESPONSE is not None: RESPONSE.redirect('manage_main') + def getFullTextBasisUrl(self): + return self.fullTextBasisUrl + def setAlwaysClickable(self,flag="yes"): """set clickable""" if flag=="yes": @@ -1506,8 +1560,15 @@ class ECHO_collection(CatalogAware, Fold def showOverview(self): """overview""" + # ECHO_overview.html template for this instance if 'ECHO_overview.html' in self.__dict__.keys(): return getattr(self,'ECHO_overview.html')() + + # ECHO_overview_main template in path + if hasattr(self, 'ECHO_overview_main'): + return getattr(self, 'ECHO_overview_main')() + + # template from product pt=zptFile(self, 'zpt/ECHO_content_overview.zpt') return pt() @@ -1921,7 +1982,6 @@ class ECHO_root(Folder,Persistent,Implic getSubCols = ECHO_helpers.getSubCols manage_options=Folder.manage_options+( - {'label':'Main Config','action':'ECHO_copyright_configForm'}, {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, {'label':'Change Weights','action':'changeWeights'}, {'label':'Generate from RDF','action':'generateFromRDFForm'}, @@ -2288,7 +2348,7 @@ class ECHO_root(Folder,Persistent,Implic retStr+="""