Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.10.1
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl	17 Feb 2003 20:56:16 -0000	1.1.1.1
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl	3 Sep 2004 13:30:46 -0000	1.1.1.1.10.1
@@ -41,13 +41,17 @@
 set show_upload_url_p [expr {!$admin_p && [permission::permission_p -object_id $folder_id -privilege "write"]}]
 set admin_actions_p 0
 
-set min_level 1
+#AG: In Oracle this query is a seemingly nonsensical "select 1 from dual".
+#The problem is, the db logic in PG is completely different and requires a query.
+#To avoid propagating these differences up to Tcl we use a query in Oracle too.
+set min_level [db_string select_default_min_level {}]
+
 if { $admin_p } {
     # Admin view is limited to the folder name due to the fact that the admin can see every
     # student's files
-    set max_level 1
+    set max_level $min_level
 } else {
-    set max_level 2
+    set max_level [expr $min_level + 1]
 }
 
 ad_return_template 
Index: openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql,v
diff -u -r1.2.2.1.4.5 -r1.2.2.1.4.6
--- openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	30 Aug 2004 16:44:55 -0000	1.2.2.1.4.5
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	3 Sep 2004 13:30:46 -0000	1.2.2.1.4.6
@@ -3,6 +3,12 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+    <fullquery name="select_default_min_level">
+        <querytext>
+            select 2 as min_level from dual
+	</querytext>
+    </fullquery>
+
     <fullquery name="select_folder_contents">
         <querytext>
             select
Index: openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql,v
diff -u -r1.2.2.2.4.1 -r1.2.2.2.4.2
--- openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql	30 Aug 2004 16:44:55 -0000	1.2.2.2.4.1
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql	3 Sep 2004 13:30:46 -0000	1.2.2.2.4.2
@@ -3,6 +3,13 @@
 <queryset>
 <rdbms><type>postgresql</type><version>7.2</version></rdbms>
 
+    <fullquery name="select_default_min_level">
+        <querytext>
+            select tree_level(tree_sortkey) as min_level
+            from cr_items where item_id = :folder_id
+	</querytext>
+    </fullquery>
+
     <fullquery name="select_folder_contents">
         <querytext>
             select
@@ -22,8 +29,8 @@
                where cr_items2.item_id in ([join $list_of_folder_ids ", "])
                  and cr_items.tree_sortkey between
                    cr_items2.tree_sortkey and tree_right(cr_items2.tree_sortkey)
-                 and tree_level(cr_items.tree_sortkey) >= :min_level + 2
-                 and tree_level(cr_items.tree_sortkey) <= :max_level + 2) fs_tree
+                 and tree_level(cr_items.tree_sortkey) > :min_level
+                 and tree_level(cr_items.tree_sortkey) <= :max_level + 1) fs_tree
               join acs_objects o on (o.object_id = fs_tree.item_id)
               left join cr_folders f on (f.folder_id = fs_tree.item_id)
               left join persons p on (p.person_id = o.creation_user)
Index: openacs-4/packages/dotlrn-homework/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk.tcl,v
diff -u -r1.2.2.2.4.1 -r1.2.2.2.4.2
--- openacs-4/packages/dotlrn-homework/www/folder-chunk.tcl	30 Aug 2004 16:44:55 -0000	1.2.2.2.4.1
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk.tcl	3 Sep 2004 13:30:46 -0000	1.2.2.2.4.2
@@ -60,6 +60,16 @@
     set qualify_by_owner [db_map qualify_by_owner]
 }
 
+#AG: In Oracle this query is a seemingly nonsensical "select 2 from dual".
+#The problem is, the db logic in PG is completely different and requires a query.
+#To avoid propagating these differences up to Tcl we use a query in Oracle too.
+if {![exists_and_not_null min_level]} {
+    set min_level [db_string select_default_min_level {}]
+}
+if {![exists_and_not_null max_level]} {
+    set max_level $min_level
+}
+
 # If all the files belong to a single user we won't show the name of the user
 # who has created the file.  
 set show_users_p 0
Index: openacs-4/packages/dotlrn-homework/www/folder-contents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-contents.tcl,v
diff -u -r1.2.2.1 -r1.2.2.1.4.1
--- openacs-4/packages/dotlrn-homework/www/folder-contents.tcl	26 Nov 2003 11:34:09 -0000	1.2.2.1
+++ openacs-4/packages/dotlrn-homework/www/folder-contents.tcl	3 Sep 2004 13:30:46 -0000	1.2.2.1.4.1
@@ -6,8 +6,8 @@
 
 } {
     folder_id:integer,notnull
-    {min_level:integer 2}
-    {max_level:integer 2}
+    {min_level:integer ""}
+    {max_level:integer ""}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if ![fs_folder_p $folder_id] {