--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/05 21:54:42 1.24
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/06/23 13:01:14 1.34
@@ -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
@@ -86,6 +86,37 @@ 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():
+ 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()
+ metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
+
+
+ f=open(metapath,'w')
+ f.writelines(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 addImages(self,path):
"""Hinzufügen eines neuen Imagesfolders"""
@@ -187,11 +218,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"
@@ -209,8 +239,10 @@ class OSAS_add_contextData(Folder):
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
@@ -233,18 +265,18 @@ class OSAS_add_contextData(Folder):
try:
- parser=make_parser()
- curHandler=requestHandler()
- parser.setContentHandler(curHandler)
+ parser=make_parser()
+ curHandler=requestHandler()
+ parser.setContentHandler(curHandler)
- parser.parse(urllib.urlopen(URL))
- return curHandler.ret
+ parser.parse(urllib.urlopen(URL))
+ return curHandler.ret
except:
- return [("",urllib.urlopen(URL).read())]
-
+ return [("",URL)]
+
def addContextData(self,path):
- """Hinzufügen zu einer Sammlung"""
+ """Hinzufuegen zu einer Sammlung"""
try:
urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")
@@ -253,7 +285,7 @@ class OSAS_add_contextData(Folder):
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
@@ -261,7 +293,7 @@ class OSAS_add_contextData(Folder):
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"
@@ -272,24 +304,20 @@ class OSAS_add_contextData(Folder):
#link=TOBEDONE"
"""Hinzufügen 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})
+ print params
+
retStr=urllib.urlopen(collection+"/addResource",params).read()
- if not retStr:
+
+ if not retStr:
return "An Error occured adding the resource\n"
+
- urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
- #exec("collection_object=self"+collection)
-
+ print urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+ print urllib.urlopen(collection+"/"+id+"/generate_label").read()
+ print urllib.urlopen(collection+"/"+id+"/generate_title").read()
-
- #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+(
@@ -435,8 +463,9 @@ class OSAS_combineTextImage(Folder):
except:
filelanguage=""
- self.REQUEST.SESSION['isolist']=getISO()
- tmp=getISO().keys()
+ 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
@@ -449,20 +478,21 @@ class OSAS_combineTextImage(Folder):
newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self)
return newtemplate()
- def getProjects(self,obj_ids=None):
- """Get the Project title for configuration"""
+ 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 +501,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)
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 +556,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()