--- OSAS/OSA_system/OSAS_addfiles.py	2006/02/14 16:25:22	1.43
+++ OSAS/OSA_system/OSAS_addfiles.py	2006/02/14 16:43:49	1.44
@@ -19,6 +19,7 @@ from Globals import package_home
 
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
+import sys
 import zLOG
 
 def spaces(depth):
@@ -328,13 +329,16 @@ class OSAS_add_contextData(Folder):
         """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:
-            urllib.urlopen(server+"/"+path+"/index.meta")
+            urllib.urlopen(server+"/"+urlpath+"/index.meta")
             
         except:
 	    zLOG.LOG("OSAS_addfiles (addContextData)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-            return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!"
+            return server+"/"+urlpath+"/index.meta file has to exist!"
 
         links=[(path,'standard storage')]
         
@@ -353,8 +357,13 @@ class OSAS_add_contextData(Folder):
         id=splitted[len(splitted)-1]
         title=splitted[len(splitted)-1]
         server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL'])
-        
-        metalink=server+"/"+path+"/index.meta"
+        if path[0]=="/": #strip leading slash
+		urlpath=path[1:]
+	else:
+		urlpath=path
+
+
+        metalink=server+"/"+urlpath+"/index.meta"
         
         #link=TOBEDONE"
         """Hinzufuegen der Ressource"""
@@ -375,10 +384,16 @@ class OSAS_add_contextData(Folder):
 
         urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
         #print "copy2res"
-        urllib.urlopen(collection+"/"+id+"/generate_label").read()
-        #print "label"
-        urllib.urlopen(collection+"/"+id+"/generate_title").read()
-        #print "title"
+	try:
+        	urllib.urlopen(collection+"/"+id+"/generate_label").read()
+        except:
+	    zLOG.LOG("OSAS_addfiles (addContextData2,label not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+	try:
+        	urllib.urlopen(collection+"/"+id+"/generate_title").read()
+	except:
+	    zLOG.LOG("OSAS_addfiles (addContextData2,title not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+	        
+
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
     manage_options = Folder.manage_options+(