OSAS/OSA_system/OSAS_addfiles.py - diff

Return to OSAS_addfiles.py CVS log

Up to [Repository] / OSAS / OSA_system

Diff for /OSAS/OSA_system/OSAS_addfiles.py between versions 1.19 and 1.51

version 1.19, 2004/03/19 22:17:01	version 1.51, 2007/01/31 14:28:04
Line 1	Line 1
# Methoden und Classen zum Hinzufuegen von Dokumenten	# Methoden und Classen zum Hinzufuegen von Dokumenten


from OSAS_helpers import readArchimedesXML, getISO, getText	from OSAS_helpers import readArchimedesXML, getText
import os	import os
import xml.dom.minidom	import xml.dom.minidom
from Products.ECHO_content import ECHO_collection	import re
import urllib	import urllib
import OSAS_add	import OSAS_add
import OSAS_show	import OSAS_show
Line 15 from Globals import InitializeClass	Line 15 from Globals import InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate	from Products.PageTemplates.PageTemplate import PageTemplate
import archive # check if this is necessary	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

	#ersetzt logging
	def logger(txt,method,txt2):
	"""logging"""
	logging.info(txt+ txt2)



	def spaces(depth):
	"""needed in XMLtoTree"""
	tmp=""
	k=0
	while k<2*depth:
	k+=1
	tmp=tmp+" "+" "
	return tmp


class OSAS_add_Document(Folder):	class OSAS_add_Document(Folder):
"""Hinzufuegen eines Dokumentes zum Storage"""	"""Hinzufuegen eines Dokumentes zum Storage"""
Line 35 class OSAS_add_Document(Folder):	Line 58 class OSAS_add_Document(Folder):
security.declarePublic('add_Document_config')	security.declarePublic('add_Document_config')
def add_Document_config(self):	def add_Document_config(self):
"""Main configuration"""	"""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()	return pt()

security.declarePublic('change_OSAS_add_Document')	security.declarePublic('change_OSAS_add_Document')
Line 48 class OSAS_add_Document(Folder):	Line 71 class OSAS_add_Document(Folder):
security.declarePublic('index_html')	security.declarePublic('index_html')
def index_html(self):	def index_html(self):
"""stantard aufruf"""	"""stantard aufruf"""
return OSAS_add.add(self,no_upload=1)	return OSAS_add.add(self.standardMD,no_upload=1)


security.declarePublic('add2')	security.declarePublic('add2')
def add2(self):	def add2(self):
""" anlegen naechster schritt"""	""" anlegen naechster schritt"""
return OSAS_add.add2(self)	return OSAS_add.add2(self.standardMD)

def add3(self):	def add3(self):
"""Foldername"""	"""Foldername"""
Line 62 class OSAS_add_Document(Folder):	Line 85 class OSAS_add_Document(Folder):

def add4(self):	def add4(self):
"""Applet"""	"""Applet"""

return OSAS_add.add4(self)	return OSAS_add.add4(self)

def add5(self):	def add5(self):
Line 72 class OSAS_add_Document(Folder):	Line 96 class OSAS_add_Document(Folder):
"""write new index.meta file"""	"""write new index.meta file"""
return OSAS_add.add6(self)	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]+"</"+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]+"</"+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):	def addImages(self,path):
"""Hinzuf�gen eines neuen Imagesfolders"""	"""Hinzuf�gen eines neuen Imagesfolders"""
Line 84 class OSAS_add_Document(Folder):	Line 174 class OSAS_add_Document(Folder):

def manage_AddOSAS_add_DocumentForm(self):	def manage_AddOSAS_add_DocumentForm(self):
"""interface for adding the OSAS_add_Metadata"""	"""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()	return pt()

def manage_AddOSAS_add_Document(self,id,RESPONSE=None):	def manage_AddOSAS_add_Document(self,id,RESPONSE=None):
Line 117 class OSAS_add_Text(Folder):	Line 207 class OSAS_add_Text(Folder):
security.declarePublic('add_Text_config')	security.declarePublic('add_Text_config')
def add_Text_config(self):	def add_Text_config(self):
"""Main configuration"""	"""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()	return pt()

security.declarePublic('change_OSAS_add_Text')	security.declarePublic('change_OSAS_add_Text')
Line 127 class OSAS_add_Text(Folder):	Line 217 class OSAS_add_Text(Folder):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	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):	def addText(self,path):
"""Add a fulltext"""	"""Add a fulltext"""
return OSAS_add.addText(self,path)	return OSAS_add.addText(self,path)
Line 134 class OSAS_add_Text(Folder):	Line 232 class OSAS_add_Text(Folder):
def addText2(self):	def addText2(self):
"""Read the file and store it"""	"""Read the file and store it"""
return OSAS_add.addText2(self)	return OSAS_add.addText2(self)

def manage_AddOSAS_add_TextForm(self):	def manage_AddOSAS_add_TextForm(self):
"""interface for adding the OSAS_add_Metadata"""	"""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()	return pt()

def manage_AddOSAS_add_Text(self,id,RESPONSE=None):	def manage_AddOSAS_add_Text(self,id,RESPONSE=None):
Line 149 def manage_AddOSAS_add_Text(self,id,RESP	Line 248 def manage_AddOSAS_add_Text(self,id,RESP

InitializeClass(OSAS_add_Text)	InitializeClass(OSAS_add_Text)


class OSAS_add_contextData(Folder):	class OSAS_add_contextData(Folder):
"""Einfuegen eines Documentes in eine Collection"""	"""Einfuegen eines Documentes in eine Collection"""

Line 157 class OSAS_add_contextData(Folder):	Line 257 class OSAS_add_contextData(Folder):

meta_type='OSAS_add_contextData'	meta_type='OSAS_add_contextData'

def __init__(self,id,collection):	def XmlToTree(self,URL,pwstr=None):
self.id=id	"""Collection XML to Tree"""
self.collection=collection

def getChilds(self,id,depth,items):	class requestHandler(ContentHandler):
list=[]	def __init__(self):
for object in items:	self.depth=0
if (depth==object[2])&(id==object[0]):	self.retStr=""
list.append(object)
return list

def printChilds(self,startItem,depth,items,enddepth):	def startElement(self,name,attrs):
	if name=="element":
	self.depth+=1
	begin=""
	end=""
	if self.depth==1:
	begin="<b>"
	end="</b>"

def spaces(depth):	self.retStr+=spaces(self.depth)+"<input type='radio' name='collection' value='%s'>%s</input>"%(attrs.get('url'),begin+urllib.unquote(attrs.get('name'))+end)+"<br>\n"
tmp=""
k=0
while k<2*depth:
k+=1
tmp=tmp+" "+" "
return tmp

def retLink(object):
return "<input type='checkbox' name='collection' value='%s'>%s</input>"% (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])+"<br>"+self.printChilds(child[1],depth,items,enddepth)	def endElement(self,name):
	if name=="element":
	self.depth-=1

	if pwstr=="":
	pwstr=None

	try:
	if pwstr:
	URL+="/getCollectionTreeXML?pwstr=%s"%pwstr
else:	else:
tmp=tmp+spaces(2*depth)	URL+="/getCollectionTreeXML"
tmp = tmp+retLink(child[1])	parser=make_parser()
	curHandler=requestHandler()
	parser.setContentHandler(curHandler)

return tmp	parser.parse(urllib.urlopen(URL))
	return curHandler.retStr

def generateTree(self,depth=10):	except:
"""Erzeugt HTML-Tree der Collection"""	return URL
	return urllib.urlopen(URL).read()


	def __init__(self,id,collection):
	self.id=id
	self.collection=collection

exec("items=self.getPhysicalRoot()."+self.collection+".getCollectionTree()")
#print items[0][0]

childs=self.printChilds(items[0][0],0,items,depth)

return childs

def getPartners(self):	def getPartners(self,URL):
"""Zeige Partnerliste"""	"""Zeige Partnerliste"""
exec("items=self.getPhysicalRoot()."+self.collection+".partners.getPartners()")	class requestHandler(ContentHandler):
return items	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')))


	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):	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:	try:
urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")	urllib.urlopen(server+"/"+urlpath+"/index.meta")

except:	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')]	# 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 f�r den link	links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
#print "LINK",links	#print "LINK",links
#return links	#return links
self.REQUEST.SESSION['links']=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()	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"""	"""Hinzufuegen der Resource"""
splitted=path.split("/")	splitted=path.split("/")
#print "BLU"	#print "BLU"
id=splitted[len(splitted)-1]	id=splitted[len(splitted)-1]
title=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"	#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:	try:
getattr(collection_object,id).ECHO_getResourceMD()	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

	#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"
	try:
	urllib.urlopen(collection+"/"+id+"/generate_label").read()
	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()
except:	except:
"""nothing"""	logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
#return "BLUByy"

return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)

manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
Line 257 class OSAS_add_contextData(Folder):	Line 415 class OSAS_add_contextData(Folder):

def add_contextData_config(self):	def add_contextData_config(self):
"""Main configuration"""	"""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()	return pt()


def change_OSAS_add_contextData(self,collection,RESPONSE=None):	def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None):
"""Change"""	"""Change"""
	self.pwstr=pwstr
self.collection=collection	self.collection=collection
	self.serverUrl=serverUrl
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def manage_AddOSAS_add_contextDataForm(self):	def manage_AddOSAS_add_contextDataForm(self):
"""interface for adding the OSAS_add_Metadata"""	"""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()	return pt()

def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):	def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):
Line 301 class OSAS_add_Presentation(Folder):	Line 461 class OSAS_add_Presentation(Folder):
security.declarePublic('add_Presentation_config')	security.declarePublic('add_Presentation_config')
def add_Presentation_config(self):	def add_Presentation_config(self):
"""Main configuration"""	"""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()	return pt()

security.declarePublic('change_OSAS_add_Presentation')	security.declarePublic('change_OSAS_add_Presentation')
Line 321 class OSAS_add_Presentation(Folder):	Line 481 class OSAS_add_Presentation(Folder):

def manage_AddOSAS_add_PresentationForm(self):	def manage_AddOSAS_add_PresentationForm(self):
"""interface for adding the OSAS_add_Metadata"""	"""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()	return pt()

def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):	def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):
Line 353 class OSAS_combineTextImage(Folder):	Line 513 class OSAS_combineTextImage(Folder):
security.declarePublic('combineTextImage_config')	security.declarePublic('combineTextImage_config')
def combineTextImage_config(self):	def combineTextImage_config(self):
"""Main configuration"""	"""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()	return pt()

security.declarePublic('change_OSAS_combineTextImage')	security.declarePublic('change_OSAS_combineTextImage')
Line 393 class OSAS_combineTextImage(Folder):	Line 553 class OSAS_combineTextImage(Folder):
except:	except:
filelanguage=""	filelanguage=""

self.REQUEST.SESSION['isolist']=getISO()	self.REQUEST.SESSION['isolist']=OSAS_add.getISO()
tmp=getISO().keys()
	tmp=self.REQUEST.SESSION['isolist'].keys()
tmp.sort()	tmp.sort()
self.REQUEST.SESSION['isolistsort']=tmp	self.REQUEST.SESSION['isolistsort']=tmp
self.REQUEST.SESSION['path']=path	self.REQUEST.SESSION['path']=path
Line 404 class OSAS_combineTextImage(Folder):	Line 565 class OSAS_combineTextImage(Folder):
self.REQUEST.SESSION['filelanguage']=filelanguage	self.REQUEST.SESSION['filelanguage']=filelanguage
self.REQUEST.SESSION['externxml']=externxml	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()	return newtemplate()

def getProjects(self,obj_ids=None):	def getViewerTemplateSets(self,obj_ids=None):
"""Get the Project title for configuration"""	"""Get the ViewerTemplateSet title for configuration"""
ret=[]	ret=[]
print "HI"	viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.

try:	try:
projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie.	viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
print "pr"
for project in projects:	for viewerTemplateSet in viewerTemplateSets:
ret.append((project[1].title,project[0],project[1]))	ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
print ret
return ret	return ret

except:	except:
return [('no Projectfolders','')]	return [('no ViewerTemplateSetfolders','')]

def getTextToolsField(self,path,name,default=''):	def getTextToolsField(self,path,name,default=''):
"""Lese Textoolsfelder aus index.meta im path aus"""	"""Lese Textoolsfelder aus index.meta im path aus"""
Line 429 class OSAS_combineTextImage(Folder):	Line 591 class OSAS_combineTextImage(Folder):
dom=xml.dom.minidom.parse(path+"/index.meta")	dom=xml.dom.minidom.parse(path+"/index.meta")
node=dom.getElementsByTagName('texttool')[0] #getNode	node=dom.getElementsByTagName('texttool')[0] #getNode
subnode=node.getElementsByTagName(name)[0]	subnode=node.getElementsByTagName(name)[0]
print 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)	return getText(subnode.childNodes)
except:	except:
return default	return default
Line 437 class OSAS_combineTextImage(Folder):	Line 604 class OSAS_combineTextImage(Folder):

def combineTextImage2(self,path):	def combineTextImage2(self,path):
"""Eingabe von Metadateninformationen"""	"""Eingabe von Metadateninformationen"""

	# correct path
	path=re.sub("//","/",path)
OSAS_add.combineTextImage2(self,path) # Add images	OSAS_add.combineTextImage2(self,path) # Add images
splitted=path.split("/")	splitted=path.split("/")
linkPath=splitted[len(splitted)-1]	linkPath=splitted[len(splitted)-1]
linkViewerEnvironment="http://nausikaa2.mpiwg-berlin.mpg.de:86/cgi-bin/toc/toc.x.cgi?dir=%s&step=thumb" % linkPath	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	self.REQUEST.SESSION['linkViewerEnvironment']=linkViewerEnvironment

writeToContext(path,linkViewerEnvironment,"ECHO standard environment")	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()	return pt()

def isSelectedProject(self,obj,id):	def isSelectedViewerTemplateSet(self,obj,id):
"""is ausgew�hlt"""	"""is ausgew�hlt"""

if self.REQUEST['project']==id:	if self.REQUEST['viewerTemplateSet']==id:
return 1	return 1
else:	else:
return None	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"""	"""Created an additional entry to the index.meta file of path"""
dom=xml.dom.minidom.parse(path+"/index.meta")	dom=xml.dom.minidom.parse(path+"/index.meta")
node=dom.getElementsByTagName('resource')[0]	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')	subnode=dom.createElement('context')

linknode=dom.createElement('link')	linknode=dom.createElement('link')
Line 478 def writeToContext(path,link,description	Line 667 def writeToContext(path,link,description

writefile=file(path+"/index.meta","w")	writefile=file(path+"/index.meta","w")
#print path+"/index.meta"	#print path+"/index.meta"
writefile.write(dom.toxml().encode('utf-8'))	writefile.write(dom.toxml(encoding="UTF-8"))
writefile.close()	writefile.close()

def manage_AddOSAS_combineTextImageForm(self):	def manage_AddOSAS_combineTextImageForm(self):
"""interface for adding the OSAS_add_Metadata"""	"""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()	return pt()

def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):	def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.19
changed lines
	Added in v.1.51