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.3.2.1 -r1.3.2.2
--- openacs-4/packages/user-tracking/user-tracking.info	28 Jun 2005 09:27:29 -0000	1.3.2.1
+++ openacs-4/packages/user-tracking/user-tracking.info	25 Oct 2005 00:44:42 -0000	1.3.2.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
 <package key="user-tracking" url="http://openacs.org/repository/apm/packages/user-tracking" type="apm_application">
@@ -8,21 +8,21 @@
     <singleton-p>f</singleton-p>
     <auto-mount>user-tracking</auto-mount>
 
-    <version name="0.2b1" url="http://openacs.org/repository/download/apm/user-tracking-0.2b1.apm">
+    <version name="0.1d2" url="http://openacs.org/repository/download/apm/user-tracking-0.1d2.apm">
         <owner url="mailto:doa@tid.es">David Ortega</owner>
         <owner url="mailto:sergiog@tid.es">Sergio González</owner>
         <owner url="mailto: pabloa@tid.es">Pablo Arozarena</owner>
         <summary>Package for user tracking </summary>
-        <release-date>2005-06-27</release-date>
+        <release-date>2005-04-12</release-date>
         <vendor url="http://e-lane.org/">E-lane</vendor>
         <description format="text/html">The purpose behind this development is to ensure we track and retrieve knowledge about how end users are making use of the system. The main objective of this package will be to track user behaviour and activities, so that Professors and administrators can use this to understand how the system is used and make improvements in the learning process.</description>
 
-        <provides url="user-tracking" version="0.2b1"/>
+        <provides url="user-tracking" version="0.1d2"/>
 
         <callbacks>
             <callback type="after-install"  proc="user-tracking::apm_callbacks::package_install"/>
-       	    <callback type="after-upgrade"  proc="user-tracking::apm_callbacks::my_upgrade_callback"/> 
-	</callbacks>
+            <callback type="after-upgrade"  proc="user-tracking::apm_callbacks::my_upgrade_callback"/>
+        </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PerlPath"  default="/usr/bin/perl" description="Absolute path from computer root to perl executable"/>
         </parameters>
Index: openacs-4/packages/user-tracking/catalog/user-tracking.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/catalog/user-tracking.en_US.ISO-8859-1.xml,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/user-tracking/catalog/user-tracking.en_US.ISO-8859-1.xml	27 Apr 2005 15:54:21 -0000	1.5
+++ openacs-4/packages/user-tracking/catalog/user-tracking.en_US.ISO-8859-1.xml	25 Oct 2005 00:44:42 -0000	1.5.2.1
@@ -156,10 +156,7 @@
   <msg key="User_Name">User Name</msg>
   <msg key="User_Stats">Users Statistics</msg>
   <msg key="user_tracking_access_package">User Tracking access package</msg>
-  <msg key="admin_portlet">UserTracking Administration</msg>
   <msg key="User_Tracking_Home">User Tracking Home</msg>
-  <msg key="user_tracking_managment">UserTracking Managment</msg>
-  <msg key="user_tracking_portlet">User Tracking</msg>
   <msg key="Users">Users</msg>
   <msg key="users_visits">Visits by user</msg>
   <msg key="ut_Are_Admin">Have an Admin role: %NofAdmin%</msg>
Index: openacs-4/packages/user-tracking/catalog/user-tracking.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/catalog/user-tracking.es_ES.ISO-8859-1.xml,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/user-tracking/catalog/user-tracking.es_ES.ISO-8859-1.xml	27 Apr 2005 15:54:21 -0000	1.5
+++ openacs-4/packages/user-tracking/catalog/user-tracking.es_ES.ISO-8859-1.xml	25 Oct 2005 00:44:42 -0000	1.5.2.1
@@ -156,10 +156,7 @@
   <msg key="User_Name">Nombre de usuario</msg>
   <msg key="User_Stats">Estad�sticas de usuarios</msg>
   <msg key="user_tracking_access_package">Acceso al paquete de User Tracking</msg>
-  <msg key="admin_portlet">Administrando UserTracking</msg>
   <msg key="User_Tracking_Home">User Tracking</msg>
-  <msg key="user_tracking_managment">Manejor de UserTracking</msg>
-  <msg key="user_tracking_portlet">User Tracking</msg>
   <msg key="Users">Usuarios</msg>
   <msg key="users_visits">Visitas por usuario</msg>
   <msg key="ut_Are_Admin">Participan como Administradores: %NofAdmin%</msg>
Index: openacs-4/packages/user-tracking/tcl/user-tracking-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/tcl/user-tracking-procs.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/user-tracking/tcl/user-tracking-procs.tcl	28 Jun 2005 09:27:30 -0000	1.2.2.1
+++ openacs-4/packages/user-tracking/tcl/user-tracking-procs.tcl	25 Oct 2005 00:44:43 -0000	1.2.2.2
@@ -85,7 +85,8 @@
        		4 { set site_p 1}
        	}
         }
-	set binPerl [parameter::get -parameter "PerlPath"]
+	set binPerl [parameter::get -parameter "PerlPath" -default "/usr/bin/perl" ]
+	ns_log notice "LEIDO $binPerl"
                    	
         if {[exists_and_not_null all_users_p]} {
         	
@@ -94,7 +95,9 @@
         	db_foreach user "select user_id  from cc_users" {
          		ns_log notice "USER: $user_id"
 			set execAnalyzer [list "$binPerl" "[user-tracking::get_user_tracking_dir]/www/awstats/cgi-bin/awstats_dotlrn.pl" "-config=site" "-update" "-onlyusers=$user_id"]        	     		
+   			ns_log notice $execAnalyzer
    			catch {exec [lindex $execAnalyzer 0] [lindex $execAnalyzer 1] [lindex $execAnalyzer 2] [lindex $execAnalyzer 3] [lindex $execAnalyzer 4]} aux
+   			ns_log notice $aux
    		}
         }
         if {[exists_and_not_null all_communities_p]} {
Index: openacs-4/packages/user-tracking/www/loading.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/www/loading.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/user-tracking/www/loading.tcl	28 Jun 2005 09:27:30 -0000	1.1.2.2
+++ openacs-4/packages/user-tracking/www/loading.tcl	25 Oct 2005 00:44:43 -0000	1.1.2.3
@@ -21,19 +21,21 @@
 	set onlyuser [string trimleft $onlyuser " "]
 }
 
-if { [string length $month] == 1} {
-	set month "0${month}"
-}
 
-set logs [ns_config "ns/server/[ns_info server]/module/nslog" file] 
-set patron "(.*)([ns_info server]\.log$)"
+set logs [ns_config "ns/server/[ns_info server]/module/nslog" file] 
+set patron "(.*)([ns_info server]\.log$)"
 regexp $patron $logs all logdir part2 ]
 ns_log notice "LOGDIR=$logdir"
 
 set todayyear [template::util::date::get_property year [template::util::date::today]]
 set todaymonth [template::util::date::get_property month [template::util::date::today]]
 set todayday [template::util::date::get_property day [template::util::date::today]]
 
+if { [string length $month] == 2} {
+	if { [string index $month 0] == 0} {
+		set month [string index $month 1]
+	}
+}
    if {$month < 12} {
    	set nextmonth [expr $month +1]
    	set nextyear $year
@@ -44,6 +46,9 @@
    if { [string length $nextmonth] == 1} {
 	set nextmonth "0${nextmonth}"
    }   
+   if { [string length $month] == 1} {
+	set month "0${month}"
+   }
 
 if {[exists_and_not_null LastTime]} {
       set campos [split $LastTime "/-"]
@@ -62,10 +67,10 @@
               append expresion ",$x"
            }
            append expresion "\]"
-           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logdir}elane.log.$year-$month-${expresion}* ${logdir}elane.log |"
+           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logs}.$year-$month-${expresion}* ${logs} |"
            ns_log notice $logresolvemerge
         } else {
-           set logresolvemerge "-LogFile=${logdir}elane.log"
+           set logresolvemerge "-LogFile=${logs}"
         }
       } else {
       	if {[expr $lastday + 1] <= [template::util::date::get_property days_in_month "$lastyear$lastmonth"] } {
@@ -75,29 +80,32 @@
            }
            append expresion "\]"
            ns_log notice $expresion  
-           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logdir}elane.log.$year-$month-${expresion}* ${logdir}elane.log.$nextyear-$nextmonth-01* |"
+           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logs}.$year-$month-${expresion}* ${logs}.$nextyear-$nextmonth-01* |"
            ns_log notice $logresolvemerge
    	}  	
       }
 } else {
    set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl "
-   append logresolvemerge " ${logdir}elane.log.$year-$month-0\[2-9\]* "
-   append logresolvemerge " ${logdir}elane.log.$year-$month-1\[0-9\]* "
-   append logresolvemerge " ${logdir}elane.log.$year-$month-2\[0-9\]* "
-   append logresolvemerge " ${logdir}elane.log.$year-$month-3\[0-1\]* "
-   append logresolvemerge " ${logdir}elane.log.$nextyear-$nextmonth-01* "
+   append logresolvemerge " ${logs}.$year-$month-0\[2-9\]* "
+   append logresolvemerge " ${logs}.$year-$month-1\[0-9\]* "
+   append logresolvemerge " ${logs}.$year-$month-2\[0-9\]* "
+   append logresolvemerge " ${logs}.$year-$month-3\[0-1\]* "
+   append logresolvemerge " ${logs}.$nextyear-$nextmonth-01* "
+   if { [string length $todaymonth] == 1} {
+	set todaymonth "0${todaymonth}"
+   }
    if {$month == $todaymonth} {
-  	append logresolvemerge  " ${logdir}elane.log |"
+  	append logresolvemerge  " ${logs} |"
    } else {
    	   append logresolvemerge " |"
    }
 }
 
-ad_progress_bar_begin \
-    -title "" \
-    -message_1 "#user-tracking.updating_datafile#" \
-    -message_2 "#user-tracking.we_will_continue#"
-
+ad_progress_bar_begin \
+    -title "" \
+    -message_1 "#user-tracking.updating_datafile#" \
+    -message_2 "#user-tracking.we_will_continue#"
+
 ns_write "<h2>$message</h2><blockquote>"
 
 set binPerl [parameter::get -parameter "PerlPath"]
Index: openacs-4/packages/user-tracking/www/loading2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-tracking/www/loading2.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/user-tracking/www/loading2.tcl	28 Jun 2005 09:27:30 -0000	1.1.2.2
+++ openacs-4/packages/user-tracking/www/loading2.tcl	25 Oct 2005 00:44:43 -0000	1.1.2.3
@@ -14,8 +14,10 @@
 aux:onevalue
 }
 
-if { [string length $month] == 1} {
-	set month "0${month}"
+if { [string length $month] == 2} {
+	if { [string index $month 0] == 0} {
+		set month [string index $month 1]
+	}
 }
 
    if {$month < 12} {
@@ -28,9 +30,11 @@
    if { [string length $nextmonth] == 1} {
 	set nextmonth "0${nextmonth}"
    }   
-
-set logs [ns_config "ns/server/[ns_info server]/module/nslog" file] 
-set patron "(.*)([ns_info server]\.log$)"
+   if { [string length $month] == 1} {
+	set month "0${month}"
+   }
+set logs [ns_config "ns/server/[ns_info server]/module/nslog" file] 
+set patron "(.*)([ns_info server]\.log$)"
 regexp $patron $logs all logdir part2 ]
 
 set message "[_ user-tracking.updating_statistics]"
@@ -58,10 +62,10 @@
               append expresion ",$x"
            }
            append expresion "\]"
-           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logdir}elane.log.$year-$month-${expresion}* ${logdir}elane.log |"
+           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logs}.$year-$month-${expresion}* ${logs} |"
            ns_log notice $logresolvemerge
         } else {
-           set logresolvemerge "-LogFile=${logdir}elane.log"
+           set logresolvemerge "-LogFile=${logs}"
         }
       } else {
       	if {[expr $lastday + 1] <= [template::util::date::get_property days_in_month "$lastyear$lastmonth"] } {
@@ -71,17 +75,17 @@
            }
            append expresion "\]"
            ns_log notice $expresion    
-           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logdir}elane.log.$year-$month-${expresion}* ${logdir}elane.log.$nextyear-$nextmonth-01* |"
+           set logresolvemerge "-LogFile=[user-tracking::get_user_tracking_dir]/tools/logresolvemerge.pl ${logs}.$year-$month-${expresion}* ${logs}.$nextyear-$nextmonth-01* |"
            ns_log notice $logresolvemerge
    	}  	
       }
 }
 
-ad_progress_bar_begin \
-    -title "" \
-    -message_1 "#user-tracking.updating_datafile#" \
-    -message_2 "#user-tracking.we_will_continue#"
-
+ad_progress_bar_begin \
+    -title "" \
+    -message_1 "#user-tracking.updating_datafile#" \
+    -message_2 "#user-tracking.we_will_continue#"
+
 ns_write "<h2>$message</h2><blockquote>"
 
 set aux ""