Changeset 1124 for ZMS/trunk/_zcatalogmanager.py

Timestamp:

23.07.2010 23:00:55 (22 months ago)

Author:

zmsdev

Message:

Applied fix for root-document as search-result (reported by tf).

File:

• ZMS/trunk/_zcatalogmanager.py (modified) (7 diffs)

ZMS/trunk/_zcatalogmanager.py

@@ -314 +314 @@
     def zcat_data( self, lang=None):
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       zcat = self.catalogData( {'lang':lang})
       return zcat
@@ -323 +323 @@
     def zcat_text( self, lang=None):
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       req = {'lang':lang}
       zcat = self.catalogText( req)
@@ -334 +334 @@
     def zcat_date( self, lang=None): 
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       req = {'lang':lang}
       zcat = self.getObjProperty('attr_dc_date',req)
@@ -350 +350 @@
     def zcat_title( self, lang=None):
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       req = {'lang':lang}
       zcat = self.getTitle( req)
@@ -362 +362 @@
     def zcat_summary( self, lang=None):
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       req = {'lang':lang}
       zcat = self.getObjProperty( 'attr_dc_description', req)
@@ -374 +374 @@
     def zcat_url( self, lang=None):
       if lang is None:
-        lang = self.default_catalog[self.default_catalog.find('_')+1:]
+        lang = self.REQUEST.get('lang',self.getPrimaryLanguage())
       req = {'lang':lang}
       txng_key = self.txng_get_key()
@@ -724 +724 @@
             if append:
               result['ob'] = ob
-              result['url'] = ob.getDeclUrl(REQUEST) + '/' + ob.zcat_url(lang)
+              result['url'] = (ob.getDeclUrl(REQUEST) + '/' + ob.zcat_url(lang)).replace('//','/')
               results.append((result[order_by],result))
           else:
             result['title'] = getattr(item,'zcat_title','')
             result['summary'] = getattr(item,'zcat_summary','')
-            result['path'] = path
             result['zcat_url'] = getattr(item,'zcat_url','')
-            result['url'] = path + '/' + getattr(item,'zcat_url','')
+            result['url'] = (path + '/' + getattr(item,'zcat_url','')).replace('//','/')
             results.append((result[order_by],result))