--- OSAS/OSA_system/OSAS_addfiles.py 2004/03/19 22:17:01 1.19 +++ OSAS/OSA_system/OSAS_addfiles.py 2005/11/28 14:09:16 1.42 @@ -1,10 +1,10 @@ # Methoden und Classen zum Hinzufuegen von Dokumenten -from OSAS_helpers import readArchimedesXML, getISO, getText +from OSAS_helpers import readArchimedesXML, getText import os import xml.dom.minidom -from Products.ECHO_content import ECHO_collection +import re import urllib import OSAS_add import OSAS_show @@ -15,6 +15,20 @@ 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 + +def spaces(depth): + """needed in XMLtoTree""" + tmp="" + k=0 + while k<2*depth: + k+=1 + tmp=tmp+" "+" " + return tmp + class OSAS_add_Document(Folder): """Hinzufuegen eines Dokumentes zum Storage""" @@ -35,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') @@ -48,13 +62,13 @@ class OSAS_add_Document(Folder): security.declarePublic('index_html') def index_html(self): """stantard aufruf""" - return OSAS_add.add(self,no_upload=1) + return OSAS_add.add(self.standardMD,no_upload=1) security.declarePublic('add2') def add2(self): """ anlegen naechster schritt""" - return OSAS_add.add2(self) + return OSAS_add.add2(self.standardMD) def add3(self): """Foldername""" @@ -62,6 +76,7 @@ class OSAS_add_Document(Folder): def add4(self): """Applet""" + return OSAS_add.add4(self) def add5(self): @@ -72,6 +87,72 @@ class OSAS_add_Document(Folder): """write new index.meta file""" return OSAS_add.add6(self) + def addText2(self): + """add only a text""" + metadata=OSAS_add.parse_query_string(self.REQUEST['QUERY_STRING']) + 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(): + + #print str(self.metadata[tag]).decode('utf-8').encode('utf-8') + 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') + #return renderxml + 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']) + + return OSAS_add.addText2(self) + + def addPdf2(self): + """add only a pdf""" + metadata=OSAS_add.parse_query_string(self.REQUEST['QUERY_STRING']) + 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(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']) + + return OSAS_add.addPdf2(self) def addImages(self,path): """Hinzufügen eines neuen Imagesfolders""" @@ -84,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): @@ -117,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') @@ -127,6 +208,14 @@ class OSAS_add_Text(Folder): if RESPONSE is not None: RESPONSE.redirect('manage_main') + def addPdf(self,path): + """Add a pdf""" + return OSAS_add.addPdf(self,path) + + def addPdf2(self): + """Read the file and store it""" + return OSAS_add.addPdf2(self) + def addText(self,path): """Add a fulltext""" return OSAS_add.addText(self,path) @@ -134,9 +223,10 @@ class OSAS_add_Text(Folder): def addText2(self): """Read the file and store it""" return OSAS_add.addText2(self) + 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): @@ -149,6 +239,7 @@ def manage_AddOSAS_add_Text(self,id,RESP InitializeClass(OSAS_add_Text) + class OSAS_add_contextData(Folder): """Einfuegen eines Documentes in eine Collection""" @@ -157,97 +248,135 @@ class OSAS_add_contextData(Folder): meta_type='OSAS_add_contextData' + def XmlToTree(self,URL,pwstr=None): + """Collection XML to Tree""" + + class requestHandler(ContentHandler): + def __init__(self): + self.depth=0 + self.retStr="" + + def startElement(self,name,attrs): + if name=="element": + self.depth+=1 + begin="" + end="" + if self.depth==1: + begin="" + end="" + + self.retStr+=spaces(self.depth)+"%s"%(attrs.get('url'),begin+urllib.unquote(attrs.get('name'))+end)+"
\n" + + + + def endElement(self,name): + if name=="element": + self.depth-=1 + + if pwstr=="": + pwstr=None + + try: + if pwstr: + URL+="/getCollectionTreeXML?pwstr=%s"%pwstr + else: + URL+="/getCollectionTreeXML" + parser=make_parser() + curHandler=requestHandler() + parser.setContentHandler(curHandler) + + parser.parse(urllib.urlopen(URL)) + return curHandler.retStr + + except: + return URL + return urllib.urlopen(URL).read() + + def __init__(self,id,collection): self.id=id self.collection=collection - def getChilds(self,id,depth,items): - list=[] - for object in items: - if (depth==object[2])&(id==object[0]): - list.append(object) - return list - - def printChilds(self,startItem,depth,items,enddepth): - - def spaces(depth): - tmp="" - k=0 - while k<2*depth: - k+=1 - tmp=tmp+" "+" " - return tmp - - def retLink(object): - return "%s"% (string.join(object.getPhysicalPath(),"."),object.title) - - depth+=1 - childs=self.getChilds(startItem,depth,items) - tmp="" - for child in childs: - if depth < enddepth: - tmp=tmp+spaces(depth) - - tmp= tmp+retLink(child[1])+"
"+self.printChilds(child[1],depth,items,enddepth) - else: - tmp=tmp+spaces(2*depth) - tmp = tmp+retLink(child[1]) + + - return tmp - - def generateTree(self,depth=10): - """Erzeugt HTML-Tree der Collection""" - - exec("items=self.getPhysicalRoot()."+self.collection+".getCollectionTree()") - #print items[0][0] + def getPartners(self,URL): + """Zeige Partnerliste""" + class requestHandler(ContentHandler): + def __init__(self): + self.ret=[] + + def startElement(self,name,attrs): + if name=="partner": + self.ret.append((attrs.get('id'),attrs.get('title').encode('utf-8'))) - childs=self.printChilds(items[0][0],0,items,depth) - - return childs - def getPartners(self): - """Zeige Partnerliste""" - exec("items=self.getPhysicalRoot()."+self.collection+".partners.getPartners()") - return items + URL+="/getPartnersXML" + parser=make_parser() + curHandler=requestHandler() + parser.setContentHandler(curHandler) + parser.parse(urllib.urlopen(URL)) + try: + + return curHandler.ret + except: + return [("",URL)] + + def addContextData(self,path): - """Hinzufügen zu einer Sammlung""" + """Hinzufuegen zu einer Sammlung""" + + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + try: - urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta") + urllib.urlopen(server+"/"+path+"/index.meta") except: return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!" links=[(path,'standard storage')] - links+=OSAS_show.readContexts(path) # auslesen von contexten für den link + 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() - - def addContextData2(self,path,collection,context,science,practice,source_type,period,link,label,description,content_type,responsible,weight,credits=None): + + def addContextData2(self,path,collection,link,label,description,content_type,responsible,weight,credits=None): """Hinzufuegen der Resource""" splitted=path.split("/") #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']) + + metalink=server+"/"+path+"/index.meta" #link=TOBEDONE" - """Hinzufügen der Ressource""" + """Hinzufuegen der Ressource""" + + params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink}) + - - exec("collection_object=self"+collection) - - ECHO_collection.manage_addECHO_resource(collection_object,id,title,label,description,content_type,responsible,link,metalink,credits,weight,RESPONSE=None) - #print "HI5" try: - getattr(collection_object,id).ECHO_getResourceMD() + retStr=urllib.urlopen(collection+"/addResource",params).read() except: - """nothing""" - #return "BLUByy" + 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 + + #print collection+"/"+id+"/copyIndex_meta2echo_resource" + + 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" return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path) manage_options = Folder.manage_options+( @@ -257,19 +386,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,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): @@ -301,7 +432,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') @@ -321,7 +452,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): @@ -353,7 +484,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') @@ -367,60 +498,62 @@ 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']=getISO() - tmp=getISO().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 getProjects(self,obj_ids=None): - """Get the Project title for configuration""" + 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() + + def getViewerTemplateSets(self,obj_ids=None): + """Get the ViewerTemplateSet title for configuration""" ret=[] - print "HI" + viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie. + try: - projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie. - print "pr" - for project in projects: - ret.append((project[1].title,project[0],project[1])) - print ret + viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie. + + for viewerTemplateSet in viewerTemplateSets: + ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1])) + return ret except: - return [('no Projectfolders','')] + return [('no ViewerTemplateSetfolders','')] def getTextToolsField(self,path,name,default=''): """Lese Textoolsfelder aus index.meta im path aus""" @@ -429,39 +562,66 @@ class OSAS_combineTextImage(Folder): dom=xml.dom.minidom.parse(path+"/index.meta") node=dom.getElementsByTagName('texttool')[0] #getNode subnode=node.getElementsByTagName(name)[0] - print getText(subnode.childNodes) - return getText(subnode.childNodes) + + # bei text wird nur der Folder gebraucht + if name=="text": + splitted=getText(subnode.childNodes).split("/") + return splitted[len(splitted)-2] + else: + return getText(subnode.childNodes) except: return default - + def combineTextImage2(self,path): """Eingabe von Metadateninformationen""" + + # correct path + path=re.sub("//","/",path) OSAS_add.combineTextImage2(self,path) # Add images splitted=path.split("/") linkPath=splitted[len(splitted)-1] - linkViewerEnvironment="http://nausikaa2.mpiwg-berlin.mpg.de:86/cgi-bin/toc/toc.x.cgi?dir=%s&step=thumb" % linkPath - self.REQUEST.SESSION['linkViewerEnvironment']=linkViewerEnvironment + linkViewerEnvironmentImages="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir=%s&step=thumb" % linkPath + linkViewerEnvironmentOnlyText="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir=%s&step=textonly" % linkPath - writeToContext(path,linkViewerEnvironment,"ECHO standard environment") + if self.REQUEST.has_key('image'): # bilder vorhanden + linkViewerEnvironment=linkViewerEnvironmentImages + else: + linkViewerEnvironment=linkViewerEnvironmentOnlyText + + self.REQUEST.SESSION['linkViewerEnvironment']=linkViewerEnvironment + + 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() - def isSelectedProject(self,obj,id): + def isSelectedViewerTemplateSet(self,obj,id): """is ausgewählt""" - if self.REQUEST['project']==id: + if self.REQUEST['viewerTemplateSet']==id: return 1 else: return None -def writeToContext(path,link,description): +def writeToContext(path,link,description,unique="no"): """Created an additional entry to the index.meta file of path""" dom=xml.dom.minidom.parse(path+"/index.meta") node=dom.getElementsByTagName('resource')[0] + if unique=="yes": + + contexts=node.getElementsByTagName('context') + for context in contexts: + nameTag=getText(context.getElementsByTagName('name')[0].childNodes) + linkTag=getText(context.getElementsByTagName('link')[0].childNodes) + + + linkTag=re.sub("\:86","",linkTag) # alter port 86 gleich ohne port nummer (hack) + if (nameTag==description) and (linkTag==link): + node.removeChild(context).unlink() + subnode=dom.createElement('context') linknode=dom.createElement('link') @@ -478,12 +638,12 @@ def writeToContext(path,link,description writefile=file(path+"/index.meta","w") #print path+"/index.meta" - writefile.write(dom.toxml().encode('utf-8')) + writefile.write(dom.toxml(encoding="UTF-8")) writefile.close() 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):