From 334fdb5c6becba6500382b17e0366655a5393945 Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Mon, 23 Jul 2001 00:20:26 +0000 Subject: [PATCH] fixed a bug in conference display of new messages, and added a couple of words to the dictionary --- etc/erbo.dict | 2 ++ src/com/silverwrist/venice/servlets/ConfDisplay.java | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/erbo.dict b/etc/erbo.dict index f12be60..3992079 100644 --- a/etc/erbo.dict +++ b/etc/erbo.dict @@ -61,6 +61,7 @@ marillion mdt minbar minbari +mom mp mr mst @@ -128,6 +129,7 @@ webb webbme won't wouldn't +wow you'd you'll you're diff --git a/src/com/silverwrist/venice/servlets/ConfDisplay.java b/src/com/silverwrist/venice/servlets/ConfDisplay.java index cdd7cda..c50a68c 100644 --- a/src/com/silverwrist/venice/servlets/ConfDisplay.java +++ b/src/com/silverwrist/venice/servlets/ConfDisplay.java @@ -425,11 +425,15 @@ public class ConfDisplay extends VeniceServlet } // end while + if (topic==null) // no suitable topic found - just create the topic listing + return new TopicListing(request,sig,conf,opts.getViewOption(conf.getConfID()), + opts.getSortOption(conf.getConfID())); + // determine what the post interval is we want to display PostInterval piv = getInterval(engine,request,topic,on_error); // create the topic posts view - tpos = new TopicPosts(request,engine,sig,conf,topic,piv.getFirst(),piv.getLast(),true,false); + return new TopicPosts(request,engine,sig,conf,topic,piv.getFirst(),piv.getLast(),true,false); } // end try catch (DataException de) @@ -443,8 +447,6 @@ public class ConfDisplay extends VeniceServlet } // end catch - return tpos; // this is what we need! - } // end if (creating a "read new" topic list view) else { // topic listing only...