--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/05 21:54:42 1.24
+++ OSAS/OSA_system/OSAS_addfiles.py 2008/10/17 06:26:43 1.52
@@ -1,7 +1,7 @@
# 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
import re
@@ -15,10 +15,19 @@ 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 logging
+import xmlrpclib
+#ersetzt logging
+def logger(txt,method,txt2):
+ """logging"""
+ logging.info(txt+ txt2)
+
+
def spaces(depth):
"""needed in XMLtoTree"""
@@ -49,7 +58,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,6 +85,7 @@ class OSAS_add_Document(Folder):
def add4(self):
"""Applet"""
+
return OSAS_add.add4(self)
def add5(self):
@@ -86,6 +96,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"""
@@ -98,7 +174,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):
@@ -131,7 +207,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')
@@ -141,6 +217,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)
@@ -148,9 +232,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):
@@ -172,10 +257,9 @@ 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):
def __init__(self):
self.depth=0
@@ -187,11 +271,10 @@ class OSAS_add_contextData(Folder):
begin=""
end=""
if self.depth==1:
- print "hi"
begin=""
end=""
- self.retStr+=spaces(self.depth)+"%s"%(attrs.get('url'),begin+attrs.get('name')+end)+"
\n"
+ self.retStr+=spaces(self.depth)+"%s"%(attrs.get('url'),begin+urllib.unquote(attrs.get('name'))+end)+"
\n"
@@ -199,18 +282,26 @@ 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)
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
@@ -226,70 +317,104 @@ class OSAS_add_contextData(Folder):
def startElement(self,name,attrs):
if name=="partner":
- self.ret.append((attrs.get('id'),attrs.get('title')))
+ self.ret.append((attrs.get('id'),attrs.get('title').encode('utf-8')))
URL+="/getPartnersXML"
-
- try:
-
- parser=make_parser()
- curHandler=requestHandler()
- parser.setContentHandler(curHandler)
-
- parser.parse(urllib.urlopen(URL))
- return curHandler.ret
+ parser=make_parser()
+ curHandler=requestHandler()
+ parser.setContentHandler(curHandler)
+ parser.parse(urllib.urlopen(URL))
+ try:
+
+ return curHandler.ret
except:
- return [("",urllib.urlopen(URL).read())]
-
+ return [("",URL)]
+
def addContextData(self,path):
- """Hinzufügen zu einer Sammlung"""
+ """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!"
+ logger("OSAS_addfiles (addContextData)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ return server+"/"+urlpath+"/index.meta file has to exist!"
- links=[(path,'standard storage')]
-
- links+=OSAS_show.readContexts(path) # auslesen von contexten für den link
+ # old version for foxridge storage viewer
+ #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 texttool: needs texttool tag
+ links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s/index.meta'%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()
-
- def addContextData2(self,path,collection,context,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'])
+ if path[0]=="/": #strip leading slash
+ urlpath=path[1:]
+ else:
+ urlpath=path
+
+
+ metalink=server+"/"+urlpath+"/index.meta"
#link=TOBEDONE"
- """Hinzufügen der Ressource"""
+ """Hinzufuegen der Ressource"""
- params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'content_type':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
+ 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()
+ server=xmlrpclib.ServerProxy(collection,allow_none=True)
+ try:
+ #retStr=urllib.urlopen(collection+"/addResource",params).read()
+
+ retStr=server.addResource(id,title,label,description,content_type,responsible,link,metalink,weight,credits)
+
+ except:
+ return "An Error occured adding the resource A\n", collection,params,str(sys.exc_info()[0]),str(sys.exc_info()[1])
+
+ #print "added"
+ logging.debug("Add an resource:"+repr(retStr))
if not retStr:
- return "An Error occured adding the resource\n"
-
- urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
- #exec("collection_object=self"+collection)
+ return "An Error occured adding the resource B\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.
+ #server=xmlrpclib.ServerProxy(collection+"/"+id,allow_none=True)
+ #server2=getattr(server,id)
+ #server2.copyIndex_meta2echo_resource()
+ #urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+ #print "copy2res"
+ #try:
+ #urllib.urlopen(collection+"/"+id+"/generate_label").read()
+ # server2.generate_label()
+ # except:
+ # logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ #try:
+ #urllib.urlopen(collection+"/"+id+"/generate_title").read()
+ # server2.generate_title()
+ #except:
+ # logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+
-
- #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()
- #except:
- # """nothing"""
- #return "BLUByy"
return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
manage_options = Folder.manage_options+(
@@ -299,19 +424,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):
@@ -343,7 +470,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')
@@ -363,7 +490,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):
@@ -395,7 +522,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')
@@ -409,60 +536,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"""
@@ -471,30 +600,45 @@ 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/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
+ 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
@@ -511,7 +655,7 @@ def writeToContext(path,link,description
nameTag=getText(context.getElementsByTagName('name')[0].childNodes)
linkTag=getText(context.getElementsByTagName('link')[0].childNodes)
- print "unique",context,nameTag,description,linkTag,link
+
linkTag=re.sub("\:86","",linkTag) # alter port 86 gleich ohne port nummer (hack)
if (nameTag==description) and (linkTag==link):
node.removeChild(context).unlink()
@@ -532,12 +676,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):