Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	29 Aug 2007 18:28:15 -0000	1.69
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	30 Aug 2007 10:21:57 -0000	1.70
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.4.0d1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.4.0d1.apm">
+    <version name="5.4.0d2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.4.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2007-04-22</release-date>
@@ -20,15 +20,16 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.4.0d1"/>
+        <provides url="acs-content-repository" version="5.4.0d2"/>
         <requires url="acs-kernel" version="5.3.1"/>
         <requires url="acs-service-contract" version="5.3.1"/>
         <requires url="search" version="5.3.1"/>
 
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CRFileLocationRoot"  default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to [acs_root_dir]." section_name="files"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CRFileLocationRoot"  default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to [acs_root_dir] unless FileLocationRelativeP is set to 1" section_name="files"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FileLocationRelativeP"  default="1" description="Defaults to 1 which means the FileLocation parameter is relative to the web servers root folder. If set to 0, the FileLocation parameter is an absolute path and so can contain a drive letter for example. Important note: if you change this parameter to 0, remember the system will attempt to retrieve existing files from the new location. You will also need to bounce the server after changing this or the FileLocation value." section_name="files"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageMagickConvertBinary"  default="/usr/bin/convert" description="Binary to use with the image:: procs in packages/acs-content-repository/tcl/image-procs.tcl" section_name="files"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TemplateRoot"  default="templates" description="The directory to which templates are published and from where they are retrieved when a page is served. If the value does not start with a '/', it is taken to be relative to [acs_root_dir]. Packages that use the content-repository can override this setting by defining their own TemplateRoot parameter." section_name="templates"/>
         </parameters>
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	29 Aug 2007 18:28:16 -0000	1.4
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	30 Aug 2007 10:21:57 -0000	1.5
@@ -35,18 +35,21 @@
     
     if {$package_key eq "acs-content-repository" && $parameter eq "CRFileLocationRoot" && $value ne ""} {
         nsv_unset CR_LOCATIONS CR_FILES
-        # Take the directory from the FileLocation parameter that 
-        # must be specified in acs-content-repository package.
-        set relativepath_p [parameter::get -package_id $package_id -parameter FileLocationRelative]
-        set file_location ""
-        if {$relativepath_p} {
-		    append file_location "[acs_root_dir]/"
-	    }
-	    append file_location "[parameter::get -package_id $package_id -parameter FileLocation]"
 	
-        nsv_set CR_LOCATIONS CR_FILES "$file_location"
-    
-	} else {
-	    ns_log Debug "subsite::parameter_changed -impl acs-content-repository don't care about $parameter"
+	# Take the directory from the FileLocation parameter that 
+	# must be specified in acs-content-repository package.
+	set relativepath_p [parameter::get_from_package_key -package_key "acs-content-repository" -parameter FileLocationRelativeP]
+	set file_location ""
+	
+	if {$relativepath_p} {
+	    # The file location is relative to acs_root_dir
+	    append file_location "[acs_root_dir]/"
+	}
+	append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
+	
+	nsv_set CR_LOCATIONS CR_FILES "$file_location"
+	
+    } else {
+	ns_log Debug "subsite::parameter_changed -impl acs-content-repository don't care about $parameter"
     }
 }
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	29 Aug 2007 18:28:16 -0000	1.12
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	30 Aug 2007 10:21:57 -0000	1.13
@@ -25,20 +25,21 @@
 }
 
 ad_schedule_proc [expr {15 * 60}] acs_cr_scheduled_release_exec
-
-set file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
 nsv_set CR_LOCATIONS . ""
-if {![nsv_exists CR_LOCATIONS CR_FILES]} {
 
+if {![nsv_exists CR_LOCATIONS CR_FILES]} {
+    
     # Take the directory from the FileLocation parameter that 
     # must be specified in acs-content-repository package.
-    set relativepath_p [parameter::get_from_package_key -package_key "acs-content-repository" -parameter FileLocationRelative]
-	set file_location ""
-	if {$relativepath_p} {
-		append file_location "[acs_root_dir]/"
-	}
-	append file_location "[parameter::get_from_package_key -package_key "acs-content-repository" -parameter FileLocation]"
-	
+    set relativepath_p [parameter::get_from_package_key -package_key "acs-content-repository" -parameter FileLocationRelativeP]
+    set file_location ""
+
+    if {$relativepath_p} {
+	# The file location is relative to acs_root_dir
+	append file_location "[acs_root_dir]/"
+    }
+    append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
+    
     nsv_set CR_LOCATIONS CR_FILES "$file_location"
 
 }