Index: openacs-4/packages/news/tcl/news-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news/tcl/news-procs.xql	24 Feb 2005 18:03:05 -0000	1.6
+++ openacs-4/packages/news/tcl/news-procs.xql	26 Mar 2005 20:54:27 -0000	1.7
@@ -2,24 +2,15 @@
 
 <queryset>
 
-<fullquery name="news__url.get_item_id">
+<fullquery name="news__url.get">
       <querytext>
-
-	select item_id
-        from cr_revisions
-        where revision_id=:object_id
-
+	select r.item_id, n.package_id
+        from cr_revisions r, cr_news n
+        where (r.revision_id=:object_id or r.item_id = :object_id)
+          and r.revision_id = n.news_id
       </querytext>
 </fullquery>
 
-<fullquery name="news__url.get_package_id">
-	<querytext>
-	select package_id
-	from cr_news
-	where news_id=:object_id
-	</querytext>
-</fullquery>
-
 <fullquery name="news__last_updated.get_last_updated">
         <querytext>
         select max(o.last_modified)