[interchange-cvs] interchange - pajamian modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Wed Sep 20 10:15:35 EDT 2006


User:      pajamian
Date:      2006-09-20 14:15:35 GMT
Modified:  .        Tag: STABLE_5_4-branch WHATSNEW-5.4
Modified:  dist/standard Tag: STABLE_5_4-branch catalog.cfg
Log:
* If we don't match a prod_group and category in a missing page return the
  missing SpecialPage not results.html.

* If we do have a match display it in the results SpecialPage instead of hard
  coding it to results.html.

Revision  Changes    Path
No                   revision



No                   revision



1.1.2.8   +2 -0      interchange/Attic/WHATSNEW-5.4


rev 1.1.2.8, prev_rev 1.1.2.7
Index: WHATSNEW-5.4
===================================================================
RCS file: /var/cvs/interchange/Attic/WHATSNEW-5.4,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- WHATSNEW-5.4	20 Sep 2006 11:50:43 -0000	1.1.2.7
+++ WHATSNEW-5.4	20 Sep 2006 14:15:35 -0000	1.1.2.8
@@ -48,6 +48,8 @@
   - Fixed broken admin 404 error page (which came from Standard).
   - Removed duplicate, sometimes-bogus MV_PREV_PAGE display.
   - Eliminated double-interpolation of page comparison.
+  - Return missing special_page if there's no prod_group and catalog match.
+  - Return results special_page if there is a match instead of results.html
 
 * Increased compatibility with XHTML.
 



No                   revision



No                   revision



1.11.2.1  +5 -1      interchange/dist/standard/catalog.cfg


rev 1.11.2.1, prev_rev 1.11
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/standard/catalog.cfg,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- catalog.cfg	19 Oct 2005 14:26:32 -0000	1.11
+++ catalog.cfg	20 Sep 2006 14:15:35 -0000	1.11.2.1
@@ -667,6 +667,10 @@
     $CGI->{sp} = 'results';
     $CGI->{mv_todo} = 'search';
     $Tag->update('process');
-    return (1, 'results');
+    if (($o = $Search->{''}) && @{$o->{mv_results}}) {
+        return (1,  $Config->{Special}->{results});
+    }
+
+    return;
 }
 EOS








More information about the interchange-cvs mailing list