X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears%2Fplugins%2Fdavical.rb;h=0c63ee2f60da764a1d10fbdc42ca354a2c2f2f07;hp=8f6be66959da76d31d6a0e2b26db59ecd613a6f5;hb=566f5fe84f82bb26e86b0902d65fc89693e9d813;hpb=95418256aafd4166ff4791f4aa3f25a8c3b6e556

diff --git a/lib/mailshears/plugins/davical.rb b/lib/mailshears/plugins/davical.rb
index 8f6be66..0c63ee2 100644
--- a/lib/mailshears/plugins/davical.rb
+++ b/lib/mailshears/plugins/davical.rb
@@ -1,7 +1,10 @@
 require 'pg'
 
 class DavicalDb
-
+  #
+  # DAViCal only supports Postgres, so even if we ever are
+  # database-agnostic, this plugin can't be.
+  #
   include Plugin
 
   def initialize()
@@ -23,12 +26,12 @@ class DavicalDb
 
 
   def describe_account(account)
-    user_id = self.get_principal_id(account)
+    principal_id = self.get_principal_id(account)
 
-    if user_id.nil?
+    if principal_id.nil?
       return 'User not found'
     else
-      return "Principal ID: #{user_id}"
+      return "Principal ID: #{principal_id}"
     end
   end
 
@@ -94,7 +97,10 @@ class DavicalDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT principal_id FROM users WHERE username = $1;"
+      sql_query =  "SELECT principal.principal_id "
+      sql_query += "FROM (principal INNER JOIN usr "
+      sql_query += "      ON principal.user_no = usr.user_no) "
+      sql_query += "WHERE usr.username = $1;"
 
       connection.query(sql_query, [account]) do |result|
         if result.num_tuples > 0
@@ -116,7 +122,6 @@ class DavicalDb
   def get_davical_usernames()
     usernames = []
 
-    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -126,7 +131,8 @@ class DavicalDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query  = 'SELECT username FROM usr;'
+      # User #1 is the super-user, and not tied to an email address.
+      sql_query  = 'SELECT username FROM usr WHERE user_no > 1;'
 
       connection.query(sql_query) do |result|
         usernames = result.field_values('username')