Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.27.2.4 -r1.27.2.5
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	8 Dec 2003 15:11:43 -0000	1.27.2.4
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	13 Dec 2003 00:30:50 -0000	1.27.2.5
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-content-repository-5.0.0b4.apm">
+    <version name="5.0.0b5" url="http://openacs.org/repository/download/apm/acs-content-repository-5.0.0b5.apm">
         <owner url="mailto:dcwickstrom@earthlink.net">Dan Wickstrom</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2003-11-07</release-date>
@@ -17,7 +17,7 @@
          other CMS backing functionality.  Utilized by Bug Tracker, File Storage, and other packages.
         </description>
 
-        <provides url="acs-content-repository" version="5.0.0b4"/>
+        <provides url="acs-content-repository" version="5.0.0b5"/>
         <requires url="acs-kernel" version="5.0.0b4"/>
         <requires url="acs-service-contract" version="5.0.0b4"/>
         <requires url="search" version="5.0.0b4"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql	24 Nov 2003 17:25:15 -0000	1.14.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql	13 Dec 2003 00:30:50 -0000	1.14.2.2
@@ -197,20 +197,23 @@
   is_assigned__keyword_id             alias for $2;  
   is_assigned__recurse                alias for $3;  -- default ''none''  
   v_ret                               boolean;    
+  v_is_assigned__recurse	      varchar;
 begin
   if is_assigned__recurse is null then 
-	is_assigned__recurse := ''none'';
+	v_is_assigned__recurse := ''none'';
+  else
+      	v_is_assigned__recurse := is_assigned__recurse;	
   end if;
 
   -- Look for an exact match
-  if is_assigned__recurse = ''none'' then
+  if v_is_assigned__recurse = ''none'' then
       return count(*) > 0 from cr_item_keyword_map
        where item_id = is_assigned__item_id
          and keyword_id = is_assigned__keyword_id;
   end if;
 
   -- Look from specific to general
-  if is_assigned__recurse = ''up'' then
+  if v_is_assigned__recurse = ''up'' then
       return count(*) > 0
       where exists (select 1
                     from (select keyword_id from cr_keywords c, cr_keywords c2
@@ -221,7 +224,7 @@
                       and m.item_id = is_assigned__item_id);
   end if;
 
-  if is_assigned__recurse = ''down'' then
+  if v_is_assigned__recurse = ''down'' then
       return count(*) > 0
       where exists (select 1
                     from (select k2.keyword_id
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	24 Nov 2003 17:25:15 -0000	1.1.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	13 Dec 2003 00:30:50 -0000	1.1.2.2
@@ -448,20 +448,23 @@
   is_assigned__keyword_id             alias for $2;  
   is_assigned__recurse                alias for $3;  -- default ''none''  
   v_ret                               boolean;    
+  v_is_assigned__recurse	      varchar;
 begin
   if is_assigned__recurse is null then 
-	is_assigned__recurse := ''none'';
+	v_is_assigned__recurse := ''none'';
+  else
+      	v_is_assigned__recurse := is_assigned__recurse;	
   end if;
 
   -- Look for an exact match
-  if is_assigned__recurse = ''none'' then
+  if v_is_assigned__recurse = ''none'' then
       return count(*) > 0 from cr_item_keyword_map
        where item_id = is_assigned__item_id
          and keyword_id = is_assigned__keyword_id;
   end if;
 
   -- Look from specific to general
-  if is_assigned__recurse = ''up'' then
+  if v_is_assigned__recurse = ''up'' then
       return count(*) > 0
       where exists (select 1
                     from (select keyword_id from cr_keywords c, cr_keywords c2
@@ -472,7 +475,7 @@
                       and m.item_id = is_assigned__item_id);
   end if;
 
-  if is_assigned__recurse = ''down'' then
+  if v_is_assigned__recurse = ''down'' then
       return count(*) > 0
       where exists (select 1
                     from (select k2.keyword_id
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql'.
Fisheye: No comparison available.  Pass `N' to diff?