Index: openacs-4/packages/dotlrn-user-tracking/dotlrn-user-tracking.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-user-tracking/dotlrn-user-tracking.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-user-tracking/dotlrn-user-tracking.info 14 Apr 2005 15:36:39 -0000 1.2
+++ openacs-4/packages/dotlrn-user-tracking/dotlrn-user-tracking.info 15 Apr 2005 08:12:38 -0000 1.3
@@ -15,7 +15,7 @@
-
+
@@ -24,4 +24,4 @@
-
+
\ No newline at end of file
Index: openacs-4/packages/user-tracking/user-tracking.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/user-tracking.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/user-tracking/user-tracking.info 14 Apr 2005 15:44:27 -0000 1.2
+++ openacs-4/packages/user-tracking/user-tracking.info 15 Apr 2005 08:12:01 -0000 1.3
@@ -1,4 +1,4 @@
-
+
@@ -21,7 +21,8 @@
-
+
+
Index: openacs-4/packages/user-tracking/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/tcl/apm-callback-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/user-tracking/tcl/apm-callback-procs.tcl 14 Apr 2005 15:44:27 -0000 1.3
+++ openacs-4/packages/user-tracking/tcl/apm-callback-procs.tcl 15 Apr 2005 08:12:20 -0000 1.4
@@ -18,7 +18,6 @@
} {
-
#Reading logdir from config.tcl
set logdir [ns_config "ns/parameters" serverlog]
set patron "(.*)(\/(.)*\.log$)"
@@ -34,52 +33,41 @@
#Look for config files
set ut_dir [acs_package_root_dir "user-tracking"]
append config_dir $ut_dir "/config"
- set execls [list "ls" $config_dir]
- set files [exec [lindex $execls 0] [lindex $execls 1]]
-
- #Writes parameters at the end of the awstats config file
-
- for {set x 0} {$x<[llength $files]} {incr x} {
- set file_name "${config_dir}/[lindex $files $x]"
-
- if { [file exists $file_name] == 1} {
-
- set config_file [open $file_name a]
- set logdir [ns_config "ns/server/[ns_info server]/module/nslog" file]
- set patron "(.*)(\.log$)"
- regexp $patron $logdir all part1 part2 ]
+ set file_name "${config_dir}/awstats_dotlrn.site.conf"
+ if { [file exists $file_name] == 1} {
+ set config_file [open $file_name a]
+ set logdir [ns_config "ns/server/[ns_info server]/module/nslog" file]
+ set patron "(.*)(\.log$)"
+ regexp $patron $logdir all part1 part2 ]
- puts $config_file "LogFile=\"${ut_dir}/tools/logresolvemerge.pl ${part1}* | \""
- puts $config_file "SiteDomain=\"${server}\""
- puts $config_file "HostAliases=\"${server} www.${server} ${system_name} www.${system_name} ${ip} 127.0.0.1 localhost\""
- puts $config_file "DirData=\"${dir}awstat\""
- #puts $config_file "Lang=\"es\""
- #puts $config_file "ShowFlagLinks=\"en fr de\""
+ puts $config_file "LogFile=\"${ut_dir}/tools/logresolvemerge.pl ${part1}* | \""
+ puts $config_file "SiteDomain=\"${server}\""
+ puts $config_file "HostAliases=\"${server} www.${server} ${system_name} www.${system_name} ${ip} 127.0.0.1 localhost\""
+ puts $config_file "DirData=\"${dir}awstat\""
- close $config_file
- }
+ close $config_file
}
+
+}
+ad_proc -private user-tracking::apm_callbacks::my_upgrade_callback {
+ {-from_version_name:required}
+ {-to_version_name:required}
+ } {
- # Writing userinfo.txt file
- #exec "/bin/mkdir" ${dir}awstat
- #set touch [exec "/bin/touch" ${dir}awstat/userinfo.txt]
- #set filename "${dir}awstat/userinfo.txt"
- #ns_log notice "Escribiendo en $filename"
- #set config_file [open $filename w]
- #db_foreach get_users "select person_id, first_names, last_name from persons" {
- # puts $config_file "$person_id \t $first_names $last_name"
- #}
- #close $config_file
-
- #Needed in first release of user-tracking due to the use of cgi-bin
- #set touch [exec "/bin/touch" ${config_dir}/AllowedUrls.conf]
- #set filename "${config_dir}/AllowedUrls.conf"
- #ns_log notice "Escribiendo en $filename"
- #set config_file [open $filename w]
- #puts $config_file $ip
+ Write config file after an upgrade
- #close $config_file
+ @author David Ortega (doa@tid.es)
-
-}
+} {
+
+ apm_upgrade_logic -from_version_name $from_version_name \
+ -to_version_name $to_version_name \
+ -spec {
+
+ 0.1d 0.1d2 {
+ user-tracking::apm_callbacks::package_install
+ }
+
+ }
+ }
\ No newline at end of file
Index: openacs-4/packages/user-tracking-portlet/user-tracking-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking-portlet/user-tracking-portlet.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/user-tracking-portlet/user-tracking-portlet.info 14 Apr 2005 15:38:32 -0000 1.2
+++ openacs-4/packages/user-tracking-portlet/user-tracking-portlet.info 15 Apr 2005 08:13:06 -0000 1.3
@@ -15,7 +15,7 @@
E-lane
-
+