--- OSAS/OSA_system/OSAS_addfiles.py 2004/10/04 12:57:03 1.37 +++ OSAS/OSA_system/OSAS_addfiles.py 2005/04/27 13:17:45 1.40 @@ -15,7 +15,7 @@ from Globals import InitializeClass from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplate import PageTemplate import archive # check if this is necessary - +from Globals import package_home from xml.sax import make_parser from xml.sax.handler import ContentHandler @@ -49,7 +49,7 @@ class OSAS_add_Document(Folder): security.declarePublic('add_Document_config') def add_Document_config(self): """Main configuration""" - pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addDocument.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addDocument.zpt')).__of__(self) return pt() security.declarePublic('change_OSAS_add_Document') @@ -107,7 +107,7 @@ class OSAS_add_Document(Folder): #print str(self.metadata[tag]).decode('utf-8').encode('utf-8') self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" - newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self) + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) newtemplate.content_type="text/plain" renderxml = newtemplate(encoding='utf-8') #return renderxml @@ -140,7 +140,7 @@ class OSAS_add_Document(Folder): for tag in self.metadata.keys(): self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" - newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self) + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) newtemplate.content_type="text/plain" renderxml = newtemplate(encoding='utf-8') metapath=self.REQUEST.SESSION['pathnew']+"/index.meta" @@ -165,7 +165,7 @@ class OSAS_add_Document(Folder): def manage_AddOSAS_add_DocumentForm(self): """interface for adding the OSAS_add_Metadata""" - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_document.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_document.zpt')).__of__(self) return pt() def manage_AddOSAS_add_Document(self,id,RESPONSE=None): @@ -198,7 +198,7 @@ class OSAS_add_Text(Folder): security.declarePublic('add_Text_config') def add_Text_config(self): """Main configuration""" - pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addText.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addText.zpt')).__of__(self) return pt() security.declarePublic('change_OSAS_add_Text') @@ -226,7 +226,7 @@ class OSAS_add_Text(Folder): def manage_AddOSAS_add_TextForm(self): """interface for adding the OSAS_add_Metadata""" - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_text.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_text.zpt')).__of__(self) return pt() def manage_AddOSAS_add_Text(self,id,RESPONSE=None): @@ -248,7 +248,7 @@ class OSAS_add_contextData(Folder): meta_type='OSAS_add_contextData' - def XmlToTree(self,URL): + def XmlToTree(self,URL,pwstr=None): """Collection XML to Tree""" class requestHandler(ContentHandler): @@ -273,9 +273,14 @@ class OSAS_add_contextData(Folder): if name=="element": self.depth-=1 - + if pwstr=="": + pwstr=None + try: - URL+="/getCollectionTreeXML" + if pwstr: + URL+="/getCollectionTreeXML?pwstr=%s"%pwstr + else: + URL+="/getCollectionTreeXML" parser=make_parser() curHandler=requestHandler() parser.setContentHandler(curHandler) @@ -332,7 +337,7 @@ class OSAS_add_contextData(Folder): #print "LINK",links #return links self.REQUEST.SESSION['links']=links - pt=PageTemplateFile('Products/OSA_system/zpt/contextDataMain.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','contextDataMain.zpt')).__of__(self) return pt() @@ -350,8 +355,11 @@ class OSAS_add_contextData(Folder): params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink}) - - retStr=urllib.urlopen(collection+"/addResource",params).read() + try: + retStr=urllib.urlopen(collection+"/addResource",params).read() + except: + return "An Error occured adding the resource\n", collection,params + #print "added" if not retStr: return "An Error occured adding the resource\n", collection,params @@ -373,19 +381,20 @@ class OSAS_add_contextData(Folder): def add_contextData_config(self): """Main configuration""" - pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_add_contextData.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_add_contextData.zpt')).__of__(self) return pt() - def change_OSAS_add_contextData(self,collection,RESPONSE=None): + def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None): """Change""" + self.pwstr=pwstr self.collection=collection if RESPONSE is not None: RESPONSE.redirect('manage_main') def manage_AddOSAS_add_contextDataForm(self): """interface for adding the OSAS_add_Metadata""" - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_contextData.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_contextData.zpt')).__of__(self) return pt() def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None): @@ -417,7 +426,7 @@ class OSAS_add_Presentation(Folder): security.declarePublic('add_Presentation_config') def add_Presentation_config(self): """Main configuration""" - pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addPresentation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addPresentation.zpt')).__of__(self) return pt() security.declarePublic('change_OSAS_add_Presentation') @@ -437,7 +446,7 @@ class OSAS_add_Presentation(Folder): def manage_AddOSAS_add_PresentationForm(self): """interface for adding the OSAS_add_Metadata""" - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_presentation.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_presentation.zpt')).__of__(self) return pt() def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None): @@ -469,7 +478,7 @@ class OSAS_combineTextImage(Folder): security.declarePublic('combineTextImage_config') def combineTextImage_config(self): """Main configuration""" - pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_combineTextImage.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_combineTextImage.zpt')).__of__(self) return pt() security.declarePublic('change_OSAS_combineTextImage') @@ -521,7 +530,7 @@ class OSAS_combineTextImage(Folder): self.REQUEST.SESSION['filelanguage']=filelanguage self.REQUEST.SESSION['externxml']=externxml - newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self) + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self) return newtemplate() def getViewerTemplateSets(self,obj_ids=None): @@ -578,7 +587,7 @@ class OSAS_combineTextImage(Folder): writeToContext(path,linkViewerEnvironment,"ECHO standard environment",unique="yes") - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_combineTextImageFinal.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_combineTextImageFinal.zpt')).__of__(self) return pt() @@ -628,7 +637,7 @@ def writeToContext(path,link,description def manage_AddOSAS_combineTextImageForm(self): """interface for adding the OSAS_add_Metadata""" - pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_combineTextImage.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_combineTextImage.zpt')).__of__(self) return pt() def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):