Index: openacs-4/packages/fs-portlet/fs-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/fs-portlet.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/fs-portlet/fs-portlet.info 9 Oct 2001 06:20:36 -0000 1.3
+++ openacs-4/packages/fs-portlet/fs-portlet.info 16 Jan 2002 21:46:41 -0000 1.4
@@ -7,26 +7,29 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="0.1a" url="http://dotlrn.openforce.net/fs-portlet-0.1a.apm" type="apm_service">
+ <version name="0.1a" url="http://dotlrn.openforce.net/fs-portlet-0.1a.apm">
<database-support>
<database>oracle</database>
+ <database>postgresql</database>
</database-support>
- <owner> url="mailto:arjun@openforce.net">Arjun Sanyal</owner>
+ <owner> url="mailto:arjun@openforce.net">Arjun Sanyal</owner>
<summary>Creates fs datasource for portal portlets.</summary>
<vendor url="http://openforce.net/">OpenForce, Inc.</vendor>
<provides url="fs-portlet" version="0.1a"/>
<requires url="new-portal" version="0.1a"/>
- <!--requires url="file-storage" version="4.1" -->
<files>
<file type="package_spec" path="fs-portlet.info"/>
<file type="data_model_create" db_type="oracle" path="sql/oracle/fs-portlet-create.sql"/>
<file type="data_model_drop" db_type="oracle" path="sql/oracle/fs-portlet-drop.sql"/>
<file type="tcl_procs" path="tcl/fs-portlet-procs.tcl"/>
+ <file type="query_file" db_type="oracle" path="www/fs-portlet-oracle.xql"/>
+ <file type="content_page" path="www/fs-portlet.adp"/>
+ <file type="content_page" path="www/fs-portlet.tcl"/>
</files>
<parameters>
- <!-- No version parameters -->
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="pretty_name" default="Documents3" description="The name to show in the title bar of a portlet"/>
</parameters>
</version>
Index: openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql 17 Nov 2001 22:32:22 -0000 1.7
+++ openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql 16 Jan 2002 21:46:41 -0000 1.8
@@ -60,6 +60,15 @@
);
+ -- link_hideable_p
+ portal_datasource.set_def_param (
+ datasource_id => ds_id,
+ config_required_p => 't',
+ configured_p => 't',
+ key => 'link_hideable_p',
+ value => 't'
+);
+
-- fs-specific params
-- community_id must be configured
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp 16 Jan 2002 01:36:19 -0000 1.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp 16 Jan 2002 21:46:41 -0000 1.2
@@ -2,28 +2,28 @@
<table border=0 cellpadding=2 cellspacing=2 width=100%>
- <multiple name="items">
+ <multiple name="foo">
<tr>
- <if @items.type@ eq "Folder">
+ <if @foo.type@ eq "Folder">
- <td><a href=@items.name@?folder_id=@items.file_id@><img border=0 src=@items.name@graphics/folder.gif width=15 height=13> @items.name@</a>
+ <td><a href=@foo.url@?folder_id=@foo.file_id@><img border=0 src=@foo.url@graphics/folder.gif width=15 height=13> @foo.name@</a>
</td>
- <td><small>@items.type@</small></td>
+ <td><small>@foo.type@</small></td>
- <if @items.num@ lt 1 or @items.num@ eq 0>
- <td><small>@items.num@ items</small></td>
+ <if @foo.num@ lt 1 or @foo.num@ eq 0>
+ <td><small>@foo.num@ items</small></td>
</if>
<else>
- <td><small>@items.num@ item</small></td>
+ <td><small>@foo.num@ item</small></td>
</else>
</if>
<else>
- <td><a href=@items.name@file?file_id=@items.file_id@><img border=0 src=@items.name@graphics/file.gif width=15 height=13> @items.name@</a></td>
+ <td><a href=@foo.url@file?file_id=@foo.file_id@><img border=0 src=@foo.url@graphics/file.gif width=15 height=13> @foo.name@</a></td>
<td><small>File</small></td>
- <td><a href=@items.name@/download/@items.name@?version_id=@items.file_live_rev@><small>\[download\]</small></a></td>
+ <td><a href=@foo.url@/download/@foo.name@?version_id=@foo.file_live_rev@><small>\[download\]</small></a></td>
</else>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl 16 Jan 2002 01:36:19 -0000 1.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl 16 Jan 2002 21:46:41 -0000 1.2
@@ -9,22 +9,26 @@
}
array set config $cf
-
set user_id [ad_conn user_id]
-
set list_of_folder_ids $config(folder_id)
+# set up the multirow datasource using the db_multirow proc and 1 id
set my_folder_id [lindex $list_of_folder_ids 0]
-#foreach my_folder_id $list_of_folder_ids {
-
- db_multirow -local items select_files_and_folders {} {
- set package_id [db_string select_package_id {}]
-
-# set items(url) \
-# [dotlrn_community::get_url_from_package_id -package_id $package_id]
-
+db_multirow -local foo select_files_and_folders {} {
+
+ # we can set array vars for this row
+ set foo(url) [dotlrn_community::get_url_from_package_id \
+ -package_id [db_string select_package_id {}]]
+}
+
+foreach my_folder_id [lrange $list_of_folder_ids 1 end] {
+
+ # use the append switch to add rows to the datasource
+ db_multirow -local -append foo select_files_and_folders {} {
+ set foo(url) [dotlrn_community::get_url_from_package_id \
+ -package_id [db_string select_package_id {}]]
}
-#}
+}
ad_return_template