--- OSAS/OSA_system/OSAS_addfiles.py	2005/11/04 16:37:35	1.41
+++ OSAS/OSA_system/OSAS_addfiles.py	2008/10/17 06:26:43	1.52
@@ -19,6 +19,15 @@ from Globals import package_home
 
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
+import sys
+import logging
+import xmlrpclib
+#ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+
 
 def spaces(depth):
     """needed in XMLtoTree"""
@@ -325,14 +334,26 @@ class OSAS_add_contextData(Folder):
     
     def addContextData(self,path):
         """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(self.REQUEST['SERVER_URL']+path+"/index.meta")
+            urllib.urlopen(server+"/"+urlpath+"/index.meta")
             
         except:
-            return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!"
+            logger("OSAS_addfiles (addContextData)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+            return server+"/"+urlpath+"/index.meta file has to exist!"
 
-        links=[(path,'standard storage')]
-        
+        # old version for foxridge storage viewer
+        #links=[(path,'storage server view')]
+        # libcoll viewer with imagepath: needs pageimg directory
+        links=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')]
+        # libcoll viewer with texttool: needs texttool tag
+        links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s/index.meta'%path,'libcoll standard viewer (texttool)')]
+                
         links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
         #print "LINK",links
         #return links
@@ -347,31 +368,53 @@ class OSAS_add_contextData(Folder):
         #print "BLU"
         id=splitted[len(splitted)-1]
         title=splitted[len(splitted)-1]
-        metalink=self.REQUEST['SERVER_URL']+path+"/index.meta"
+        server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL'])
+        if path[0]=="/": #strip leading slash
+		urlpath=path[1:]
+	else:
+		urlpath=path
+
+
+        metalink=server+"/"+urlpath+"/index.meta"
         
         #link=TOBEDONE"
         """Hinzufuegen der Ressource"""
 
         params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
-
+        server=xmlrpclib.ServerProxy(collection,allow_none=True)   
         try:
-            retStr=urllib.urlopen(collection+"/addResource",params).read()
+            #retStr=urllib.urlopen(collection+"/addResource",params).read()
+            
+            retStr=server.addResource(id,title,label,description,content_type,responsible,link,metalink,weight,credits)
+              
         except:
-            return "An Error occured adding the resource\n", collection,params
+            return "An Error occured adding the resource A\n", collection,params,str(sys.exc_info()[0]),str(sys.exc_info()[1])
         
         #print "added"
+        logging.debug("Add an resource:"+repr(retStr))
         if not retStr:
-            return "An Error occured adding the resource\n", collection,params
+            return "An Error occured adding the resource B\n", collection,params
         
         #print collection+"/"+id+"/copyIndex_meta2echo_resource"
-
-        urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+        #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht.
+        #server=xmlrpclib.ServerProxy(collection+"/"+id,allow_none=True)
+        #server2=getattr(server,id)
+        #server2.copyIndex_meta2echo_resource()
+        #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()
+   #         server2.generate_label()
+      #  except:
+    #        logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+	#try:
+        	#urllib.urlopen(collection+"/"+id+"/generate_title").read()
+   #         server2.generate_title()
+	#except:
+	#    logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+	        
+
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
     manage_options = Folder.manage_options+(
@@ -385,10 +428,11 @@ class OSAS_add_contextData(Folder):
         return pt()
     
     
-    def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None):
+    def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None):
         """Change"""
         self.pwstr=pwstr
         self.collection=collection
+        self.serverUrl=serverUrl
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')