--- ECHO_content/ECHO_Nav.py	2006/10/11 16:55:26	1.77
+++ ECHO_content/ECHO_Nav.py	2012/01/03 13:02:31	1.85
@@ -29,14 +29,20 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 
 import urllib
-from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup,unicodify
 from ECHO_collection import content_html
-import zLOG
+import logging
 
+#def ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+STORAGEMANAGER_URL_DEFAULT = "http://storage-web.mpiwg-berlin.mpg.de/storage/storeOnline?path="
 try:    
     from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 except:
-    zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
+    logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported')
 
 
 
@@ -44,7 +50,9 @@ class ECHO_ZCatalogElement(SimpleItem):
     """Erzeuge navigation aus ZCatalog-abfrage"""
     meta_type="ECHO_ZCatalogElement"
     baseUrl=""
-
+    
+   
+    
     def __init__(self,id,title,field,catalogId,baseUrl,weight,contentType):
         """init"""
         self.id=id
@@ -273,7 +281,7 @@ class ECHO_sqlElement(SimpleItem):
     try:    
         searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch
     except:
-        zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
+        logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported')
             
     def getNavList(self): 
         """ausgabe der treffer list fuer navigation"""
@@ -297,7 +305,7 @@ class ECHO_sqlElement(SimpleItem):
                 try:
                     ret.append((getattr(record,self.field),self.baseUrl+urllib.quote(str(getattr(record,self.getSearchField())))))
                 except:
-                    zLOG.LOG('ECHO_Nav',zLOG.INFO,"error, search")
+                    logger('ECHO_Nav',logging.INFO,"error, search")
                     """notrhing"""
                     
             return ret
@@ -439,6 +447,16 @@ class ECHO_navigation(Folder):
     meta_type="ECHO_Navigation"
     management_page_charset="utf-8"
     
+    
+    def getFullTextBasisUrl(self):
+        #return die Basis url auf fulltexte, z.B.
+        #Beispiel http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/getDoc?doc=/archimedes/la/achil_propo_087_la_1545.xml
+        return getattr(self, "fullTextBasisUrl","http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/getDoc?doc=%s")
+
+    def getStandardMD(self):
+        #return self.standardMD_old 
+        return self.metadata.main.meta.bib
+     
     def getUsername(self):
         """get name of user"""
         username=str(self.REQUEST['AUTHENTICATED_USER'])
@@ -496,16 +514,7 @@ class ECHO_navigation(Folder):
     
     def decode(self,str):
         """decoder"""
-        if not str:
-            return ""
-        if type(str) is StringType:
-	    try:            
-            	return str.decode('utf-8')
-	    except:
-		return str.decode('latin-1')
-        else:
-            
-            return str
+        return unicodify(str)
 
     def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
         """formatiert liste im str"""
@@ -582,18 +591,21 @@ class ECHO_navigation(Folder):
         )
     displayedMetaTypes=displayTypes
     
+    def getStorageManagerURL(self):
+        """returns the URL to the storagemanager"""
+        return getattr(self,"storageManagerURL",STORAGEMANAGER_URL_DEFAULT)
     def ECHO_navigationConfigForm(self):
         """configForm"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self)
         return pt()
     
-    def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None):
+    def ECHO_navigationConfig(self,title,pathToHierarchy,fullTextBasisUrl="",storageManagerURL="",displayedMetaTypes=displayTypes,RESPONSE=None):
         """config"""
         self.title=title
         self.pathToHierarchy=pathToHierarchy
         self.displayedMetaTypes=toList(displayedMetaTypes)[0:]
-
-
+        self.storageManagerURL=storageManagerURL
+        self.fullTextBasisUrl=fullTextBasisUrl
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -628,8 +640,9 @@ class ECHO_navigation(Folder):
 
         # if not generate new hash
         obj=objtemp      
-
+        
         for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+
             x=keys[1]
             if depth>1:
                 nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
@@ -707,7 +720,7 @@ class ECHO_navigation(Folder):
                             try:
                                 label=temp[x][1].getTitle()
                             except:
-                                zLOG.LOG("ECHO_Nav",zLOG.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId())
+                                logger("ECHO_Nav",logging.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId())
                                 label=""
                     else:
                         label=temp[x][1].getTitle()
@@ -756,7 +769,7 @@ class ECHO_navigation(Folder):
 	
 	if len(item)<2:
 		return 0
-        #falls exakte Übereinstimmung dann immer 1
+        #falls exakte Uebereinstimmung dann immer 1
         if  (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''):
             
             return 1
@@ -879,11 +892,27 @@ class ECHO_navigation(Folder):
             nr=0
         return nr+1
     
+    def subNavStatic(self,obj):
+        """subnav" von self"""
+        def sortWeight(x,y):
+            x1=int(getattr(x[1],'weight','0'))
+            y1=int(getattr(y[1],'weight','0'))
+            return cmp(x1,y1)
+        print "obj",obj
+        subs=self.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes)
+        subret=[]
+        
+        for x in subs:
+            if not(x[1].title==""):
+                subret.append(x)
+        subret.sort(sortWeight)
+        return subret
+    
     def secondNavElements(self):
         """Zweite Ordnung Navigationselemente"""
         
         hash=self.createNavHash(2,checkOnly="no")
-        
+
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)