--- OSAS/OSA_system/OSAS_addfiles.py	2006/02/17 14:42:30	1.45
+++ OSAS/OSA_system/OSAS_addfiles.py	2008/10/17 06:26:43	1.52
@@ -20,7 +20,14 @@ from Globals import package_home
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 import sys
-import zLOG
+import logging
+import xmlrpclib
+#ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+
 
 def spaces(depth):
     """needed in XMLtoTree"""
@@ -337,11 +344,16 @@ class OSAS_add_contextData(Folder):
             urllib.urlopen(server+"/"+urlpath+"/index.meta")
             
         except:
-            zLOG.LOG("OSAS_addfiles (addContextData)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+            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
@@ -370,28 +382,37 @@ 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})
 
-
+        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"
         #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht.
-        urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+        #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"
-	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])
+	#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)