--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/14 21:26:23 1.27
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/05/06 16:58:57 1.32
@@ -92,9 +92,9 @@ 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['path'])[0]
+ 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['path'])[1]
+ 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
@@ -107,7 +107,7 @@ class OSAS_add_Document(Folder):
newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
newtemplate.content_type="text/plain"
renderxml = newtemplate()
- metapath=self.REQUEST.SESSION['path']+"/index.meta"
+ metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
f=open(metapath,'w')
@@ -218,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"
@@ -240,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
@@ -264,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")
@@ -284,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
@@ -306,22 +307,13 @@ class OSAS_add_contextData(Folder):
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()
- return retStr
+
if not retStr:
return "An Error occured adding the resource\n"
+
urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
- #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()
- #except:
- # """nothing"""
- #return "BLUByy"
return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
manage_options = Folder.manage_options+(
@@ -468,7 +460,7 @@ class OSAS_combineTextImage(Folder):
filelanguage=""
self.REQUEST.SESSION['isolist']=OSAS_add.getISO()
- print "DD",self.REQUEST.SESSION['isolist']
+
tmp=self.REQUEST.SESSION['isolist'].keys()
tmp.sort()
self.REQUEST.SESSION['isolistsort']=tmp
@@ -485,13 +477,13 @@ class OSAS_combineTextImage(Folder):
def getProjects(self,obj_ids=None):
"""Get the Project title for configuration"""
ret=[]
- print "HI"
+
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
+
return ret
except:
@@ -504,20 +496,32 @@ 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"""
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)
@@ -544,7 +548,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()