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.18 -r1.19
--- openacs-4/packages/file-storage/file-storage.info	30 Nov 2002 17:34:00 -0000	1.18
+++ openacs-4/packages/file-storage/file-storage.info	9 Dec 2002 22:48:44 -0000	1.19
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="4.6" url="http://www.openacs.org/repository/download/apm/file-storage-4.6.apm">
+    <version name="4.6.1" url="http://www.openacs.org/repository/download/apm/file-storage-4.6.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -18,7 +18,7 @@
         <vendor url="http://www.openacs.org/">OpenACS</vendor>
         <description format="text/plain">Now allows storage of files on the filesystem or database.</description>
 
-        <provides url="file-storage" version="4.6"/>
+        <provides url="file-storage" version="4.6.1"/>
         <requires url="acs-content-repository" version="4.0.1"/>
         <requires url="acs-kernel" version="4.0"/>
 
@@ -155,8 +155,8 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveExtension"  default="tgz" description="The extension that the programmer should add to the output file. This depends on the value of ArchiveCommand"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ArchiveCommand"  default="tar -czf {out_file} {in_file}" description="Program (and program options) to use for archiving file storage objects. Use the special tags {in_file} and {out_file} (including the curly braces) to denote the locations of the input and output files on the command line."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowAdministerPermissionsLinkP"  default="1" description="Whether or not to show a link to administer permissions on the file storage object."/>
+            <parameter datatype="number"  min_n_values="1" max_n_values="1"  name="GeneralCommentsP"  default="0" description="Allow comments to be attached to a file."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaximumFileSize"  default="2000000" description="The maximum size, in bytes, of files that users are allowed to upload"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/file-storage/www/file.adp	18 Nov 2002 18:01:05 -0000	1.10
+++ openacs-4/packages/file-storage/www/file.adp	9 Dec 2002 22:48:54 -0000	1.11
@@ -27,8 +27,18 @@
   <if @delete_p@ true>
     | <a href="file-delete?file_id=@file_id@">#file-storage.lt_Delete_this_file_incl#</a>
   </if>
+ <if @gc_comments@ not nil>
+ <li>Comments on this file:
+ <ul>
+ @gc_comments@
+ </ul>
+ </if>
+ <if @gc_link@ not nil>
+   <li>@gc_link@
+ </if>
 </ul>
 
+
 <table border=1 cellspacing=2 cellpadding=2>
   <tr>
     <td colspan=7>
@@ -55,7 +65,7 @@
     <td align=right>@version.content_size_pretty@</td>
     <td>@version.type@</td>
     <td>@version.last_modified@</td>
-    <td>@version.description@</td>
+    <td>@version.description@&nbsp;</td>
     <td>
       &nbsp;<if @version.delete_p@ true>
       <a href="version-delete?version_id=@version.version_id@">#file-storage.delete#</a> 
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/file-storage/www/file.tcl	18 Nov 2002 18:01:05 -0000	1.10
+++ openacs-4/packages/file-storage/www/file.tcl	9 Dec 2002 22:48:54 -0000	1.11
@@ -62,5 +62,11 @@
     set content_size_pretty [lc_numeric $content_size]
 }
 
-ad_return_template
-
+if { [apm_package_installed_p "general-comments"] && [ad_parameter "GeneralCommentsP" -default 0] } {
+    set return_url "[ad_conn url]?file_id=$file_id"
+    set gc_link [general_comments_create_link $file_id $return_url]
+    set gc_comments [general_comments_get_comments $file_id $return_url]
+} else {
+    set gc_link ""
+    set gc_comments ""
+}