Index: openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl,v
diff -u -r1.2 -r1.2.16.1
--- openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl	13 Jan 2005 13:54:41 -0000	1.2
+++ openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl	8 Sep 2014 07:24:34 -0000	1.2.16.1
@@ -9,7 +9,53 @@
 # Only run this if this is openacs.org
 #ad_schedule_proc -thread t -schedule_proc ns_schedule_daily [list 0 0] apm_build_repository
 
+# we register the following filters only during startup, since
+# existing connection threads are not aware of the throttle object.
 
+if {[ns_server connections] == 0} {
+  # 
+  # Register the filter progs for url statistics.
+  # The methods to be called have the name of the filter type.
+  #
+  ns_register_filter trace GET /repository/* repository-download
 
+  if {[info commands ::xo::db::require] ne ""} {
+      ::xo::db::require table apm_package_downloads \
+	  "time     timestamp,
+           ip       text,
+           user_id  integer,
+           channel  text, 
+           package  text,
+           version  text,
+           url      text"
 
+      ad_proc ::repository_log_to_db {} {
+	  set ip [ns_conn peeraddr]
+	  set user_id [ad_conn user_id]
+	  set url [ns_conn url]
+	  if {[regexp {^/repository/([^/]+)/(.*)-([^-]+).apm$} [ns_conn url] _ channel package version]} {
+	      ::xo::dc dml record_package_download \
+		  "insert into apm_package_downloads(time, ip, user_id, channel, package, version, url) \
+                   values (now(), :ip, :user_id, :channel, :package, :version, :url)"
+	  }
+      }
+  }
 
+  ad_proc ::repository-download {args} {
+  } {
+      ns_log notice "::repository-download called with <$args> [ad_conn user_id] <[ns_conn url]> [ns_conn peeraddr]"
+      set f [open $::acs::rootdir/log/apm.log a]
+      puts $f "[clock format [clock seconds]]\t[ns_conn peeraddr]\t[ad_conn user_id]\t[ns_conn url]"
+      close $f
+      if {[catch {::repository_log_to_db} errorMsg]} {
+	  ns_log error "repository-download: $errorMsg"
+      }
+      return filter_ok
+  }
+
+
+}
+
+
+
+
Index: openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl,v
diff -u -r1.7 -r1.7.8.1
--- openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	13 Feb 2009 22:13:06 -0000	1.7
+++ openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	8 Sep 2014 07:24:35 -0000	1.7.8.1
@@ -67,10 +67,10 @@
     is assumed that the caller will be pulling the existing values out of
     the database before editing them.
 
-    @extlink_id Optional pre-assigned object_id for the link
-    @url The URL of the external resource
-    @label Label for the extlink (defaults to the URL)
-    @description An extended description of the link (defaults to NULL)
+    @param extlink_id Optional pre-assigned object_id for the link
+    @param url The URL of the external resource
+    @param label Label for the extlink (defaults to the URL)
+    @param description An extended description of the link (defaults to NULL)
 } {
 
     set modifying_user [ad_conn user_id]
@@ -113,7 +113,7 @@
 } {
     Returns the name of an extlink
 
-    @item_id  The object id of the item to check.
+    @param item_id  The object id of the item to check.
 } {
     return [db_string get {}]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl,v
diff -u -r1.7.16.1 -r1.7.16.2
--- openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	30 Sep 2013 17:44:27 -0000	1.7.16.1
+++ openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	8 Sep 2014 07:24:35 -0000	1.7.16.2
@@ -69,7 +69,6 @@
 } {
     @param template_id
     @param root_folder_id
-    @throws -20000: Invalid item ID: %'', get_path__item_id;
 
     @return "/" delimited path from root to supplied template_id
 } {
Index: openacs-4/packages/acs-content-repository/tcl/extlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/extlink-procs.tcl,v
diff -u -r1.10 -r1.10.8.1
--- openacs-4/packages/acs-content-repository/tcl/extlink-procs.tcl	13 Feb 2009 22:13:06 -0000	1.10
+++ openacs-4/packages/acs-content-repository/tcl/extlink-procs.tcl	8 Sep 2014 07:24:35 -0000	1.10.8.1
@@ -23,13 +23,13 @@
 
     @see content::extlink::new
 
-    @extlink_id Optional pre-assigned object_id for the link
-    @url The URL of the external resource
-    @parent_id The folder that will contain this extlink
-    @name Name to assign the object (defaults to "link extlink_id")
-    @label Label for the extlink (defaults to the URL)
-    @description An extended description of the link (defaults to NULL)
-    @package_id Package Id of the package that created the link
+    @param extlink_id Optional pre-assigned object_id for the link
+    @param url The URL of the external resource
+    @param parent_id The folder that will contain this extlink
+    @param name Name to assign the object (defaults to "link extlink_id")
+    @param label Label for the extlink (defaults to the URL)
+    @param description An extended description of the link (defaults to NULL)
+    @param package_id Package Id of the package that created the link
 
 } {
 
@@ -55,10 +55,10 @@
     is assumed that the caller will be pulling the existing values out of
     the database before editing them.
 
-    @extlink_id Optional pre-assigned object_id for the link
-    @url The URL of the external resource
-    @label Label for the extlink (defaults to the URL)
-    @description An extended description of the link (defaults to NULL)
+    @param extlink_id Optional pre-assigned object_id for the link
+    @param url The URL of the external resource
+    @param label Label for the extlink (defaults to the URL)
+    @param description An extended description of the link (defaults to NULL)
 
     @see content::extlink::edit
 } {
@@ -79,7 +79,7 @@
     Delete an external link.
     @see content::extlink::delete
 
-    @extlink_id  The object id of the link to delete
+    @param extlink_id  The object id of the link to delete
 
 } {
     db_exec_plsql extlink_delete {}
@@ -92,7 +92,7 @@
     Returns true if the given item is an external link.
 
     @see content::extlink::is_extlink
-    @extlink_id  The object id of the item to check.
+    @param extlink_id  The object id of the item to check.
 
 } {
     return [db_string extlink_check {}]
@@ -104,7 +104,7 @@
 
     Returns the name of an extlink
 
-    @item_id  The object id of the item to check.
+    @param item_id  The object id of the item to check.
 
     @see content::extlink::name
 } {
Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	1 Oct 2010 15:23:23 -0000	1.9
+++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	8 Sep 2014 07:24:35 -0000	1.9.4.1
@@ -358,7 +358,7 @@
     Get the item_id of a resized version of an image
     
     @param item_id Original image item_id
-    @size_name Name of the size to get
+    @param size_name Name of the size to get
 
     @author Dave Bauer (dave@solutiongrove.com)
     @creation-date 2006-08-27
Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v
diff -u -r1.30.4.5 -r1.30.4.6
--- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	13 Oct 2013 14:25:22 -0000	1.30.4.5
+++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	8 Sep 2014 07:24:35 -0000	1.30.4.6
@@ -308,8 +308,8 @@
 } {
     @param image_sql Optional SQL to extend the base image type
     @param other_sql Optional SQL to extend the base content revision type
-    @mime_type Mime type of the new revision
-    @revision_id The revision we're setting live
+    @param mime_type Mime type of the new revision
+    @param revision_id The revision we're setting live
 
     If provided execute the appropriate SQL in the caller's context, then
     set the given revision live.
@@ -334,7 +334,7 @@
 } {
     Return the type registered for this mime type.
 
-    @mime_type param The mime type
+    @param mime_type param The mime type
 } {
     return [db_string registered_type_for_mime_type "" -default ""]
 }
Index: openacs-4/packages/acs-content-repository/tcl/symlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/symlink-procs.tcl,v
diff -u -r1.6 -r1.6.10.1
--- openacs-4/packages/acs-content-repository/tcl/symlink-procs.tcl	10 Jan 2007 21:22:03 -0000	1.6
+++ openacs-4/packages/acs-content-repository/tcl/symlink-procs.tcl	8 Sep 2014 07:24:35 -0000	1.6.10.1
@@ -20,13 +20,13 @@
 
     Create a new internal link.
 
-    @symlink_id Optional pre-assigned object_id for the link
-    @target_id The item_id of the target of the link
-    @parent_id The folder that will contain this symlink
-    @name Name to assign the object (defaults to the name of the target item)
-    @label Label for the symlink (defaults to the URL)
-    @description An extended description of the link (defaults to NULL)
-    @package_id Package Id of the package that created the link
+    @param symlink_id Optional pre-assigned object_id for the link
+    @param target_id The item_id of the target of the link
+    @param parent_id The folder that will contain this symlink
+    @param name Name to assign the object (defaults to the name of the target item)
+    @param label Label for the symlink (defaults to the URL)
+    @param description An extended description of the link (defaults to NULL)
+    @param package_id Package Id of the package that created the link
     @see content::symlink::new
 
 } {
@@ -52,10 +52,10 @@
     is assumed that the caller will be pulling the existing values out of
     the database before editing them.
 
-    @symlink_id Optional pre-assigned object_id for the link
-    @target_id The target item_id of the link
-    @label Label for the symlink (defaults to the target_id item title)
-    @description An extended description of the link (defaults to NULL)
+    @param symlink_id Optional pre-assigned object_id for the link
+    @param target_id The target item_id of the link
+    @param label Label for the symlink (defaults to the target_id item title)
+    @param description An extended description of the link (defaults to NULL)
 
 } {
 
@@ -75,7 +75,7 @@
 
     Delete an external link.
 
-    @symlink_id  The object id of the link to delete
+    @param symlink_id  The object id of the link to delete
     @see content::symlink::delete
 
 } {
@@ -88,7 +88,7 @@
 
     Returns true if the given item is a symlink
 
-    @symlink_id  The object id of the item to check.
+    @param symlink_id  The object id of the item to check.
     @see content::symlink::is_symlink
 
 } {
@@ -101,7 +101,7 @@
 
     Returns the name of an symlink
 
-    @item_id  The object id of the item to check.
+    @param item_id  The object id of the item to check.
 
 } {
     return [db_string symlink_name {}]
Index: openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl,v
diff -u -r1.5.6.1 -r1.5.6.2
--- openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl	18 Aug 2014 20:25:01 -0000	1.5.6.1
+++ openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl	8 Sep 2014 07:27:43 -0000	1.5.6.2
@@ -153,7 +153,7 @@
 
     @param assessment_id Assessment to attach question to
     @param section_id Section the question is in
-    @oaram as_item_id Item object this multiple choice belongs to
+    @param as_item_id Item object this multiple choice belongs to
     @param title Title of question/choice set for question library
     @param after Add this question after the queston number in the section
 
@@ -190,4 +190,4 @@
             -section_id $section_id \
             -as_item_id $as_item_id \
             -after $after
-}
\ No newline at end of file
+}
Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v
diff -u -r1.25.2.2 -r1.25.2.3
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	18 Aug 2014 20:27:50 -0000	1.25.2.2
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	8 Sep 2014 07:27:44 -0000	1.25.2.3
@@ -499,7 +499,7 @@
     @param correct_choices List in array get format of choice number/t. Elements appear in this list if choice number is one of the correct choices
     @param assessment_id Assessment to attach question to
     @param section_id Section the question is in
-    @oaram as_item_id Item object this multiple choice belongs to
+    @param as_item_id Item object this multiple choice belongs to
     @param title Title of question/choice set for question library
     @param after Add this question after the queston number in the section
 
@@ -753,4 +753,4 @@
     set display_type [string range $display_type [string length $display_type]-2 end]
 
     return [string map {rb radio cb checkbox sb selet} $display_type]
-}
\ No newline at end of file
+}
Index: openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl,v
diff -u -r1.20.4.1 -r1.20.4.2
--- openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl	18 Aug 2014 20:25:01 -0000	1.20.4.1
+++ openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl	8 Sep 2014 07:27:44 -0000	1.20.4.2
@@ -203,7 +203,7 @@
 
     @param assessment_id Assessment to attach question to
     @param section_id Section the question is in
-    @oaram as_item_id Item object this multiple choice belongs to
+    @param as_item_id Item object this multiple choice belongs to
     @param title Title of question/choice set for question library
     @param after Add this question after the queston number in the section
 
@@ -246,4 +246,4 @@
         -section_id $section_id \
         -after $after
 
-}
\ No newline at end of file
+}
Index: openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl,v
diff -u -r1.16.6.1 -r1.16.6.2
--- openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl	18 Aug 2014 20:25:02 -0000	1.16.6.1
+++ openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl	8 Sep 2014 07:27:44 -0000	1.16.6.2
@@ -166,7 +166,7 @@
 
     @param assessment_id Assessment to attach question to
     @param section_id Section the question is in
-    @oaram as_item_id Item object this multiple choice belongs to
+    @param as_item_id Item object this multiple choice belongs to
     @param title Title of question/choice set for question library
     @param after Add this question after the queston number in the section
 
@@ -206,4 +206,4 @@
             -assessment_id $assessment_id \
             -section_id $section_id \
             -after $after
-}
\ No newline at end of file
+}