--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/02 08:02:15 1.22
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/04/02 17:38:40 1.23
@@ -193,68 +193,48 @@ class OSAS_add_contextData(Folder):
self.depth-=1
- parser=make_parser()
- curHandler=requestHandler()
- parser.setContentHandler(curHandler)
- #return urllib.urlopen(URL).read()
- parser.parse(urllib.urlopen(URL))
- return curHandler.retStr
-
+ try:
+ URL+="/getCollectionTreeXML"
+ parser=make_parser()
+ curHandler=requestHandler()
+ parser.setContentHandler(curHandler)
+
+ parser.parse(urllib.urlopen(URL))
+ return curHandler.retStr
+ except:
+ return urllib.urlopen(URL).read()
+
def __init__(self,id,collection):
self.id=id
self.collection=collection
- def getChilds(self,id,depth,items):
- list=[]
- for object in items:
- if (depth==object[2])&(id==object[0]):
- list.append(object)
- return list
+
+
-
-
- def printChilds(self,startItem,depth,items,enddepth):
- """NOT USED ANYMORE"""
- def spaces(depth):
- tmp=""
- k=0
- while k<2*depth:
- k+=1
- tmp=tmp+" "+" "
- return tmp
-
- def retLink(object):
- return "%s"% (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)
+ def getPartners(self,URL):
+ """Zeige Partnerliste"""
+ class requestHandler(ContentHandler):
+ def __init__(self):
+ self.ret=[]
- tmp= tmp+retLink(child[1])+"
"+self.printChilds(child[1],depth,items,enddepth)
- else:
- tmp=tmp+spaces(2*depth)
- tmp = tmp+retLink(child[1])
-
- return tmp
+ def startElement(self,name,attrs):
+ if name=="partner":
+ self.ret.append((attrs.get('id'),attrs.get('title')))
+
+
+ URL+="/getPartnersXML"
+
+ try:
+
+ parser=make_parser()
+ curHandler=requestHandler()
+ parser.setContentHandler(curHandler)
+
+ parser.parse(urllib.urlopen(URL))
+ return curHandler.ret
+ except:
+ return [("",urllib.urlopen(URL).read())]
-
- def generateTree(self,depth=10):
- """Erzeugt HTML-Tree der Collection NOTE USED ANYMORE"""
-
- 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):
- """Zeige Partnerliste"""
- exec("items=self.getPhysicalRoot()."+self.collection+".partners.getPartners()")
- return items
def addContextData(self,path):
"""Hinzufügen zu einer Sammlung"""