Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.38.2.17 -r1.38.2.18
--- openacs-4/packages/file-storage/file-storage.info 30 May 2006 10:37:45 -0000 1.38.2.17
+++ openacs-4/packages/file-storage/file-storage.info 6 Jul 2006 23:35:33 -0000 1.38.2.18
@@ -7,15 +7,15 @@
f
f
-
+
OpenACS
Collaborative document storage
2005-09-30
OpenACS
Provides a versioned document store with storage in the filesystem or database (depending on configuration). Documents and folders can be permissioned and folders downloaded.
0
-
+
@@ -24,12 +24,12 @@
-
-
-
-
+
+
+
+
@@ -39,12 +39,12 @@
-
+
+
-
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 19 Mar 2006 21:10:52 -0000 1.10.2.2
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 6 Jul 2006 23:35:34 -0000 1.10.2.3
@@ -64,13 +64,14 @@
case
when cr_items.content_type = 'content_folder' then 'folder'
when cr_items.content_type = 'content_extlink' then 'url'
+ when cr_items.content_type = 'content_symlink' then 'symlink'
else cr_revisions.mime_type
end as type,
case
when cr_items.content_type = 'content_folder'
then (select count(*)
from cr_items ci
- where (ci.content_type = 'content_extlink' or ci.content_type = 'file_storage_object')
+ where (ci.content_type = 'content_extlink' or ci.content_type = 'file_storage_object' or ci.content_type = 'content_symlink')
connect by prior ci.item_id = ci.parent_id
start with ci.item_id = cr_folders.folder_id)
else cr_revisions.content_length
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.2.3d1-5.2.3d2.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql 25 Aug 2005 18:33:38 -0000 1.10.2.1
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql 6 Jul 2006 23:35:34 -0000 1.10.2.2
@@ -63,13 +63,14 @@
case
when cr_items.content_type = 'content_folder' then 'folder'
when cr_items.content_type = 'content_extlink' then 'url'
+ when cr_items.content_type = 'content_symlink' then 'symlink'
else cr_revisions.mime_type
end as type,
case
when cr_items.content_type = 'content_folder'
then (select count(*)
from cr_items ci2
- where ci2.content_type in ('content_extlink','file_storage_object')
+ where ci2.content_type in ('content_extlink','file_storage_object','content_symlink')
and ci2.tree_sortkey between cr_items.tree_sortkey and tree_right(cr_items.tree_sortkey))
else cr_revisions.content_length
end as content_size,
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.2.3d1-5.2.3d2.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.31.2.19 -r1.31.2.20
--- openacs-4/packages/file-storage/www/folder-chunk.tcl 17 May 2006 21:07:03 -0000 1.31.2.19
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl 6 Jul 2006 23:35:34 -0000 1.31.2.20
@@ -237,6 +237,35 @@
set download_link {}
}
+ symlink {
+ set properties_link [_ file-storage.properties]
+ set object_id [content::symlink::resolve -item_id $object_id]
+ db_1row file_info {select * from fs_objects where object_id = :object_id}
+ if {[string equal $type "folder"]} {
+ set content_size_pretty [lc_numeric $content_size]
+ append content_size_pretty " [_ file-storage.items]"
+ set pretty_type "#file-storage.Folder#"
+ } else {
+ if {$content_size < 1024} {
+ set content_size_pretty "[lc_numeric $content_size] [_ file-storage.bytes]"
+ } else {
+ set content_size_pretty "[lc_numeric [expr $content_size / 1024 ]] [_ file-storage.kb]"
+ }
+
+ }
+ set properties_url "${fs_url}file?[export_vars {{file_id $object_id}}]"
+ set new_version_link [_ acs-kernel.common_New]
+ set new_version_url "${fs_url}file-add?[export_vars {{file_id $object_id}}]"
+ set icon "/resources/file-storage/file.gif"
+ set file_url "${fs_url}view/${file_url}"
+ set download_link [_ file-storage.Download]
+ if {$like_filesystem_p} {
+ set download_url "${fs_url}download/$title?[export_vars {{file_id $object_id}}]"
+ set file_url $download_url
+ } else {
+ set download_url "${fs_url}download/$name?[export_vars {{file_id $object_id}}]"
+ }
+ }
default {
set properties_link [_ file-storage.properties]
set properties_url "${fs_url}file?[export_vars {{file_id $object_id}}]"