Index: openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql	23 Feb 2005 11:52:20 -0000	1.24
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql	29 Dec 2005 01:24:01 -0000	1.24.2.1
@@ -835,7 +835,7 @@
     name        => 'pages',
     label       => 'Pages', 
     description => 'Site pages go here',
-    parent_id   => 0,
+    parent_id   => -4,
     folder_id   => content_item.get_root_folder
   );
 
@@ -867,7 +867,7 @@
     name        => 'templates',
     label       => 'Templates', 
     description => 'Templates which render the pages go here',
-    parent_id   => 0,
+    parent_id   => -4,
     folder_id   => content_template.get_root_folder
   );
 
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	30 Nov 2005 01:27:45 -0000	1.18.2.2
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	29 Dec 2005 01:24:01 -0000	1.18.2.3
@@ -38,8 +38,8 @@
     v_context_id := content_folder.new.context_id;
   end if;
 
-  -- parent_id = 0 means that this is a mount point
-  if parent_id ^= 0 and 
+  -- parent_id = security context root means that this is a mount point
+  if parent_id ^= 4 and 
     content_folder.is_folder(parent_id) = 'f' and
     content_folder.is_registered(parent_id,'content_folder') = 'f' then
 
@@ -49,7 +49,7 @@
 
     v_package_id := package_id;
 
-    if parent_id is not null and parent_id ^= 0 and package_id is null then
+    if parent_id is not null and parent_id ^= -4 and package_id is null then
         v_package_id := acs_object.package_id(content_item.get_root_folder(parent_id));
     end if;
 
@@ -434,7 +434,7 @@
     start with
       item_id = target_folder_id;
 
-  v_parent_id integer := 0;
+  v_parent_id integer := -4;
   v_sub_folder_p char := 'f';
 
 begin
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	12 Mar 2005 19:22:15 -0000	1.29
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	29 Dec 2005 01:24:01 -0000	1.29.2.1
@@ -26,7 +26,7 @@
 
 begin
 
-  if item_id is NULL then
+  if item_id is NULL or item_id in (-4,-100,-200) then
 
     v_folder_id := c_root_folder_id;
 
@@ -37,7 +37,7 @@
     from
       cr_items
     where 
-      parent_id = 0
+      parent_id = -4
     connect by
       prior parent_id = item_id
     start with
@@ -115,7 +115,7 @@
     v_parent_id := parent_id;
   end if;
 
-  if package_id is null and parent_id ^= 0 then
+  if package_id is null and parent_id ^= -4 then
     v_package_id := acs_object.package_id(content_item.get_root_folder(v_parent_id));
   else
     v_package_id := package_id;
@@ -128,10 +128,10 @@
     v_context_id := context_id;
   end if;
 
-  if v_parent_id = 0 or 
+  if v_parent_id = -4 or 
     content_folder.is_folder(v_parent_id) = 't' then
 
-    if v_parent_id ^= 0 and 
+    if v_parent_id ^= -4 and 
       content_folder.is_registered(
         v_parent_id, content_item.new.content_type, 'f') = 'f' then
 
@@ -141,7 +141,7 @@
 
     end if;
 
-  elsif v_parent_id ^= 0 then
+  elsif v_parent_id ^= -4 then
 
     begin
 
@@ -204,7 +204,7 @@
 
   -- if the parent is not a folder, insert into cr_child_rels
   -- We checked above before creating the object that it is a valid rel
-  if v_parent_id ^= 0 and
+  if v_parent_id ^= -4 and
     content_folder.is_folder(v_parent_id) = 'f' then
 
     v_rel_id := acs_object.new(
@@ -773,7 +773,7 @@
 
   v_count integer;
   v_name varchar2(400); 
-  v_parent_id integer := 0;
+  v_parent_id integer := -4;
   v_tree_level integer;
 
   v_resolved_root_id integer;
@@ -792,7 +792,7 @@
     order by
       tree_level desc;
 
-  v_rel_parent_id integer := 0;
+  v_rel_parent_id integer := -4;
   v_rel_tree_level integer := 0;
 
   v_path varchar2(4000) := '';
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.2.1d1-5.2.1d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql,v
diff -u -r1.49.2.1 -r1.49.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	3 Oct 2005 18:17:10 -0000	1.49.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	29 Dec 2005 01:24:02 -0000	1.49.2.2
@@ -1243,7 +1243,7 @@
     ''pages'',
     ''Pages'', 
     ''Site pages go here'',
-    0,
+    -4,
     null,
     content_item__get_root_folder(null),
     now(),
@@ -1278,7 +1278,7 @@
     ''templates'',
     ''Templates'', 
     ''Templates which render the pages go here'',
-    0,
+    -4,
     null,
     content_template__get_root_folder(),
     now(),
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v
diff -u -r1.46.2.2 -r1.46.2.3
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	26 Nov 2005 21:22:53 -0000	1.46.2.2
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	29 Dec 2005 01:24:02 -0000	1.46.2.3
@@ -183,8 +183,8 @@
     v_context_id := new__context_id;
   end if;
 
-  -- parent_id = 0 means that this is a mount point
-  if new__parent_id != 0 and 
+  -- parent_id = security_context_root means that this is a mount point
+  if new__parent_id != -4 and 
     content_folder__is_folder(new__parent_id) and
     content_folder__is_registered(new__parent_id,''content_folder'',''f'') = ''f'' then
 
@@ -699,10 +699,10 @@
     v_parent_id := v_rec.parent_id;
     exit when v_parent_id = is_sub_folder__folder_id;
     -- we did not find the folder, reset v_parent_id
-    v_parent_id := 0;
+    v_parent_id := -4;
   end LOOP;
 
-  if v_parent_id != 0 then 
+  if v_parent_id != -4 then 
     v_sub_folder_p := ''t'';
   end if;
 
@@ -971,7 +971,7 @@
   v_is_root                       boolean;       
 begin
 
-  select parent_id = 0 into v_is_root 
+  select parent_id = -4 into v_is_root 
     from cr_items where item_id = is_root__folder_id;
 
   return v_is_root;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v
diff -u -r1.65.2.3 -r1.65.2.4
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	28 Oct 2005 18:03:47 -0000	1.65.2.3
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	29 Dec 2005 01:24:02 -0000	1.65.2.4
@@ -21,15 +21,15 @@
   v_folder_id                             cr_folders.folder_id%TYPE;
 begin
 
-  if get_root_folder__item_id is NULL or get_root_folder__item_id in (0,-100,-200) then
+  if get_root_folder__item_id is NULL or get_root_folder__item_id in (-4,-100,-200) then
 
     v_folder_id := content_item_globals.c_root_folder_id;
 
   else
 
     select i2.item_id into v_folder_id
     from cr_items i1, cr_items i2
-    where i2.parent_id = 0
+    where i2.parent_id = -4
     and i1.item_id = get_root_folder__item_id
     and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey);
 
@@ -124,23 +124,23 @@
     v_title := new__title;
   end if;
 
-  if new__package_id is null and v_parent_id != 0 then
+  if new__package_id is null and v_parent_id != -4 then
     v_package_id := acs_object__package_id(content_item__get_root_folder(v_parent_id));
   else
     v_package_id := new__package_id;
   end if;
 
-  if v_parent_id = 0 or 
+  if v_parent_id = -4 or 
     content_folder__is_folder(v_parent_id) = ''t'' then
 
-    if v_parent_id != 0 and 
+    if v_parent_id != -4 and 
       content_folder__is_registered(
         v_parent_id, new__content_type, ''f'') = ''f'' then
 
       raise EXCEPTION ''-20000: This items content type % is not registered to this folder %'', new__content_type, v_parent_id;
     end if;
 
-  else if v_parent_id != 0 then
+  else if v_parent_id != -4 then
 
      if new__relation_tag is null then
        v_rel_tag := content_item__get_content_type(v_parent_id) 
@@ -186,7 +186,7 @@
   );
 
   -- if the parent is not a folder, insert into cr_child_rels
-  if v_parent_id != 0 and
+  if v_parent_id != -4 and
     content_folder__is_folder(v_parent_id) = ''f'' then
 
     v_rel_id := acs_object__new(
@@ -364,17 +364,17 @@
     v_package_id := new__package_id;
   end if;
 
-  if v_parent_id = 0 or 
+  if v_parent_id = -4 or 
     content_folder__is_folder(v_parent_id) = ''t'' then
 
-    if v_parent_id != 0 and 
+    if v_parent_id != -4 and 
       content_folder__is_registered(
         v_parent_id, new__content_type, ''f'') = ''f'' then
 
       raise EXCEPTION ''-20000: This items content type % is not registered to this folder %'', new__content_type, v_parent_id;
     end if;
 
-  else if v_parent_id != 0 then
+  else if v_parent_id != -4 then
 
      select object_type into v_parent_type from acs_objects
        where object_id = v_parent_id;
@@ -412,7 +412,7 @@
   );
 
   -- if the parent is not a folder, insert into cr_child_rels
-  if v_parent_id != 0 and
+  if v_parent_id != -4 and
     content_folder__is_folder(v_parent_id) = ''f'' and 
     content_item__is_valid_child(v_parent_id, new__content_type) = ''t'' then
 
@@ -572,17 +572,17 @@
     v_title := new__title;
   end if;
 
-  if v_parent_id = 0 or 
+  if v_parent_id = -4 or 
     content_folder__is_folder(v_parent_id) = ''t'' then
 
-    if v_parent_id != 0 and 
+    if v_parent_id != -4 and 
       content_folder__is_registered(
         v_parent_id, new__content_type, ''f'') = ''f'' then
 
       raise EXCEPTION ''-20000: This items content type % is not registered to this folder %'', new__content_type, v_parent_id;
     end if;
 
-  else if v_parent_id != 0 then
+  else if v_parent_id != -4 then
 
      select object_type into v_parent_type from acs_objects
        where object_id = v_parent_id;
@@ -620,7 +620,7 @@
   );
 
   -- if the parent is not a folder, insert into cr_child_rels
-  if v_parent_id != 0 and
+  if v_parent_id != -4 and
     content_folder__is_folder(v_parent_id) = ''f'' and 
     content_item__is_valid_child(v_parent_id, new__content_type) = ''t'' then
 
@@ -856,17 +856,17 @@
     v_package_id := new__package_id;
   end if;
 
-  if v_parent_id = 0 or 
+  if v_parent_id = -4 or 
     content_folder__is_folder(v_parent_id) = ''t'' then
 
-    if v_parent_id != 0 and 
+    if v_parent_id != -4 and 
       content_folder__is_registered(
         v_parent_id, new__content_type, ''f'') = ''f'' then
 
       raise EXCEPTION ''-20000: This items content type % is not registered to this folder %'', new__content_type, v_parent_id;
     end if;
 
-  else if v_parent_id != 0 then
+  else if v_parent_id != -4 then
 
      select object_type into v_parent_type from acs_objects
        where object_id = v_parent_id;
@@ -906,7 +906,7 @@
   );
 
   -- if the parent is not a folder, insert into cr_child_rels
-  if v_parent_id != 0 and
+  if v_parent_id != -4 and
     content_folder__is_folder(v_parent_id) = ''f'' and 
     content_item__is_valid_child(v_parent_id, new__content_type) = ''t'' then
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.1d1-5.2.1d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?