--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/17 15:22:42 1.31
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/05/06 16:58:57 1.32
@@ -221,7 +221,7 @@ class OSAS_add_contextData(Folder):
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"
@@ -239,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
@@ -263,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")
@@ -283,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