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"]