X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fdavical_plugin.rb;h=cd34a982529f70c09e156567e34cbcab97b7fc8e;hp=8c9646f2cf95f8fb48198cd1f71927c276856974;hb=650e23790019880da91c7c7248a214a13763fd3e;hpb=bf7d0402eda27d9487ca9402156818545fdda286

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index 8c9646f..cd34a98 100644
--- 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
@@ -16,20 +17,9 @@ module DavicalPlugin
   end
 
 
-  def describe_domain(domain)
-    # DAViCal doesn't have a concept of domains.
-    return domain
-  end
-
-
   def describe_user(user)
     principal_id = self.get_principal_id(user)
-
-    if principal_id.nil?
-      return 'User not found'
-    else
-      return "Principal ID: #{principal_id}"
-    end
+    return "Principal ID: #{principal_id}"
   end
 
 
@@ -62,7 +52,7 @@ module DavicalPlugin
       raise DatabaseError.new(e)
     end
 
-    return usernames
+    return usernames.map{ |u| User.new(u) }
   end
 
 
@@ -85,7 +75,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