--- OSAS/OSA_system/OSAS_addfiles.py	2006/06/14 16:28:12	1.47
+++ OSAS/OSA_system/OSAS_addfiles.py	2010/02/15 19:09:00	1.53
@@ -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"""
@@ -157,7 +164,7 @@ class OSAS_add_Document(Folder):
         return OSAS_add.addPdf2(self)
 
     def addImages(self,path):
-        """Hinzufügen eines neuen Imagesfolders"""
+        """Hinzufuegen eines neuen Imagesfolders"""
         return OSAS_add.addImages(self,path)
 
     def addImages2(self):
@@ -337,15 +344,15 @@ 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!"
 
         # 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 imagepath: needs pageimg directory
-        links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s'%path,'libcoll standard viewer (texttool)')]
+        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
@@ -375,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)
@@ -436,7 +452,7 @@ def manage_AddOSAS_add_contextData(self,
 InitializeClass(OSAS_add_contextData)
 
 class OSAS_add_Presentation(Folder):
-    """Hinzufügen der Presentationsinformationen"""
+    """Hinzufuegen der Presentationsinformationen"""
     security=ClassSecurityInfo()
 
     def __init__(self,id):
@@ -465,7 +481,7 @@ class OSAS_add_Presentation(Folder):
             RESPONSE.redirect('manage_main')
 
     def addPresentation(self,path):
-        """Hinzufügen der Presenationsinformation"""
+        """Hinzufuegen der Presenationsinformation"""
         return OSAS_add.addPresentation(self,path)
 
     def addPresentation2(self):
@@ -488,7 +504,7 @@ def manage_AddOSAS_add_Presentation(self
 InitializeClass(OSAS_add_Presentation)
 
 class OSAS_combineTextImage(Folder):
-    """Hinzufüge der Combine Text und Image"""
+    """Hinzufuege der Combine Text und Image"""
     security=ClassSecurityInfo()
 
     def __init__(self,id):
@@ -518,7 +534,7 @@ class OSAS_combineTextImage(Folder):
             
     security.declarePublic('combineTextImage')
     def combineTextImage(self,path):
-        """Hinzufügen der Presenationsinformation"""
+        """Hinzufuegen der Presenationsinformation"""
         """gibt input formular zur erstellung des texttools meta tag aus"""
         files = os.listdir(path)
         
@@ -620,7 +636,7 @@ class OSAS_combineTextImage(Folder):
         return pt()
 
     def isSelectedViewerTemplateSet(self,obj,id):
-        """is ausgewählt"""
+        """is ausgewaehlt"""
         
         if self.REQUEST['viewerTemplateSet']==id:
             return 1