Index: openacs-4/packages/xolp/tcl/xolp-apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xolp/tcl/xolp-apm-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/xolp/tcl/xolp-apm-procs.tcl	11 Apr 2019 11:32:04 -0000	1.3
+++ openacs-4/packages/xolp/tcl/xolp-apm-procs.tcl	11 Apr 2019 16:28:34 -0000	1.4
@@ -63,22 +63,32 @@
   }
 
   ad_proc -private ::xolp::apm::before_uninstall {} {
+    # drop functions
     ::xo::dc dml drop "DROP FUNCTION IF EXISTS xolp_activity_dimension__upsert(TEXT, TEXT, INTEGER, TEXT, INTEGER, TIMESTAMP WITH TIME ZONE)"
+    ::xo::dc dml drop "DROP FUNCTION IF EXISTS xolp_weighted_result(INTEGER, TEXT, TEXT, TEXT)"
+    ::xo::dc dml drop "DROP FUNCTION IF EXISTS xolp_weighted_competency_result(INTEGER, TEXT, TEXT, TEXT, TEXT)"
+    ::xo::dc dml drop "DROP FUNCTION IF EXISTS xolp_compare_array_as_set(anyarray,anyarray)"
+    
+    # drop tables
     ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_activity_hierarchy_bridge CASCADE"
     ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_indicator_facts CASCADE"
-    # TODO: Review order of deletions of competency-tables
-    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_hierarchy_bridge CASCADE"
-    #::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_dimension CASCADE"
-    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_set_bridge CASCADE"
-    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_set_dimension CASCADE"
-    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_evalscale_activity_bridge CASCADE"
     ::xo::dc dml drop "DROP VIEW IF EXISTS xolp_begin_date_dimension CASCADE"
     ::xo::dc dml drop "DROP VIEW IF EXISTS xolp_end_date_dimension CASCADE"
     ::xo::dc dml drop "DROP VIEW IF EXISTS xolp_begin_time_dimension CASCADE"
     ::xo::dc dml drop "DROP VIEW IF EXISTS xolp_end_time_dimension CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_hierarchy_bridge CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_activity_competency_bridge CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_evalscale_competency_bridge CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_set_bridge CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_competency_set_dimension CASCADE"
+    ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_evalscale_activity_bridge CASCADE"
     ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_time_dimension CASCADE"
     ::xo::dc dml drop "DROP TABLE IF EXISTS xolp_date_dimension CASCADE"
-
+    
+    # triggers
+    ::xo::dc dml drop "DROP FUNCTION IF EXISTS xolp_indicator_upsert_tr()"
+    
+    
     set classes {
       ::xolp::Activity ::xolp::EvaluationScale ::xolp::EvaluationSchema
       ::xolp::ActivityVerb ::xolp::ActivityType ::xolp::Competency
Index: openacs-4/packages/xolp/tcl/xolp-competency-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xolp/tcl/xolp-competency-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xolp/tcl/xolp-competency-procs.tcl	11 Apr 2019 15:36:54 -0000	1.5
+++ openacs-4/packages/xolp/tcl/xolp-competency-procs.tcl	11 Apr 2019 16:28:34 -0000	1.6
@@ -5,7 +5,7 @@
   @creation-date 2017
 }
 
-::xo::library require xolp-indicator-procs
+#::xo::library require xolp-indicator-procs
 
 namespace eval ::xolp {
 
Index: openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl	11 Apr 2019 11:32:04 -0000	1.7
+++ openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl	11 Apr 2019 16:28:34 -0000	1.8
@@ -9,6 +9,7 @@
 ::xo::library require xolp-activity-procs
 ::xo::library require xolp-date-procs
 ::xo::library require xolp-time-procs
+::xo::library require xolp-competency-procs
 
 namespace eval ::xolp {