Index: openacs-4/packages/logger/logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/logger/logger.info	30 Apr 2003 12:20:33 -0000	1.4
+++ openacs-4/packages/logger/logger.info	8 May 2003 13:54:04 -0000	1.5
@@ -7,20 +7,18 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.2d" url="http://openacs.org/repository/download/apm/logger-0.2d.apm">
-        <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
+    <version name="1.0" url="http://openacs.org/repository/download/apm/logger-1.0.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
+        <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
         <summary>Supports time and expenses reporting. Full specification is here: http://www.collaboraid.biz/developer/logger-spec</summary>
-        <release-date>2003-04-16</release-date>
+        <release-date>2003-05-08</release-date>
         <vendor url="http://collaboraid.biz">Collaboraid</vendor>
 
-        <provides url="logger" version="0.2d"/>
+        <provides url="logger" version="1.0"/>
 
-        <files>
-            <!-- No files -->
-        </files>
         <callbacks>
             <callback type="after-install"  proc="logger::apm::after_install"/>
+            <callback type="before-uninstall"  proc="logger::apm::before_uninstall"/>
             <callback type="before-uninstantiate"  proc="logger::apm::before_uninstantiate"/>
         </callbacks>
         <parameters>
Index: openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql	7 May 2003 16:43:32 -0000	1.3
+++ openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql	8 May 2003 13:54:26 -0000	1.4
@@ -31,13 +31,15 @@
 
     v_project_id          integer;
 begin
-        v_project_id := acs_object__new(
-            p_project_id,
-            ''logger_project'',
-            p_package_id,
-            p_creation_ip,
-            p_creation_user
-        );
+       v_project_id := acs_object__new(
+           p_project_id,             -- object_id
+           ''logger_project'',           -- object_type
+           current_timestamp,      -- creation_date
+           p_creation_user,        -- creation_user
+           p_creation_ip,          -- creation_ip
+           p_package_id,           -- context_id
+           ''t''                   -- security_inherit_p
+       ); 
        
        insert into logger_projects (project_id, name, description, project_lead)
            values (v_project_id, p_name, p_description, p_project_lead);
@@ -85,6 +87,8 @@
         -- acs_object__delete should delete permissions for us but this change is not on cvs head yet
         delete from acs_permissions where object_id = p_project_id;
         perform acs_object__delete(p_project_id);
+
+        return 0;
 end; ' language 'plpgsql';
 
 create or replace function logger_project__name (integer) 
@@ -113,27 +117,29 @@
                                                 varchar,
                                                 varchar,
                                                 integer,
-                                                integer,
+                                                varchar,
                                                 integer)
 returns integer as '
 declare
-        p_variable_id      integer alias for $1;
-        p_name             varchar alias for $2;
-        p_unit             varchar alias for $3;
-        p_type             varchar alias for $4;
-        p_creation_user    integer alias for $5;
-        p_creation_ip      integer alias for $6;
-        p_package_id       integer alias for $7;
+        p_variable_id      alias for $1;
+        p_name             alias for $2;
+        p_unit             alias for $3;
+        p_type             alias for $4;
+        p_creation_user    alias for $5;
+        p_creation_ip      alias for $6;
+        p_package_id       alias for $7;
 
         v_variable_id      integer;
 begin
-        v_variable_id := acs_object__new(
-            p_variable_id,
-            ''logger_variable'',
-            p_package_id,
-            p_creation_ip,
-            p_creation_user
-        );
+       v_variable_id := acs_object__new(
+           p_variable_id,             -- object_id
+           ''logger_variable'',           -- object_type
+           current_timestamp,      -- creation_date
+           p_creation_user,        -- creation_user
+           p_creation_ip,          -- creation_ip
+           p_package_id,           -- context_id
+           ''t''                   -- security_inherit_p
+       ); 
 
        insert into logger_variables (variable_id, name, unit, type, package_id)
            values (v_variable_id, p_name, p_unit, p_type, p_package_id);
@@ -150,6 +156,8 @@
         -- acs_object__delete should delete permissions for us but this change is not on cvs head yet
         delete from acs_permissions where object_id = p_variable_id;
         perform acs_object__delete(p_variable_id);
+
+        return 0;
 end; ' language 'plpgsql';
 
 create or replace function logger_variable__name (integer) 
@@ -159,7 +167,7 @@
 
       v_name          varchar;  
 begin
-      selec name into v_name
+      select description into v_name
       from logger_entries
       where variable_id = p_variable_id;
 
@@ -193,13 +201,16 @@
 
         v_entry_id            integer;
 begin
+
     v_entry_id := acs_object__new(
-        p_entry_id,
-        ''logger_entry'',
-        p_project_id,
-        p_creation_ip,
-        p_creation_user
-    );
+        p_entry_id,             -- object_id
+        ''logger_entry'',       -- object_type
+        current_timestamp,      -- creation_date
+        p_creation_user,        -- creation_user
+        p_creation_ip,          -- creation_ip
+        p_project_id,           -- context_id
+        ''t''                   -- security_inherit_p
+    ); 
     
     insert into logger_entries (entry_id, 
                                 project_id, 
@@ -226,6 +237,8 @@
         -- acs_object__delete should delete permissions for us but this change is not on cvs head yet
         delete from acs_permissions where object_id = p_entry_id;
         perform acs_object__delete(p_entry_id);
+
+        return 0;
 end; ' language 'plpgsql';
 
 create or replace function logger_entry__name (integer) 
Index: openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql	7 May 2003 16:43:32 -0000	1.3
+++ openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql	8 May 2003 13:54:26 -0000	1.4
@@ -24,7 +24,7 @@
                                    varchar,
                                    varchar,
                                    integer,
-                                   integer,
+                                   varchar,
                                    integer);
 drop function logger_variable__del (integer);
 drop function logger_variable__name (integer);
Index: openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql	7 May 2003 16:43:32 -0000	1.3
+++ openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql	8 May 2003 13:54:26 -0000	1.4
@@ -14,6 +14,7 @@
   name                  varchar(1000),
   description           varchar(4000),
   active_p              boolean
+                        default true
                         constraint logger_projects_ap_nn
                         not null,
   project_lead          integer
Index: openacs-4/packages/logger/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/apm-callback-procs.tcl	25 Apr 2003 09:47:11 -0000	1.2
+++ openacs-4/packages/logger/tcl/apm-callback-procs.tcl	8 May 2003 13:54:59 -0000	1.3
@@ -19,6 +19,21 @@
     logger::variable::new -name "Expense" -unit "Euro" -pre_installed_p 1
 }
 
+ad_proc -public logger::apm::before_uninstall {} {
+    This proc needs to tear down whatever the logger::apm::after_install proc
+    sets up.
+
+    @author Peter Marklund
+} {
+    # Let's delete all variables as this is guaranteed to cover the pre-installed ones
+    db_foreach all_variables {
+        select variable_id
+        from logger_variables
+    } {
+        logger::variable::delete -variable_id $variable_id
+    }
+}
+
 ad_proc -public logger::apm::before_uninstantiate {
     {-package_id:required}
 } {
Index: openacs-4/packages/logger/tcl/entry-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/entry-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/tcl/entry-procs-postgresql.xql	8 May 2003 13:54:59 -0000	1.1
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+  <fullquery name="logger::entry::new.insert_entry">
+    <querytext>
+        select logger_entry__new (
+                  :entry_id,
+                  :project_id,
+                  :variable_id,
+                  :value,
+                  :time_stamp,
+                  :description,
+                  :creation_user,
+                  :creation_ip
+              );
+    </querytext>
+  </fullquery>
+
+  <fullquery name="logger::entry::delete.delete_entry">
+    <querytext>
+        select logger_entry__del(:entry_id);
+    </querytext>
+  </fullquery>
+ 
+</queryset>
Index: openacs-4/packages/logger/tcl/package-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/package-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/tcl/package-procs-postgresql.xql	8 May 2003 13:54:59 -0000	1.1
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+  <fullquery name="logger::package::variables_multirow.select_variables">
+    <querytext>
+      select lv.variable_id,
+             lv.name,
+             lv.unit,
+             lv.type
+      from logger_variables lv
+      where (exists (select 1
+                    from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                    where lv.variable_id = lpvm.variable_id
+                      and lpvm.project_id = lppm.project_id
+                      and lppm.package_id = :package_id
+                   )
+         or lv.package_id = :package_id
+         or lv.package_id is null)
+      and acs_permission__permission_p(lv.variable_id, :user_id, 'read') = 't'
+         $extra_where_clause
+    </querytext>
+  </fullquery>
+ 
+</queryset>
Index: openacs-4/packages/logger/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/project-procs-postgresql.xql	7 May 2003 16:43:36 -0000	1.2
+++ openacs-4/packages/logger/tcl/project-procs-postgresql.xql	8 May 2003 13:54:59 -0000	1.3
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 
 <queryset>
-  <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
 
-  <fullquery name="logger::project::new.insert_project">
+  <fullquery name="logger::project::insert.insert_project">
     <querytext>
-      begin
         select  logger_project__new (
                 :project_id,
                 :name,
@@ -15,15 +14,12 @@
                 :creation_ip,
                 :package_id               
               );
-      end;
     </querytext>
   </fullquery>
 
   <fullquery name="logger::project::delete.delete_project">
     <querytext>
-        begin
           select logger_project__del(:project_id);
-        end;
     </querytext>
   </fullquery>
  
Index: openacs-4/packages/logger/tcl/ui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/ui-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/tcl/ui-procs.tcl	6 May 2003 17:36:31 -0000	1.5
+++ openacs-4/packages/logger/tcl/ui-procs.tcl	8 May 2003 13:54:59 -0000	1.6
@@ -89,14 +89,6 @@
 
     set variable_options [list]
     db_foreach variable_options {
-        select lv.variable_id,
-               lv.name
-        from logger_variables lv
-        where exists (select 1
-                      from logger_project_var_map lpvm
-                      where lpvm.project_id = :project_id
-                        and lpvm.variable_id = lv.variable_id
-                      )
     } {
         lappend variable_options [list $name $variable_id] 
     }
Index: openacs-4/packages/logger/tcl/ui-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/ui-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/tcl/ui-procs.xql	8 May 2003 13:54:59 -0000	1.1
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="logger::ui::variable_options.variable_options">
+    <querytext>
+        select lv.variable_id,
+               lv.name
+        from logger_variables lv
+        where exists (select 1
+                      from logger_project_var_map lpvm
+                      where lpvm.project_id = :project_id
+                        and lpvm.variable_id = lv.variable_id
+                      )
+    </querytext>
+  </fullquery>
+
+
+</queryset>
Index: openacs-4/packages/logger/tcl/variable-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/variable-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/tcl/variable-procs-postgresql.xql	7 May 2003 16:43:36 -0000	1.1
+++ openacs-4/packages/logger/tcl/variable-procs-postgresql.xql	8 May 2003 13:54:59 -0000	1.2
@@ -5,7 +5,6 @@
 
   <fullquery name="logger::variable::new.insert_variable">
     <querytext>
-      begin
         select logger_variable__new (
                 :variable_id,
                 :name,
@@ -15,15 +14,12 @@
                 :creation_ip,
                 :package_id               
               );
-      end;
     </querytext>
   </fullquery>
 
   <fullquery name="logger::variable::delete.delete_variable">
     <querytext>
-        begin
           select logger_variable__del(:variable_id);
-        end;
     </querytext>
   </fullquery>
  
Index: openacs-4/packages/logger/tcl/variable-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/variable-procs.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/variable-procs.xql	22 Apr 2003 09:25:40 -0000	1.2
+++ openacs-4/packages/logger/tcl/variable-procs.xql	8 May 2003 13:54:59 -0000	1.3
@@ -2,13 +2,6 @@
 
 <queryset>
 
-  <fullquery name="logger::variable::new.insert_variable">
-    <querytext>
-      insert into logger_variables (variable_id, name, unit, type, package_id)
-           values (:variable_id, :name, :unit, :type, :package_id)
-    </querytext>
-  </fullquery>
-
   <fullquery name="logger::variable::edit.update_variable">
     <querytext>
       update logger_variables
@@ -19,13 +12,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="logger::variable::delete.delete_variable">
-    <querytext>
-        delete from logger_variables
-        where variable_id = :variable_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="logger::variable::get.select_variable">
     <querytext>
         select variable_id,
Index: openacs-4/packages/logger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/logger/www/index.tcl	7 May 2003 16:43:38 -0000	1.8
+++ openacs-4/packages/logger/www/index.tcl	8 May 2003 13:55:50 -0000	1.9
@@ -55,19 +55,7 @@
     } else {
         set project_clause ""
     }
-    set selected_variable_id [db_string last_logged_variable_id "
-        select variable_id
-        from logger_entries le,
-             acs_objects ao
-        where ao.creation_date = (select max(ao.creation_date)
-                               from logger_entries le,
-                                    acs_objects ao
-                               where ao.object_id = le.entry_id
-                               [ad_decode $project_clause "" "" "and $project_clause"]
-                              )
-          and ao.object_id = le.entry_id
-        [ad_decode $project_clause "" "" "and $project_clause"]
-    " -default ""]
+    set selected_variable_id [db_string last_logged_variable_id {} -default ""]
 
     if { [empty_string_p $selected_variable_id] } {
         # The user has not logger hours yet
@@ -112,7 +100,7 @@
 
 ###########
 #
-# Date Filter
+# Custom date filter form
 #
 ###########
 
@@ -167,39 +155,37 @@
     set all_projects_url {}
 }
 
-set no_project_p 1
+set projects_count 0
+set single_project_id 0
 
-db_multirow -extend { filter_name url entry_add_url selected_p clear_url } filters select_projects {
-    select lp.project_id as unique_id,
-           lp.name
-    from logger_projects lp,
-         logger_project_pkg_map lppm
-    where lp.project_id = lppm.project_id
-      and lppm.package_id = :package_id
-    order by lp.name
-} {
+db_multirow -extend { filter_name url entry_add_url selected_p clear_url start_date end_date } filters select_projects {} {
     set filter_name "Projects"
 
     set url ".?[export_vars -override { { selected_project_id $unique_id } } $filter_var_list]"
     set entry_add_url "log?[export_vars { { project_id $unique_id } {variable_id $selected_variable_id}}]"
     set selected_p [string equal $selected_project_id $unique_id]
-
-    set project_name_max_length 30
-    if { [string length $name] > $project_name_max_length } {
-        set name "[string range $name 0 [expr $project_name_max_length - 4]]..."
-    }
-
+    set name [string_truncate -len 25 $name]
     set clear_url $all_projects_url
-
-    set no_project_p 0
+    incr projects_count
+    set single_project_id $unique_id
 }
 
-if { $no_project_p } {
+if { $projects_count == 0 } {
     ad_return_template "no-projects"
     return
 }
 
+# Only one project: Make it selected by default
 
+if { $projects_count == 1 } {
+    set selected_project_id $single_project_id
+    
+    # The multirow has only one row, we want to set it to selected, not clearable
+    multirow foreach filters {
+        set selected_p 1
+        set clear_url {}
+    }
+}
 
 ###########
 #
@@ -219,17 +205,7 @@
                  )"
 }
 
-db_multirow -append -extend { filter_name url entry_add_url selected_p clear_url } filters select_variables "
-    select lv.variable_id as unique_id,
-           lv.name || ' (' || lv.unit || ')' as name
-    from logger_variables lv,
-         logger_projects lp,
-         logger_project_var_map lpvm
-    where lp.project_id = lpvm.project_id
-      and lv.variable_id = lpvm.variable_id
-    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
-    group by lv.variable_id, lv.name, lv.unit
-" {
+db_multirow -append -extend { filter_name url entry_add_url selected_p clear_url start_date end_date } filters select_variables {} {
     set filter_name "Variables"
     set url ".?[export_vars -override { {selected_variable_id $unique_id} } $filter_var_list]"
     if { ![empty_string_p $selected_project_id] } {
@@ -270,19 +246,7 @@
                  )"
 } 
 
-db_multirow -append -extend { filter_name url entry_add_url selected_p clear_url } filters select_users "
-    select submitter.user_id as unique_id,
-           submitter.first_names || ' ' || submitter.last_name as name
-    from   cc_users submitter,
-           logger_entries le,
-           acs_objects ao
-    where  ao.object_id = le.entry_id
-    and    submitter.user_id = ao.creation_user
-    and    ([ad_decode $where_clauses "" "" "[join $where_clauses "\n    and "]"]
-            or submitter.user_id = :current_user_id
-           )
-    group  by submitter.user_id, submitter.first_names, submitter.last_name
-" {
+db_multirow -append -extend { filter_name url entry_add_url selected_p clear_url start_date end_date } filters select_users {} {
     set filter_name "Users"
     set url ".?[export_vars -override { {selected_user_id $unique_id} } $filter_var_list]"
     set entry_add_url {}
@@ -292,21 +256,28 @@
 
 ###########
 #
-# Select projections
+# Projections filter
 #
 ###########
 
 # Only makes sense to show projections for a selected project and variable
 if { ![empty_string_p $selected_project_id] && ![empty_string_p $selected_variable_id] } {
-    db_multirow -extend { url } projections select_projections {
-        select lpe.projection_id,
-               lpe.name
-        from logger_projections lpe
-        where lpe.project_id = :selected_project_id
-          and lpe.variable_id = :selected_variable_id
-    } {
-        set url ".?[export_vars {{selected_projection_id $projection_id} {selected_user_id $selected_user_id} {selected_project_id $selected_project_id} {selected_variable_id $selected_variable_id}}]"        
+
+    if { [exists_and_not_null selected_projection_id] } {
+        set clear_projections_url ".?[export_vars -exclude { selected_projection_id } $filter_var_list]"
+    } else {
+        set clear_projections_url {}
     }
+
+    db_multirow -append -extend { filter_name url entry_add_url selected_p clear_url } filters select_projections {} {
+        set filter_name "Projections"
+        set name [string_truncate -len 25 $name]
+        set url ".?[export_vars -override { {selected_projection_id $unique_id} { selected_start_date $start_date } { selected_end_date $end_date } } $filter_var_list]"
+        set entry_add_url {}
+        set selected_p [string equal $selected_projection_id $unique_id]
+        set clear_url $clear_projections_url
+    }
+
 }
 
 #####
@@ -325,17 +296,20 @@
 
 set filter_name "Date"
 
+set weekdayno [clock format [clock seconds] -format %w]
+set monthdayno [string trimleft [clock format [clock seconds] -format %d] 0]
+
 foreach type { this_week last_week past_7 this_month last_month past_30 } {
     switch $type {
         this_week {
             set name "This week"
-            set new_start_date [clock format [clock scan "-[clock format [clock seconds] -format %w] days"] -format "%Y-%m-%d"]
-            set new_end_date [clock format [clock scan "[expr 6-[clock format [clock seconds] -format %w]] days"] -format "%Y-%m-%d"]
+            set new_start_date [clock format [clock scan "-$weekdayno days"] -format "%Y-%m-%d"]
+            set new_end_date [clock format [clock scan "[expr 6-$weekdayno] days"] -format "%Y-%m-%d"]
         }
         last_week {
             set name "Last week"
-            set new_start_date [clock format [clock scan "[expr -7-[clock format [clock seconds] -format %w]] days"] -format "%Y-%m-%d"]
-            set new_end_date [clock format [clock scan "[expr -1-[clock format [clock seconds] -format %w]] days"] -format "%Y-%m-%d"]
+            set new_start_date [clock format [clock scan "[expr -7-$weekdayno] days"] -format "%Y-%m-%d"]
+            set new_end_date [clock format [clock scan "[expr -1-$weekdayno] days"] -format "%Y-%m-%d"]
         }
         past_7 {
             set name "Past 7 days"
@@ -344,12 +318,12 @@
         }
         this_month {
             set name "This month"
-            set new_start_date [clock format [clock scan "[expr 1-[clock format [clock seconds] -format %d]] days"] -format "%Y-%m-%d"]
+            set new_start_date [clock format [clock scan "[expr 1-$monthdayno] days"] -format "%Y-%m-%d"]
             set new_end_date [clock format [clock scan "1 month -1 day" -base [clock scan $new_start_date]] -format  "%Y-%m-%d"]
         } 
         last_month {
             set name "Last month"
-            set new_start_date [clock format [clock scan "-1 month [expr 1-[clock format [clock seconds] -format %d]] days"] -format "%Y-%m-%d"]
+            set new_start_date [clock format [clock scan "-1 month [expr 1-$monthdayno] days"] -format "%Y-%m-%d"]
             set new_end_date [clock format [clock scan "1 month -1 day" -base [clock scan $new_start_date]] -format  "%Y-%m-%d"]
         } 
         past_30 {
@@ -367,12 +341,12 @@
     set custom_p [expr $custom_p && !$selected_p]
 
     # unique_id name filter_name url entry_add_url selected_p clear_url
-    multirow append filters "" $name $filter_name $url "" $selected_p $date_clear_url
+    multirow append filters "" $name $filter_name $url "" $selected_p $date_clear_url {} {}
 }
 
 # Custom
 if { $custom_p } {
-    multirow append filters "" "Custom range" $filter_name "" "" $custom_p $date_clear_url
+    multirow append filters "" "Custom range" $filter_name "" "" $custom_p $date_clear_url {} {}
 }
 
 
Index: openacs-4/packages/logger/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/Attic/index.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/index.xql	8 May 2003 13:55:50 -0000	1.1
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="last_logged_variable_id">
+    <querytext>
+        select variable_id
+        from logger_entries le,
+             acs_objects ao
+        where ao.creation_date = (select max(ao.creation_date)
+                               from logger_entries le,
+                                    acs_objects ao
+                               where ao.object_id = le.entry_id
+                               [ad_decode $project_clause "" "" "and $project_clause"]
+                              )
+          and ao.object_id = le.entry_id
+        [ad_decode $project_clause "" "" "and $project_clause"]
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_projects">
+    <querytext>
+	    select lp.project_id as unique_id,
+	           lp.name
+	    from logger_projects lp,
+	         logger_project_pkg_map lppm
+	    where lp.project_id = lppm.project_id	
+		  and lppm.package_id = :package_id
+	    order by lp.name
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_variables">
+    <querytext>
+	    select lv.variable_id as unique_id,
+	           lv.name || ' (' || lv.unit || ')' as name
+	    from logger_variables lv,
+	         logger_projects lp,
+	         logger_project_var_map lpvm
+	    where lp.project_id = lpvm.project_id
+	      and lv.variable_id = lpvm.variable_id
+	    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
+	    group by lv.variable_id, lv.name, lv.unit
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_users">
+    <querytext>
+	    select submitter.user_id as unique_id,
+	           submitter.first_names || ' ' || submitter.last_name as name
+	    from   cc_users submitter,
+	           logger_entries le,
+	           acs_objects ao
+	    where  ao.object_id = le.entry_id
+	    and    submitter.user_id = ao.creation_user
+	    and    ([ad_decode $where_clauses "" "" "[join $where_clauses "\n    and "]"]
+	            or submitter.user_id = :current_user_id
+	           )
+	    group  by submitter.user_id, submitter.first_names, submitter.last_name
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_projections">
+    <querytext>
+        select lpe.projection_id as unique_id,
+               lpe.name,
+               to_char(lpe.start_time, 'YYYY-MM-DD') as start_date,
+               to_char(lpe.end_time, 'YYYY-MM-DD') as end_date
+        from logger_projections lpe
+        where lpe.project_id = :selected_project_id
+          and lpe.variable_id = :selected_variable_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/log.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/www/log.adp	7 May 2003 16:43:38 -0000	1.5
+++ openacs-4/packages/logger/www/log.adp	8 May 2003 13:55:50 -0000	1.6
@@ -3,28 +3,43 @@
 <property name="context">@context@</property>
 <property name="focus">log_entry_form.value</property>
 
-<div class="logger_filter_bar" style="float: right; padding: 4px; style:">
-  <table border="0" cellspacing="0" cellpadding="2" width="150">
-    <tr>
-      <td colspan="2" class="logger_filter_header">
-        Add Entry
-      </td>
-    </tr>
-    <multiple name="variables">
-      <if @variables.selected_p@ true>
-        <tr class="logger_filter_selected">
-      </if>
-      <else>
-        <tr>
-      </else>
-        <td class="logger_filter">
-          <b>&raquo;</b>
-          <a href="@variables.url@">@variables.name@</a>
+<script language="javascript">
+   function project_change() {
+      document.forms['log_entry_form'].elements['__refreshing_p'].value = 1;
+      document.forms['log_entry_form'].elements['__refresh'].value = 'project';
+      document.forms['log_entry_form'].submit();
+   }
+   function variable_change() {
+      document.forms['log_entry_form'].elements['__refreshing_p'].value = 1;
+      document.forms['log_entry_form'].elements['__refresh'].value = 'variable';
+      document.forms['log_entry_form'].submit();
+   }
+</script>
+
+<if @variables:rowcount@ not nil>
+  <div class="logger_filter_bar" style="float: right; padding: 4px; style:">
+    <table border="0" cellspacing="0" cellpadding="2" width="150">
+      <tr>
+        <td colspan="2" class="logger_filter_header">
+          Add Entry
         </td>
-      </tr>        
-    </multiple>
-  </table>
-</div>
+      </tr>
+      <multiple name="variables">
+        <if @variables.selected_p@ true>
+          <tr class="logger_filter_selected">
+        </if>
+        <else>
+          <tr>
+        </else>
+          <td class="logger_filter">
+            <b>&raquo;</b>
+            <a href="@variables.url@">@variables.name@</a>
+          </td>
+        </tr>        
+      </multiple>
+    </table>
+  </div>
+</if>
 
 <blockquote>
   <formtemplate id="log_entry_form" style="standard-lars"></formtemplate>
Index: openacs-4/packages/logger/www/log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/logger/www/log.tcl	7 May 2003 16:43:38 -0000	1.6
+++ openacs-4/packages/logger/www/log.tcl	8 May 2003 13:55:50 -0000	1.7
@@ -22,11 +22,7 @@
 set current_user_id [ad_conn user_id]
 
 if { [exists_and_not_null entry_id] } {
-    set entry_exists_p [db_string entry_exists_p {
-        select count(*)
-        from logger_entries
-        where entry_id = :entry_id
-    }]                         
+    set entry_exists_p [db_string entry_exists_p {}]                         
 } else {
     set entry_exists_p 0
 }
@@ -86,7 +82,7 @@
 } 
   
 # Get project_id if it's not provided
-if { ![exists_and_not_null project_id] } {
+if { [exists_and_not_null entry_id] && ![exists_and_not_null project_id] } {
     logger::entry::get -entry_id $entry_id -array entry
     set project_id $entry(project_id)
 }
@@ -149,15 +145,7 @@
 #
 ###########
 
-ad_form -extend -name log_entry_form -select_query {
-    select project_id,
-           variable_id,
-           value,
-           to_char(time_stamp, 'YYYY MM DD') as time_stamp,
-           description
-    from logger_entries
-    where entry_id = :entry_id
-} -validate {
+ad_form -extend -name log_entry_form -select_query_name select_logger_entries -validate {
     {value 
         { [regexp {^([^.]+|[^.]*\.[0-9]{0,2})$} $value] }
         {The value may not contain more than two decimals}
@@ -182,8 +170,8 @@
                               -time_stamp $time_stamp_ansi \
                               -description $description
 } -after_submit {
-
-    ad_returnredirect "[ad_conn url]?entry_id=$entry_id"
+    
+    ad_returnredirect "[ad_conn url]?[export_vars { project_id variable_id }]"
     ad_script_abort
 }
 
@@ -225,17 +213,7 @@
 #
 #####
 
-db_multirow -extend { url selected_p } variables select_variables {
-    select lv.variable_id as unique_id,
-           lv.name || ' (' || lv.unit || ')' as name
-    from logger_variables lv,
-         logger_projects lp,
-         logger_project_var_map lpvm
-    where lp.project_id = lpvm.project_id
-      and lv.variable_id = lpvm.variable_id
-      and lp.project_id = :project_id
-    group by lv.variable_id, lv.name, lv.unit
-} {
+db_multirow -extend { url selected_p } variables select_variables {} {
     set url "log?[export_vars -override { {variable_id $unique_id} } { project_id }]"
     set selected_p [string equal $variable_id $unique_id]
 }
Index: openacs-4/packages/logger/www/log.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/log.xql	8 May 2003 13:55:50 -0000	1.1
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="entry_exists_p">
+    <querytext>
+        select count(*)
+        from logger_entries
+        where entry_id = :entry_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_logger_entries">
+    <querytext>
+	    select project_id,
+	           variable_id,
+	           value,
+	           to_char(time_stamp, 'YYYY MM DD') as time_stamp,
+	           description
+	    from logger_entries
+	    where entry_id = :entry_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_variables">
+    <querytext>
+	    select lv.variable_id as unique_id,
+	           lv.name || ' (' || lv.unit || ')' as name
+	    from logger_variables lv,
+	         logger_projects lp,
+	         logger_project_var_map lpvm
+	    where lp.project_id = lpvm.project_id
+	      and lv.variable_id = lpvm.variable_id
+	      and lp.project_id = :project_id
+	    group by lv.variable_id, lv.name, lv.unit
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/no-projects.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/no-projects.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/www/no-projects.adp	7 May 2003 16:43:38 -0000	1.1
+++ openacs-4/packages/logger/www/no-projects.adp	8 May 2003 13:55:50 -0000	1.2
@@ -1,3 +1,5 @@
+<master>
+<property name="title">Logger Application</property>
 <p>
   Before anyone can start working with the Logger application an administrator needs to setup a project.
 </p>    
Index: openacs-4/packages/logger/www/admin/entries-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/entries-table-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/entries-table-oracle.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="select_entries">
+    <querytext>
+	select le.entry_id as id,
+           acs_permission.permission_p(le.entry_id, :user_id, 'delete') as delete_p,
+           le.time_stamp,
+           lv.name as variable_name,
+           le.value,
+           lv.unit,
+           le.description,
+           lp.name as project_name,
+           submitter.first_names || ' ' || submitter.last_name as user_name
+        from logger_entries le,
+           logger_variables lv,
+           logger_projects lp,
+           acs_objects ao,
+           cc_users submitter
+        where le.variable_id = lv.variable_id
+           and le.project_id = lp.project_id
+      	   and ao.object_id = le.entry_id
+           and ao.creation_user = submitter.user_id
+    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
+        order by le.time_stamp desc, ao.creation_date desc
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/entries-table-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/entries-table-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/entries-table-postgresql.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+  <fullquery name="select_entries">
+    <querytext>
+	select le.entry_id as id,
+           acs_permission__permission_p(le.entry_id, :user_id, 'delete') as delete_p,
+           le.time_stamp,
+           lv.name as variable_name,
+           le.value,
+           lv.unit,
+           le.description,
+           lp.name as project_name,
+           submitter.first_names || ' ' || submitter.last_name as user_name
+        from logger_entries le,
+           logger_variables lv,
+           logger_projects lp,
+           acs_objects ao,
+           cc_users submitter
+        where le.variable_id = lv.variable_id
+           and le.project_id = lp.project_id
+      	   and ao.object_id = le.entry_id
+           and ao.creation_user = submitter.user_id
+	[ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
+        order by le.time_stamp desc, ao.creation_date desc
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/entries-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/entries-table.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/www/admin/entries-table.tcl	6 May 2003 17:37:09 -0000	1.1
+++ openacs-4/packages/logger/www/admin/entries-table.tcl	8 May 2003 13:56:04 -0000	1.2
@@ -37,28 +37,7 @@
 
 set value_total "0"
 
-db_multirow -extend action_links entries select_entries "
-    select le.entry_id as id,
-           acs_permission.permission_p(le.entry_id, :user_id, 'delete') as delete_p,
-           le.time_stamp,
-           lv.name as variable_name,
-           le.value,
-           lv.unit,
-           le.description,
-           lp.name as project_name,
-           submitter.first_names || ' ' || submitter.last_name as user_name
-    from logger_entries le,
-         logger_variables lv,
-         logger_projects lp,
-         acs_objects ao,
-         cc_users submitter
-    where le.variable_id = lv.variable_id
-      and le.project_id = lp.project_id
-      and ao.object_id = le.entry_id
-      and ao.creation_user = submitter.user_id
-    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
-    order by le.time_stamp desc, ao.creation_date desc
-" {
+db_multirow -extend action_links entries select_entries {} {
     set description_max_length 50
     if { [string length $description] > $description_max_length } {
         set description "[string range $description 0 [expr $description_max_length - 4]]..."
Index: openacs-4/packages/logger/www/admin/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/www/admin/index-oracle.xql	22 Apr 2003 09:27:03 -0000	1.1
+++ openacs-4/packages/logger/www/admin/index-oracle.xql	8 May 2003 13:56:04 -0000	1.2
@@ -22,4 +22,37 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="select_variables">
+    <querytext>
+        select lv.variable_id,
+             lv.name,
+             lv.unit,
+             lv.type,
+             acs_permission.permission_p(lv.variable_id, :user_id, 'admin') as admin_p
+        from logger_variables lv
+        where (exists (select 1
+                         from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                       where lv.variable_id = lpvm.variable_id
+                         and lpvm.project_id = lppm.project_id
+                         and lppm.package_id = :package_id
+                   )
+        or lv.package_id = :package_id
+        or lv.package_id is null)
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_mappable_projects">
+    <querytext>
+        select p.project_id,
+               p.name
+        from   logger_projects p
+        where  not exists (select 1
+                           from   logger_project_pkg_map ppm
+                           where  ppm.project_id = p.project_id
+                           and    ppm.package_id = :package_id)
+        and    acs_permission.permission_p(p.project_id, :user_id, 'read') = 't'
+    </querytext>
+  </fullquery>
+    
 </queryset>
Index: openacs-4/packages/logger/www/admin/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/www/admin/index-postgresql.xql	7 May 2003 16:43:41 -0000	1.1
+++ openacs-4/packages/logger/www/admin/index-postgresql.xql	8 May 2003 13:56:04 -0000	1.2
@@ -22,4 +22,37 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="select_variables">
+    <querytext>
+        select lv.variable_id,
+             lv.name,
+             lv.unit,
+             lv.type,
+             acs_permission__permission_p(lv.variable_id, :user_id, 'admin') as admin_p
+        from logger_variables lv
+        where (exists (select 1
+                         from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                       where lv.variable_id = lpvm.variable_id
+                         and lpvm.project_id = lppm.project_id
+                         and lppm.package_id = :package_id
+                   )
+        or lv.package_id = :package_id
+        or lv.package_id is null)    
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_mappable_projects">
+    <querytext>
+        select p.project_id,
+               p.name
+        from   logger_projects p
+        where  not exists (select 1
+                           from   logger_project_pkg_map ppm
+                           where  ppm.project_id = p.project_id
+                           and    ppm.package_id = :package_id)
+        and    acs_permission__permission_p(p.project_id, :user_id, 'read') = 't'
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/logger/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/logger/www/admin/index.adp	7 May 2003 16:43:41 -0000	1.7
+++ openacs-4/packages/logger/www/admin/index.adp	8 May 2003 13:56:04 -0000	1.8
@@ -2,116 +2,231 @@
 <property name="title">@page_title@</property>
 
 <div class="logger_body">
-<h2 class="logger">Projects</h2>
 
-<if @projects:rowcount@ ne 0>
-  <% # Project table header %>
+  <h2 class="logger">Projects</h2>
 
-  <table class="logger_listing" cellpadding="4" cellspacing="1">
-    <tr class="logger_listing_header">
-      <th class="logger_listing_narrow">&nbsp;</th>
-      <th class="logger_listing">Project Name</th>
-      <th class="logger_listing">Active</th>
-      <th class="logger_listing">Project Lead</th>
-      <th class="logger_listing_narrow">Permissions</th>
-      <th class="logger_listing_narrow">&nbsp;</th>
-    </tr>
+  <if @projects:rowcount@ ne 0>
+    <% # Project table header %>
 
-  <% # Project table rows %>
-  <multiple name="projects">
-    <if @projects.rownum@ odd>
-      <tr class="logger_listing_odd">
-    </if>
-    <else>
-      <tr class="logger_listing_even">
-    </else>
-      <td class="logger_listing_narrow">
-        <a href="project?project_id=@projects.project_id@" title="Edit project attributes"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
-      </td>
-      <td class="logger_listing">
-        <a href="project?project_id=@projects.project_id@" title="Edit project attributes">@projects.name@</a>
-      </td>
-      <td class="logger_listing"><if @projects.active_p@ eq t>Yes</if><else>No</else> </td>
-      <td class="logger_listing"><a href="@home_url@?user_id=@projects.project_lead_id@">@projects.project_lead_name@</a></td>
-      <td class="logger_listing_narrow" align="center">
-        <if @projects.admin_p@>
-          <a href="@projects.permissions_url@" title="Set permissions for this project">Set</a>
+    <table class="logger_listing" cellpadding="4" cellspacing="1">
+      <tr class="logger_listing_header">
+        <th class="logger_listing_narrow">&nbsp;</th>
+        <th class="logger_listing">Project Name</th>
+        <th class="logger_listing">Active</th>
+        <th class="logger_listing">Project Lead</th>
+        <th class="logger_listing_narrow">Permissions</th>
+        <th class="logger_listing_narrow">Unlink</th>
+        <th class="logger_listing_narrow">&nbsp;</th>
+      </tr>
+
+    <% # Project table rows %>
+    <multiple name="projects">
+      <if @projects.rownum@ odd>
+        <tr class="logger_listing_odd">
+      </if>
+      <else>
+        <tr class="logger_listing_even">
+      </else>
+        <td class="logger_listing_narrow">
+          <a href="@projects.edit_url@" title="Edit project attributes"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+        </td>
+        <td class="logger_listing">
+          <a href="@projects.display_url@" title="Display project info">@projects.name@</a>
+        </td>
+        <td class="logger_listing"><if @projects.active_p@ eq t>Yes</if><else>No</else> </td>
+        <td class="logger_listing">@projects.project_lead_chunk@</td>
+        <td class="logger_listing_narrow" align="center">
+          <if @projects.admin_p@>
+            <a href="@projects.permissions_url@" title="Set permissions for this project">Set</a>
+          </if>
+        </td>
+        <td class="logger_listing_narrow">
+          <a href="@projects.unmap_url@">Unlink</a>
+        </td>
+        <td class="logger_listing_narrow">
+          <if @projects.admin_p@>
+            <a href="@projects.delete_url@" title="Delete this project"
+            onclick="return confirm('Are you sure you want to delete project @projects.name@?');"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
+          </if>
+        </td>
+      </tr>  
+    </multiple>
+
+    <% # Close project table %>
+    </table>
+  </if>
+  <else>
+    <!-- No projects -->
+    <span class="no_items_text">There are no projects</span>
+  </else>
+
+  <p>
+    <b>&raquo;</b> <a href="project">Create new project</a>
+  </p>
+
+  <if @mappable_projects:rowcount@ gt 0>
+    <p>
+      Projects not in this logger application instance which can be linked in:
+    </p>
+    <table class="logger_listing" cellpadding="4" cellspacing="1">
+      <tr class="logger_listing_header">
+        <th class="logger_listing_narrow">Name</th>
+        <th class="logger_listing_narrow">Link to instance</th>
+      </tr>
+
+      <multiple name="mappable_projects">
+        <if @mappable_projects.rownum@ odd>
+          <tr class="logger_listing_odd">
         </if>
-      </td>
-      <td class="logger_listing_narrow">
-        <if @projects.admin_p@>
-          <a href="project-delete?project_id=@projects.project_id@" title="Delete this project"
-          onclick="return confirm('Are you sure you want to delete project @projects.name@?');"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
-        </if>
-      </td>
-    </tr>  
-  </multiple>
+        <else>
+          <tr class="logger_listing_even">
+        </else>
+          <td class="logger_listing">
+            @mappable_projects.name@
+          </td>
+          <td class="logger_listing_narrow" align="center">
+            <a href="@mappable_projects.map_url@">Link</a>
+          </td>
+        </tr>
+      </multiple>
+    </table>
 
-  <% # Close project table %>
-  </table>
-</if>
-<else>
-  <!-- No projects -->
-  <span class="no_items_text">There are no projects</span>
-</else>
+  </if>  
 
-<p>
-  <b>&raquo;</b> <a href="project">Add project</a>
-</p>
+  <h2 class="logger">Variables</h2>
 
-<h2 class="logger">Variables</h2>
+  <if @variables:rowcount@ ne 0>
+    <table class="logger_listing" cellpadding="4" cellspacing="1">
+      <tr class="logger_listing_header">
+        <th class="logger_listing_narrow">&nbsp;</th>
+        <th class="logger_listing">Name</th>
+        <th class="logger_listing">Unit</th>
+        <th class="logger_listing">Additive</th>
+        <th class="logger_listing_narrow">Permissions</th>
+        <th class="logger_listing_narrow">&nbsp;</th>
+      </tr>
 
-<if @variables:rowcount@ ne 0>
-  <table class="logger_listing" cellpadding="4" cellspacing="1">
-    <tr class="logger_listing_header">
-      <th class="logger_listing_narrow">&nbsp;</th>
-      <th class="logger_listing">Name</th>
-      <th class="logger_listing">Unit</th>
-      <th class="logger_listing">Additive</th>
-      <th class="logger_listing_narrow">Permissions</th>
-      <th class="logger_listing_narrow">&nbsp;</th>
-    </tr>
+    <multiple name="variables">
+      <if @variables.rownum@ odd>
+        <tr class="logger_listing_odd">
+      </if>
+      <else>
+        <tr class="logger_listing_even">
+      </else>
+        <td class="logger_listing_narrow">
+          <a href="@variables.edit_url@" title="Edit variable"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+        </td>
+        <td class="logger_listing"><a href="@variables.edit_url@">@variables.name@</a></td>
+        <td class="logger_listing">@variables.unit@</td>
+        <td class="logger_listing"><if @variables.type@ eq additive>Yes</if><else>No</else></td>
+        <td class="logger_listing_narrow" align="center">
+          <if @variables.admin_p@>
+            <a href="@variables.permissions_url@">Set</a>
+          </if> 
+        <td class="logger_listing_narrow">
+          <if @variables.admin_p@>
+            <a href="@variables.delete_url@" 
+            onclick="return confirm('Are you sure you want to delete variable @variables.name@?');"
+            title="Delete variable"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
+          </if> 
+        </td>
+      </tr>
+    </multiple>
 
-  <multiple name="variables">
-    <if @variables.rownum@ odd>
-      <tr class="logger_listing_odd">
-    </if>
-    <else>
-      <tr class="logger_listing_even">
-    </else>
-      <td class="logger_listing_narrow">
-        <a href="variable?variable_id=@variables.variable_id@" title="Edit variable"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
-      </td>
-      <td class="logger_listing"><a href="variable?variable_id=@variables.variable_id@">@variables.name@</a></td>
-      <td class="logger_listing">@variables.unit@</td>
-      <td class="logger_listing"><if @variables.type@ eq additive>Yes</if><else>No</else></td>
-      <td class="logger_listing_narrow" align="center">
-        <if @variables.admin_p@>
-          <a href="@variables.permissions_url@">Set</a>
-        </if> 
-      <td class="logger_listing_narrow">
-        <if @variables.admin_p@>
-          <a href="variable-delete?variable_id=@variables.variable_id@" 
-          onclick="return confirm('Are you sure you want to delete variable @variables.name@?');"
-          title="Delete variable"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
-        </if> 
-      </td>
-    </tr>
-  </multiple>
+    </table>    
+  </if>
+  <else>
+    <!-- There are no variables -->
+    <span class="no_items_text">There are no variables</span>
+  </else>
 
-  </table>    
-</if>
-<else>
-  <!-- There are no variables -->
-  <span class="no_items_text">There are no variables</span>
-</else>
+  <p>
+    <b>&raquo;</b> <a href="variable">Add variable</a>
+  </p>
 
-<p>
-  <b>&raquo;</b> <a href="variable">Add variable</a>
-</p>
+  <h2 class="logger">Logger Application Instance</h2>
 
-<h2 class="logger">Package</h2>
-<p>
-  <b>&raquo;</b> <a href="@package_permissions_url@">Set permissions for this package</a>
-</p>
+  <p>
+    <b>&raquo;</b> <a href="@package_permissions_url@">Set permissions for this logger application instance</a>
+  </p>
+
+  <h2 class="logger">Help</h2>
+
+  <p class="logger_font">
+    The logger can track a number of <b>variables</b> in different <b>projects</b>.
+  </p>
+
+  <p class="logger_font">
+    A <b>variable</b> is something you wish to track, for example:
+  </p>
+
+  <ul class="logger_font">
+    <li>
+      Time spent (hours)
+    </li>
+    <li>
+      Expenses (currency, USD, EUR, whatever)
+    </li>
+    <li>
+      Weight of goods shipped (lbs, kgs)
+    </li>
+    <li>
+      Your personal weight (lbs, kgs). Non-additive.
+    </li>
+  </ul>
+
+  <p class="logger_font">
+    Variables are <b>shared between all projects</b>, so that you can
+    summarize the variable across projects. However, if you have many
+    diverse projects going on, only certain variables will make sense
+    for any given project, hence we let you <b>map variables to
+    projects</b>.
+  </p>
+
+  <p class="logger_font">
+    Some variables will be <b>additive</b>, meaning that it makes
+    sense to add them together and look at the total. An example of an
+    additive variable is time spent. Others are <b>non-additive</b>,
+    which means the opposite. Instead, you would typically average
+    over them. An example is measuring your personal weight, or the
+    account balance of your bank account. It doesn't make sense to add
+    those numbers together, they're snapshots at a given point in
+    time, and just because you check your account balance 10 times a
+    day doesn't (necessarily) mean you're getting richer and richer.
+  </p>
+  
+  <p class="logger_font">
+  
+  </p>
+  
+  <p class="logger_font">
+  
+  </p>
+  
+  <p class="logger_font">
+  
+  </p>
+  
+
+  <p class="logger_font">
+    You can mount multiple <b>instances of the logger
+    application</b>. The projects you define are shared between all
+    logger application instances, subject to the permissions you grant
+    on them. Each instance of logger will be setup to display a
+    certain subset of the projects available, as defined by the
+    administrator of that instance.
+  </p>
+
+  <p class="logger_font">
+    An example of why this is useful is if you work for a company,
+    which works on many different projects for different clients. In
+    that scenario, you would mount a logger instance in your intranet,
+    where people log the hours they spend on projects. Then if you
+    want to give your clients access to your logs, you can mount an
+    instance per client in the client's extranet area. These client
+    loggers would only have access to the projects that pertain to the
+    given client.
+  </p>
+
 </div>
+
Index: openacs-4/packages/logger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/www/admin/index.tcl	1 May 2003 21:50:38 -0000	1.5
+++ openacs-4/packages/logger/www/admin/index.tcl	8 May 2003 13:56:04 -0000	1.6
@@ -21,34 +21,41 @@
 #
 ###########
 
-db_multirow -extend { permissions_url } projects select_projects {} {
+db_multirow -extend { edit_url display_url permissions_url delete_url unmap_url project_lead_chunk } projects select_projects {} {
     set description [string_truncate -len 50 $description]
+
+    set edit_url "project?[export_vars { project_id {formbutton\:formbuilder\:\:edit Edit} {form\:id project_form} {form\:mode display}}]"
+    set display_url "project?[export_vars { project_id }]"
+    set unmap_url "project-instance-map?[export_vars { project_id {unmap "t"} }]"
     set permissions_url "${permissions_uri}?[export_vars {{object_id $project_id} application_url}]"
+    set delete_url "project-delete?[export_vars { project_id }]"
+    set project_lead_chunk [ad_present_user $project_lead_id $project_lead_name]
 }
 
+#####
+#
+# Mappable projects
+#
+#####
+
+if { $user_id != 0 } {
+    db_multirow -extend { map_url } mappable_projects select_mappable_projects {} {
+        set map_url "project-instance-map?[export_vars { project_id }]"
+    }
+} else {
+    # Create empty multirow
+    multirow create mappable_projects project_id name
+}
+
 ###########
 #
 # Variables
 #
 ###########
 
-db_multirow -extend { permissions_url } variables select_variables {
-      select lv.variable_id,
-             lv.name,
-             lv.unit,
-             lv.type,
-             acs_permission.permission_p(lv.variable_id, :user_id, 'admin') as admin_p
-      from logger_variables lv
-      where (exists (select 1
-                    from logger_project_var_map lpvm,
-                         logger_project_pkg_map lppm
-                    where lv.variable_id = lpvm.variable_id
-                      and lpvm.project_id = lppm.project_id
-                      and lppm.package_id = :package_id
-                   )
-         or lv.package_id = :package_id
-         or lv.package_id is null)
-} {
+db_multirow -extend { edit_url delete_url permissions_url } variables select_variables {} {
+    set edit_url "variable?[export_vars { variable_id {formbutton\:formbuilder\:\:edit Edit} {form\:id variable_form} {form\:mode display}}]"
+    set delete_url "variable-delete?[export_vars { variable_id }]"
     set permissions_url "${permissions_uri}?[export_vars {{object_id $variable_id} application_url}]"
 }
 
Index: openacs-4/packages/logger/www/admin/project-instance-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project-instance-map.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/project-instance-map.tcl	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,26 @@
+ad_page_contract {
+    Map a project to a logger instance
+} {
+    project_id:integer
+    {unmap "f"}
+}
+
+set package_id [ad_conn package_id]
+
+if { [string equal $unmap "f"] } {
+
+    permission::require_permission -object_id $project_id -privilege "read"
+    
+    db_dml map_project {
+        insert into logger_project_pkg_map (project_id, package_id) values (:project_id, :package_id)
+    }
+} else {
+    db_dml map_project {
+        delete 
+        from   logger_project_pkg_map 
+        where  project_id = :project_id
+        and    package_id = :package_id
+    }
+}
+
+ad_returnredirect .
Index: openacs-4/packages/logger/www/admin/project-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/project-oracle.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+  <fullquery name="n_can_be_mapped">
+    <querytext>
+        select count(*)
+        from logger_variables lv
+        where (exists (select 1
+                    from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                    where lv.variable_id = lpvm.variable_id
+                      and lpvm.project_id = lppm.project_id
+                      and lppm.package_id = :package_id
+                   )
+         or lv.package_id = :package_id
+         or lv.package_id is null)
+        and not exists (select 1
+                          from logger_project_var_map lpvm
+                          where lpvm.project_id = :project_id
+                            and lpvm.variable_id = lv.variable_id
+                          )
+        and acs_permission.permission_p(lv.variable_id, :user_id, 'read') = 't'    
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_projections">
+    <querytext>
+        select lpe.projection_id,
+               lpe.name,
+               lpe.description,
+               lpe.value,
+               lpo.name as project_name,
+               lv.name as variable_name,
+               to_char(lpe.start_time, 'YYYY-MM-DD') as start_day,
+               to_char(lpe.end_time, 'YYYY-MM-DD') as end_day,
+               acs_permission.permission_p(lpo.project_id, :user_id, 'admin') as admin_p
+        from logger_projections lpe,
+             logger_projects lpo,
+             logger_variables lv
+        where lpe.project_id = :project_id
+          and lpe.project_id = lpo.project_id
+          and lpe.variable_id = lv.variable_id    
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/project-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/project-postgresql.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+  <fullquery name="n_can_be_mapped">
+    <querytext>
+        select count(*)
+        from logger_variables lv
+        where (exists (select 1
+                    from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                    where lv.variable_id = lpvm.variable_id
+                      and lpvm.project_id = lppm.project_id
+                      and lppm.package_id = :package_id
+                   )
+         or lv.package_id = :package_id
+         or lv.package_id is null)
+        and not exists (select 1
+                          from logger_project_var_map lpvm
+                          where lpvm.project_id = :project_id
+                            and lpvm.variable_id = lv.variable_id
+                          )
+        and acs_permission__permission_p(lv.variable_id, :user_id, 'read') = 't'    
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_projections">
+    <querytext>
+        select lpe.projection_id,
+               lpe.name,
+               lpe.description,
+               lpe.value,
+               lpo.name as project_name,
+               lv.name as variable_name,
+               to_char(lpe.start_time, 'YYYY-MM-DD') as start_day,
+               to_char(lpe.end_time, 'YYYY-MM-DD') as end_day,
+               acs_permission__permission_p(lpo.project_id, :user_id, 'admin') as admin_p
+        from logger_projections lpe,
+             logger_projects lpo,
+             logger_variables lv
+        where lpe.project_id = :project_id
+          and lpe.project_id = lpo.project_id
+          and lpe.variable_id = lv.variable_id    
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/logger/www/admin/project.adp	2 May 2003 08:35:23 -0000	1.4
+++ openacs-4/packages/logger/www/admin/project.adp	8 May 2003 13:56:04 -0000	1.5
@@ -1,6 +1,7 @@
 <master src="../lib/master">
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
+<property name="focus">project_form.name</property>
 
 <blockquote>
   <formtemplate id="project_form" style="standard-lars"></formtemplate>
@@ -10,63 +11,81 @@
   <h2>Variables</h2>
 
   <if @variables:rowcount@ gt 0>
-  <ul>
-  <multiple name="variables">
-    <li>
-      <p>
-        <a href="variable?variable_id=@variables.variable_id@">@variables.name@</a>
-        <if @variables.primary_p@ eq f>
-        &nbsp; 
-        [ <a href="unmap-variable-from-project?variable_id=@variables.variable_id@&project_id=@project_id@">unmap</a> | 
-          <a href="set-primary-variable?variable_id=@variables.variable_id@&project_id=@project_id@">make primary</a> ]   
-      </if>
-      <else>
-        (primary)
-      </else>
-      </p>
-     </li>
-  </multiple>
-  </ul>
+    <table class="logger_listing" cellpadding="3" cellspacing="1">
+      <tr class="logger_listing_header">
+        <th class="logger_listing">Name</th>
+        <th class="logger_listing">Primary</th>
+        <th class="logger_listing">Unmap</th>
+      </tr>
+      <multiple name="variables">
+        <if @variables.rownum@ odd>
+          <tr class="logger_listing_odd">
+        </if>
+        <else>
+          <tr class="logger_listing_even">
+        </else>
+          <td class="logger_listing">
+            <a href="variable?variable_id=@variables.variable_id@">@variables.name@</a>
+          </td>
+          <td class="logger_listing" align="center">
+            <if @variables.primary_p@ true><b>*</b></if>
+            <else><a href="set-primary-variable?variable_id=@variables.variable_id@&project_id=@project_id@">set</a></else>
+          </td>
+          <td class="logger_listing">
+            <if @variables.primary_p@ false>
+              <a href="unmap-variable-from-project?variable_id=@variables.variable_id@&project_id=@project_id@">Unmap</a>
+            </if>
+          </td>
+        </tr>
+      </multiple>
+    </table>
   </if>
   <else>
     <p>
-      <span class="no_items_text">no variables</span>
+      <span class="no_items_text">No variables selected</span>
     </p>
   </else>
 
   <if @n_can_be_mapped@ gt 0>
     <p>
-      [ <a href="map-variable-to-project?project_id=@project_id@">add variable</a> ] 
+      <b>&raquo;</b> <a href="map-variable-to-project?project_id=@project_id@">Add variable</a>
     </p>
   </if>
 
 <h2>Projections</h2>
 
 <if @projections:rowcount@ ne 0>
-  <table class="logger_table" cellpadding="4" cellspacing="1">
-    <tr class="logger_table_header">
-      <th>&nbsp;</th>
-      <th>Name</th>
-      <th>Start day</th>
-      <th>End day</th>
-      <th>Variable</th>      
-      <th>Value</th>
-      <th>Description</th>
+  <table class="logger_listing" cellpadding="3" cellspacing="1">
+    <tr class="logger_listing_header">
+      <th class="logger_listing">Name</th>
+      <th class="logger_listing">Start day</th>
+      <th class="logger_listing">End day</th>
+      <th class="logger_listing">Variable</th>      
+      <th class="logger_listing">Value</th>
+      <th class="logger_listing">Description</th>
+      <th class="logger_listing_narrow">&nbsp;</th>
     </tr>
 
   <multiple name="projections">
-    <tr class="logger_table_rows">
-      <td>
-        <if @projections.admin_p@> [ <a href="projection-delete?projection_id=@projections.projection_id@" 
-          onclick="return confirm('Are you sure you want to delete projection @projections.name@?');">delete</a> ]
+    <if @projections.rownum@ odd>
+      <tr class="logger_listing_odd">
+    </if>
+    <else>
+      <tr class="logger_listing_even">
+    </else>
+      <td class="logger_listing"><a href="projection?projection_id=@projections.projection_id@">@projections.name@</a></td>
+      <td class="logger_listing">@projections.start_day@</td>
+      <td class="logger_listing">@projections.end_day@</td>
+      <td class="logger_listing">@projections.variable_name@</td>
+      <td class="logger_listing">@projections.value@</td>
+      <td class="logger_listing">@projections.description@</td>
+      <td class="logger_listing_narrow">
+        <if @projections.admin_p@>
+          <a href="projection-delete?projection_id=@projections.projection_id@" 
+          onclick="return confirm('Are you sure you want to delete projection @projections.name@?');"
+          title"Delete this projection"><img src="/shared/images/Delete16.gif" width="16" height="16" border="0" alt="Delete"></a>
         </if> 
       </td>
-      <td><a href="projection?projection_id=@projections.projection_id@">@projections.name@</a></td>
-      <td>@projections.start_day@</td>
-      <td>@projections.end_day@</td>
-      <td>@projections.variable_name@</td>
-      <td>@projections.value@</td>
-      <td>@projections.description@</td>
     </tr>
   </multiple>
 
@@ -78,7 +97,7 @@
 </else>
 
 <p>
-  [ <a href="projection?project_id=@project_id@">add projection</a> ]
+  <b>&raquo;</b> <a href="projection?project_id=@project_id@">Add projection</a>
 </p>
 
 </if>
Index: openacs-4/packages/logger/www/admin/project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/logger/www/admin/project.tcl	7 May 2003 16:43:41 -0000	1.8
+++ openacs-4/packages/logger/www/admin/project.tcl	8 May 2003 13:56:04 -0000	1.9
@@ -29,11 +29,7 @@
     # Initial request in display or edit mode or a submit of the form
     set page_title "One Project"
     set ad_form_mode display
-    set project_exists_p [db_string project_exists_p {
-        select count(*)
-        from logger_projects
-        where project_id = :project_id
-    }]                         
+    set project_exists_p [db_string project_exists_p {}]                         
 } else {
     # Initial request in add mode
     set page_title "Add a Project"
@@ -91,7 +87,6 @@
 } -after_submit {
       
     ad_returnredirect "[ad_conn url]?project_id=$project_id"
-
     ad_script_abort
 }
 
@@ -104,58 +99,15 @@
     #
     ###########
 
-    db_multirow variables variables_in_project {
-        select lv.variable_id,
-               lv.name,
-               lpvm.primary_p
-          from logger_project_var_map lpvm,
-               logger_variables lv
-          where lpvm.variable_id = lv.variable_id
-            and lpvm.project_id = :project_id
-    } 
+    db_multirow variables variables_in_project {} 
 
-    set n_can_be_mapped [db_string n_can_be_mapped {
-        select count(*)
-        from logger_variables lv
-        where (exists (select 1
-                    from logger_project_var_map lpvm,
-                         logger_project_pkg_map lppm
-                    where lv.variable_id = lpvm.variable_id
-                      and lpvm.project_id = lppm.project_id
-                      and lppm.package_id = :package_id
-                   )
-         or lv.package_id = :package_id
-         or lv.package_id is null)
-        and not exists (select 1
-                          from logger_project_var_map lpvm
-                          where lpvm.project_id = :project_id
-                            and lpvm.variable_id = lv.variable_id
-                          )
-        and acs_permission.permission_p(lv.variable_id, :user_id, 'read') = 't'
-    }]
+    set n_can_be_mapped [db_string n_can_be_mapped {}]
 
     ###########
     #
     # Projections
     #
     ###########
 
-    db_multirow projections select_projections {
-        select lpe.projection_id,
-               lpe.name,
-               lpe.description,
-               lpe.value,
-               lpo.name as project_name,
-               lv.name as variable_name,
-               to_char(lpe.start_time, 'YYYY-MM-DD') start_day,
-               to_char(lpe.end_time, 'YYYY-MM-DD') end_day,
-               acs_permission.permission_p(lpo.project_id, :user_id, 'admin') as admin_p
-        from logger_projections lpe,
-             logger_projects lpo,
-             logger_variables lv
-        where lpe.project_id = :project_id
-          and lpe.project_id = lpo.project_id
-          and lpe.variable_id = lv.variable_id
-    }   
-
+    db_multirow projections select_projections {}   
 }
Index: openacs-4/packages/logger/www/admin/project.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/project.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="project_exists_p">
+    <querytext>
+        select count(*)
+        from logger_projects
+        where project_id = :project_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="variables_in_project">
+    <querytext>
+        select lv.variable_id,
+               lv.name,
+               lpvm.primary_p
+          from logger_project_var_map lpvm,
+               logger_variables lv
+          where lpvm.variable_id = lv.variable_id
+            and lpvm.project_id = :project_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/projection.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/projection.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/projection.adp	6 May 2003 17:37:10 -0000	1.2
+++ openacs-4/packages/logger/www/admin/projection.adp	8 May 2003 13:56:04 -0000	1.3
@@ -1,6 +1,7 @@
 <master src="../lib/master">
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
+<property name="focus">projection_form.variable_id</property>
 
 
 <blockquote>
Index: openacs-4/packages/logger/www/admin/projection.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/projection.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/projection.tcl	6 May 2003 17:37:10 -0000	1.2
+++ openacs-4/packages/logger/www/admin/projection.tcl	8 May 2003 13:56:04 -0000	1.3
@@ -87,21 +87,7 @@
     {project_id:integer(hidden)
         {value $project_id}
     }
-} -select_query {
-  select lpe.name,
-         lpe.description,
-         lpe.project_id,
-         lpe.variable_id,
-         lpe.value,
-         to_char(lpe.start_time, 'YYYY MM DD') as start_day,
-         to_char(lpe.end_time, 'YYYY MM DD') as end_day,
-         lpo.name as project
-  from logger_projections lpe,
-       logger_projects lpo
-  where lpe.projection_id = :projection_id
-    and lpe.project_id = lpo.project_id
-
-} -validate {
+} -select_query_name select_projections -validate {
     {
         name
         { ![empty_string_p [string trim $name]] }
Index: openacs-4/packages/logger/www/admin/projection.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/projection.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/projection.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="select_projections">
+    <querytext>
+	  select lpe.name,
+        	 lpe.description,
+       		 lpe.project_id,
+	         lpe.variable_id,
+         	 lpe.value,
+         	 to_char(lpe.start_time, 'YYYY MM DD') as start_day,
+          	 to_char(lpe.end_time, 'YYYY MM DD') as end_day,
+	         lpo.name as project
+	  from logger_projections lpe,
+	         logger_projects lpo
+	  where lpe.projection_id = :projection_id
+		 and lpe.project_id = lpo.project_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/variable-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable-delete.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/variable-delete.tcl	6 May 2003 17:37:10 -0000	1.2
+++ openacs-4/packages/logger/www/admin/variable-delete.tcl	8 May 2003 13:56:04 -0000	1.3
@@ -14,11 +14,7 @@
 permission::require_permission -object_id $variable_id -party_id $user_id -privilege admin
 
 # Check that there are no log entries for this variable
-set n_log_entries [db_string n_log_entries {
-    select count(*)
-    from logger_entries
-    where variable_id = :variable_id
-}]
+set n_log_entries [db_string n_log_entries {}]
 
 if { $n_log_entries > 0 } {
     ad_return_complaint "Variable is in use" "You cannot delete this variable as it is being used by log entries"
Index: openacs-4/packages/logger/www/admin/variable-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable-delete.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/variable-delete.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="n_log_entries">
+    <querytext>
+    select count(*)
+    from logger_entries
+    where variable_id = :variable_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/admin/variable.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/variable.adp	30 Apr 2003 12:21:16 -0000	1.2
+++ openacs-4/packages/logger/www/admin/variable.adp	8 May 2003 13:56:04 -0000	1.3
@@ -1,6 +1,7 @@
 <master src="../lib/master">
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
+<property name="focus">variable_form.name</property>
 
 <blockquote>
   <formtemplate id="variable_form" style="standard-lars"></formtemplate>
Index: openacs-4/packages/logger/www/admin/variable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/logger/www/admin/variable.tcl	1 May 2003 21:18:08 -0000	1.4
+++ openacs-4/packages/logger/www/admin/variable.tcl	8 May 2003 13:56:04 -0000	1.5
@@ -33,25 +33,21 @@
     variable_id:key(acs_object_id_seq)
 
     {name:text
-      {html {size 50}}
+        {html {size 50}}
+        {label "Name"}
     }
 
     {unit:text
-      {html {size 50}}
+        {html {size 50}}
+        {label "Unit"}
     }
 
     {type:text(radio)
         {options {{Additive additive} {Non-Additive non-additive}}}
+        {label "Type"}
     }
 
-} -select_query {
-  select name,
-         unit,
-         type
-  from logger_variables
-  where variable_id = :variable_id    
-
-} -validate {
+} -select_query_name select_variable -validate {
     {
         name
         { ![empty_string_p [string trim $name]] }
Index: openacs-4/packages/logger/www/admin/variable.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/admin/variable.xql	8 May 2003 13:56:04 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="select_variable">
+    <querytext>
+	  select name,
+	         unit,
+	         type
+	  from logger_variables
+	  where variable_id = :variable_id    
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/lib/entries-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/lib/entries-table-oracle.xql	8 May 2003 13:56:20 -0000	1.1
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+  <fullquery name="select_entries">
+    <querytext>
+	    select le.entry_id as id,
+	           acs_permission.permission_p(le.entry_id, :user_id, 'delete') as delete_p,
+	           le.time_stamp,
+	           to_char(le.time_stamp, 'fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
+	           le.value,
+	           le.description,
+	           lp.name as project_name,
+	           submitter.user_id,
+	           submitter.first_names || ' ' || submitter.last_name as user_name
+	    from logger_entries le,
+	         logger_projects lp,
+	         acs_objects ao,
+	         cc_users submitter
+	    where le.project_id = lp.project_id
+	      and ao.object_id = le.entry_id
+	      and ao.creation_user = submitter.user_id
+	    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
+	    order by le.time_stamp desc, ao.creation_date desc
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/lib/entries-table-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/lib/entries-table-postgresql.xql	8 May 2003 13:56:20 -0000	1.1
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+  <fullquery name="select_entries">
+    <querytext>
+	    select le.entry_id as id,
+	           acs_permission__permission_p(le.entry_id, :user_id, 'delete') as delete_p,
+	           le.time_stamp,
+	           to_char(le.time_stamp, 'fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
+	           le.value,
+	           le.description,
+	           lp.name as project_name,
+	           submitter.user_id,
+	           submitter.first_names || ' ' || submitter.last_name as user_name
+	    from logger_entries le,
+	         logger_projects lp,
+	         acs_objects ao,
+	         cc_users submitter
+	    where le.project_id = lp.project_id
+	      and ao.object_id = le.entry_id
+	      and ao.creation_user = submitter.user_id
+	    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
+	    order by le.time_stamp desc, ao.creation_date desc
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/lib/entries-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/lib/entries-table.adp	7 May 2003 16:43:44 -0000	1.3
+++ openacs-4/packages/logger/www/lib/entries-table.adp	8 May 2003 13:56:20 -0000	1.4
@@ -47,8 +47,32 @@
     <!-- Row for the grand total -->
     <tr class="logger_listing_subheader">
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
-      <td class="logger_listing_narrow" colspan="3"><b>Total</b></td>
-      <td class="logger_listing_narrow" align="right" nowrap><b>@value_total@</b></td>
+      <td class="logger_listing_narrow" colspan="3">
+        <if @variable.type@ eq "additive">
+          <b>Total</b>
+        </if>
+        <else>
+          <b>Average</b>
+        </else>
+      </td>
+      <td class="logger_listing_narrow" align="right" nowrap>
+        <if @variable.type@ eq "additive">
+          <if @projection_value@ not nil and @value_total@ gt @projection_value@>
+            <font color="red"><b>@value_total@</b></font>
+          </if>
+          <else>
+            <b>@value_total@</b>
+          </else>
+        </if>
+        <else>
+          <if @projection_value@ not nil and @value_average@ gt @projection_value@>
+            <font color="red"><b>@value_average@</b></font>
+          </if>
+          <else>
+            <b>@value_average@</b>
+          </else>
+        </else>
+      </td>
       <td class="logger_listing_narrow">&nbsp;</td>
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
     </tr>
@@ -58,7 +82,7 @@
     <tr class="logger_listing_odd">
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
       <td class="logger_listing_narrow" colspan="3"><b>Projection</b></td>
-      <td class="logger_listing_narrow" align="right" nowrap>@projection_value@</td>
+      <td class="logger_listing_narrow" align="right" nowrap><b>@projection_value@</b></td>
       <td class="logger_listing_narrow">&nbsp;</td>
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
     </tr>
Index: openacs-4/packages/logger/www/lib/entries-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/lib/entries-table.tcl	7 May 2003 16:43:44 -0000	1.3
+++ openacs-4/packages/logger/www/lib/entries-table.tcl	8 May 2003 13:56:20 -0000	1.4
@@ -26,14 +26,9 @@
                 )"
 }
 
-db_1row select_variable_info {
-    select name,
-           unit
-    from   logger_variables
-    where  variable_id = :selected_variable_id
-} -column_array variable
-
 if { [exists_and_not_null selected_variable_id] } {
+    db_1row select_variable_info {} -column_array variable
+
     lappend where_clauses "le.variable_id = :selected_variable_id"
 }
 
@@ -53,40 +48,13 @@
     set selected_entry_id {}
 }
 
-set value_total "0"
+set value_total 0
+set value_count 0
 
-db_multirow -extend { edit_url delete_url delete_onclick user_chunk selected_p } entries select_entries "
-    select le.entry_id as id,
-           acs_permission.permission_p(le.entry_id, :user_id, 'delete') as delete_p,
-           le.time_stamp,
-           to_char(le.time_stamp, 'fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
-           le.value,
-           le.description,
-           lp.name as project_name,
-           submitter.user_id,
-           submitter.first_names || ' ' || submitter.last_name as user_name
-    from logger_entries le,
-         logger_projects lp,
-         acs_objects ao,
-         cc_users submitter
-    where le.project_id = lp.project_id
-      and ao.object_id = le.entry_id
-      and ao.creation_user = submitter.user_id
-    [ad_decode $where_clauses "" "" "and [join $where_clauses "\n    and "]"]
-    order by le.time_stamp desc, ao.creation_date desc
-" {
-    set description_max_length 50
-    if { [string length $description] > $description_max_length } {
-        set description "[string range $description 0 [expr $description_max_length - 4]]..."
-    }
-
-    set project_name_max_length 20
-    if { [string length $project_name] > $project_name_max_length } {
-        set project_name "[string range $project_name 0 [expr $project_name_max_length - 4]]..."
-    }
-
+db_multirow -extend { edit_url delete_url delete_onclick user_chunk selected_p } entries select_entries {} {
+    set description [string_truncate -len 50 $description]
+    set project_name [string_truncate -len 20 $project_name]
     set selected_p [string equal $id $selected_entry_id]
-
     set action_links_list [list]
     set edit_url "log?[export_vars { { entry_id $id } }]"
     if { $delete_p } {
@@ -99,4 +67,11 @@
     set user_chunk [ad_present_user $user_id $user_name]
 
     set value_total [expr $value_total + $value]
+    incr value_count
 }
+
+if { $value_count > 0 } {
+    set value_average [expr round(100 * $value_total / $value_count) / 100.0] }  {
+    set value_average "n/a"
+}
+
Index: openacs-4/packages/logger/www/lib/entries-table.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/lib/entries-table.xql	8 May 2003 13:56:20 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="select_variable_info">
+    <querytext>
+	    select name,
+	           unit,
+	           type
+	    from   logger_variables
+	    where  variable_id = :selected_variable_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/nav-bar.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/www/lib/nav-bar.tcl	7 May 2003 16:43:44 -0000	1.5
+++ openacs-4/packages/logger/www/lib/nav-bar.tcl	8 May 2003 13:56:20 -0000	1.6
@@ -11,7 +11,7 @@
 set link_list {}
 
 # Log entries page
-set index_urls [list "${package_url}" "${package_url}index"]
+set index_urls [list "${package_url}" "${package_url}."]
 lappend link_list $index_urls
 lappend link_list {}
 lappend link_list "List"
@@ -45,7 +45,11 @@
         }
     }
 
-    multirow append links $label "$url?[export_vars $param_list]" $selected_p
+    if { ![empty_string_p $param_list] } {
+        append url "?[export_vars $param_list]"
+    }
+
+    multirow append links $label $url $selected_p
 }
 
 ad_return_template