Overhaul everything to get consistent error reports.

[mailshears.git] / lib / common / davical_plugin.rb

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index 8c9646f2cf95f8fb48198cd1f71927c276856974..557c1dd1b3bf18e012cdf234e6400b05d4de7925 100644 (file)
--- a/lib/common/davical_plugin.rb
+++ b/lib/common/davical_plugin.rb
@@ -1,4 +1,5 @@
 require 'common/plugin'
+require 'common/user'
 
 module DavicalPlugin
   # Code that all Davical plugins (Prune, Rm, Mv...) will share.  That
@@ -18,7 +19,7 @@ module DavicalPlugin
 
   def describe_domain(domain)
     # DAViCal doesn't have a concept of domains.
-    return domain
+    return domain.to_s()
   end
 
 
@@ -62,7 +63,7 @@ module DavicalPlugin
       raise DatabaseError.new(e)
     end
 
-    return usernames
+    return usernames.map{ |u| User.new(u) }
   end
 
 
@@ -85,7 +86,7 @@ module DavicalPlugin
       sql_query += "      ON principal.user_no = usr.user_no) "
       sql_query += "WHERE usr.username = $1;"
 
-      connection.query(sql_query, [user]) do |result|
+      connection.query(sql_query, [user.to_s()]) do |result|
         if result.num_tuples > 0
           principal_id = result[0]['principal_id']
         end