Changeset 1124

Timestamp:

23.07.2010 23:00:55 (19 months ago)

Author:

zmsdev

Message:

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

Location:

ZMS/trunk

Files:

• _zcatalogmanager.py (modified) (7 diffs)
• dtml/ZMS/f_bodycontent_search.dtml (modified) (5 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))
       

ZMS/trunk/dtml/ZMS/f_bodycontent_search.dtml

@@ -19 +19 @@
 --------------------------------------------------------------------------------
 </dtml-comment>
-<dtml-if "REQUEST.has_key('raw') and int(searchform)==1">
- <h1 class="title"><dtml-var "getLangStr('SEARCH_HEADERAGAIN',lang)"></h1>
-<dtml-else>
- <h1 class="title"><dtml-var "getLangStr('SEARCH_HEADER',lang)"></h1>
-</dtml-if>
+<h1 class="title"><dtml-var "getLangStr('SEARCH_HEADER',lang)"></h1>
 
 <dtml-comment>
@@ -81 +77 @@
    <td class="searchElement">
     <select name="search_order_by:int">
-     <dtml-in "_.range(1,2+1)">
+     <dtml-in "range(1,2+1)">
       <option value="<dtml-var sequence-item>"
        <dtml-if "int(REQUEST['search_order_by'])==_['sequence-item']">
@@ -104 +100 @@
   </dtml-if>
   <dtml-let portalClients="getPortalClients()">
-   <dtml-if "getConfProperty('ZCatalog.portalClients',1) == 1 and len(portalClients)>0">
+   <dtml-if "getConfProperty('ZCatalog.portalClients',1)==1 and len(portalClients)>0">
     <tr valign="middle">
      <td class="searchLabel">&nbsp;</td>
@@ -127 +123 @@
 <dtml-if "REQUEST.has_key('raw')">
 
- <dtml-call "REQUEST.set('qt',_.DateTime().timeTime())">
+ <dtml-call "REQUEST.set('qt',DateTime().timeTime())">
  <dtml-call "REQUEST.set('_s',raw)">
  <dtml-call "REQUEST.set('_s',getCatalogQueryString(raw,option))">
@@ -251 +247 @@
 
 </dtml-if>
-