--- OSAS/OSA_system/OSAS_addfiles.py 2005/01/21 18:10:45 1.39 +++ OSAS/OSA_system/OSAS_addfiles.py 2006/06/14 16:13:53 1.46 @@ -15,10 +15,12 @@ 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 +import sys +import zLOG def spaces(depth): """needed in XMLtoTree""" @@ -49,7 +51,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') @@ -76,7 +78,7 @@ class OSAS_add_Document(Folder): def add4(self): """Applet""" - + return OSAS_add.add4(self) def add5(self): @@ -93,33 +95,33 @@ class OSAS_add_Document(Folder): metadata['archive-creation-date']=OSAS_add.date(self) metadata['creator']=self.REQUEST['creator'] metadata['description']=self.REQUEST['content_description'] - metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] - #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] - metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] - metadata['content-type']="fulltext document" - self.reftype=self.REQUEST.SESSION['reftype'] - self.REQUEST.SESSION['add_metadata']=metadata - self.add_metadata=metadata - self.metadata=self.REQUEST.SESSION['metadata'] - self.metadataprint="" - for tag in self.metadata.keys(): + metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] + #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] + metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] + metadata['content-type']="fulltext document" + self.reftype=self.REQUEST.SESSION['reftype'] + self.REQUEST.SESSION['add_metadata']=metadata + self.add_metadata=metadata + self.metadata=self.REQUEST.SESSION['metadata'] + self.metadataprint="" + for tag in self.metadata.keys(): #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.content_type="text/plain" - renderxml = newtemplate(encoding='utf-8') + 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 metapath=self.REQUEST.SESSION['pathnew']+"/index.meta" - - f=open(metapath,'w') + + f=open(metapath,'w') - f.write(renderxml) - f.close() - os.chmod(metapath,0664) - os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) - + f.write(renderxml) + f.close() + os.chmod(metapath,0664) + os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) + return OSAS_add.addText2(self) def addPdf2(self): @@ -128,30 +130,30 @@ class OSAS_add_Document(Folder): metadata['archive-creation-date']=OSAS_add.date(self) metadata['creator']=self.REQUEST['creator'] metadata['description']=self.REQUEST['content_description'] - metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] - #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] - metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] - metadata['content-type']="fulltext document" - self.reftype=self.REQUEST.SESSION['reftype'] - self.REQUEST.SESSION['add_metadata']=metadata - self.add_metadata=metadata - self.metadata=self.REQUEST.SESSION['metadata'] - self.metadataprint="" - 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.content_type="text/plain" - renderxml = newtemplate(encoding='utf-8') + metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] + #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] + metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] + metadata['content-type']="fulltext document" + self.reftype=self.REQUEST.SESSION['reftype'] + self.REQUEST.SESSION['add_metadata']=metadata + self.add_metadata=metadata + self.metadata=self.REQUEST.SESSION['metadata'] + self.metadataprint="" + for tag in self.metadata.keys(): + self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" + + 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" - - - f=open(metapath,'w') - f.write(renderxml) - f.close() - os.chmod(metapath,0664) - os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) - + + + f=open(metapath,'w') + f.write(renderxml) + f.close() + os.chmod(metapath,0664) + os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) + return OSAS_add.addPdf2(self) def addImages(self,path): @@ -165,7 +167,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 +200,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 +228,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): @@ -289,9 +291,9 @@ class OSAS_add_contextData(Folder): return curHandler.retStr except: - return URL + return URL return urllib.urlopen(URL).read() - + def __init__(self,id,collection): self.id=id @@ -312,32 +314,43 @@ class OSAS_add_contextData(Folder): URL+="/getPartnersXML" - parser=make_parser() - curHandler=requestHandler() + parser=make_parser() + curHandler=requestHandler() parser.setContentHandler(curHandler) - parser.parse(urllib.urlopen(URL)) - try: + parser.parse(urllib.urlopen(URL)) + try: - return curHandler.ret + return curHandler.ret except: - return [("",URL)] - + return [("",URL)] + def addContextData(self,path): """Hinzufuegen zu einer Sammlung""" + + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + if path[0]=="/": #strip leading slash + urlpath=path[1:] + else: + urlpath=path try: - urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta") + urllib.urlopen(server+"/"+urlpath+"/index.meta") except: - return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!" + zLOG.LOG("OSAS_addfiles (addContextData)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + return server+"/"+urlpath+"/index.meta file has to exist!" - links=[(path,'standard storage')] - + links=[(path,'storage server view')] + # libcoll viewer with imagepath: needs pageimg directory + links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')] + # libcoll viewer with imagepath: needs pageimg directory + links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s'%path,'libcoll standard viewer (texttool)')] + links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link #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() @@ -347,7 +360,14 @@ class OSAS_add_contextData(Folder): #print "BLU" id=splitted[len(splitted)-1] title=splitted[len(splitted)-1] - metalink=self.REQUEST['SERVER_URL']+path+"/index.meta" + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + if path[0]=="/": #strip leading slash + urlpath=path[1:] + else: + urlpath=path + + + metalink=server+"/"+urlpath+"/index.meta" #link=TOBEDONE" """Hinzufuegen der Ressource""" @@ -360,18 +380,24 @@ class OSAS_add_contextData(Folder): except: return "An Error occured adding the resource\n", collection,params - #print "added" - if not retStr: + #print "added" + if not retStr: return "An Error occured adding the resource\n", collection,params - + #print collection+"/"+id+"/copyIndex_meta2echo_resource" - + #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht. urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read() - #print "copy2res" - urllib.urlopen(collection+"/"+id+"/generate_label").read() - #print "label" - urllib.urlopen(collection+"/"+id+"/generate_title").read() - #print "title" + #print "copy2res" + try: + urllib.urlopen(collection+"/"+id+"/generate_label").read() + except: + zLOG.LOG("OSAS_addfiles (addContextData2,label not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + try: + urllib.urlopen(collection+"/"+id+"/generate_title").read() + except: + zLOG.LOG("OSAS_addfiles (addContextData2,title not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + + return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path) manage_options = Folder.manage_options+( @@ -381,20 +407,21 @@ 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,pwstr=None,RESPONSE=None): + def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None): """Change""" self.pwstr=pwstr self.collection=collection + self.serverUrl=serverUrl 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): @@ -426,7 +453,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') @@ -446,7 +473,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): @@ -478,7 +505,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') @@ -492,47 +519,47 @@ class OSAS_combineTextImage(Folder): def combineTextImage(self,path): """Hinzufügen der Presenationsinformation""" """gibt input formular zur erstellung des texttools meta tag aus""" - files = os.listdir(path) - - texts=[] - imagefolders=[] - presentationfolders=[] - - splitted=path.split("/") - externxml=readArchimedesXML(splitted[len(splitted)-1]) - - for filename in files: - #print "FN",filename - if archive.isdigilib2(path+"/"+filename): - imagefolders.append(filename) - - if archive.isFullText(path,filename): - #print "HI" - texts.append(filename) - if archive.isPresentation(path,filename): - presentationfolders.append(filename) - - dom=xml.dom.minidom.parse(path+"/index.meta") - try: - filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes) - except: - filelanguage="" + files = os.listdir(path) + + texts=[] + imagefolders=[] + presentationfolders=[] + + splitted=path.split("/") + externxml=readArchimedesXML(splitted[len(splitted)-1]) + + for filename in files: + #print "FN",filename + if archive.isdigilib2(path+"/"+filename): + imagefolders.append(filename) + + if archive.isFullText(path,filename): + #print "HI" + texts.append(filename) + if archive.isPresentation(path,filename): + presentationfolders.append(filename) + + dom=xml.dom.minidom.parse(path+"/index.meta") + try: + filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes) + except: + filelanguage="" - self.REQUEST.SESSION['isolist']=OSAS_add.getISO() + self.REQUEST.SESSION['isolist']=OSAS_add.getISO() + + tmp=self.REQUEST.SESSION['isolist'].keys() + tmp.sort() + self.REQUEST.SESSION['isolistsort']=tmp + self.REQUEST.SESSION['path']=path + self.REQUEST.SESSION['texts']=texts + self.REQUEST.SESSION['imagefolders']=imagefolders + self.REQUEST.SESSION['presentationfolders']=presentationfolders + self.REQUEST.SESSION['filelanguage']=filelanguage + self.REQUEST.SESSION['externxml']=externxml + + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self) + return newtemplate() - tmp=self.REQUEST.SESSION['isolist'].keys() - tmp.sort() - self.REQUEST.SESSION['isolistsort']=tmp - self.REQUEST.SESSION['path']=path - self.REQUEST.SESSION['texts']=texts - self.REQUEST.SESSION['imagefolders']=imagefolders - self.REQUEST.SESSION['presentationfolders']=presentationfolders - self.REQUEST.SESSION['filelanguage']=filelanguage - self.REQUEST.SESSION['externxml']=externxml - - newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self) - return newtemplate() - def getViewerTemplateSets(self,obj_ids=None): """Get the ViewerTemplateSet title for configuration""" ret=[] @@ -569,9 +596,9 @@ class OSAS_combineTextImage(Folder): def combineTextImage2(self,path): """Eingabe von Metadateninformationen""" - - # correct path - path=re.sub("//","/",path) + + # correct path + path=re.sub("//","/",path) OSAS_add.combineTextImage2(self,path) # Add images splitted=path.split("/") linkPath=splitted[len(splitted)-1] @@ -587,7 +614,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() @@ -637,7 +664,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):