From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 19 Mar 2013 15:56:04 +0000 (-0400)
Subject: Add a missing space in the header.
X-Git-Tag: 0.0.1~94
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=566f5fe84f82bb26e86b0902d65fc89693e9d813;p=mailshears.git

Add a missing space in the header.
One more try at retrieving the DAViCal principal_id.
---

diff --git a/bin/mailshears b/bin/mailshears
index c033f5e..5d1c798 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -73,7 +73,7 @@ Plugin.includers.each do |plugin_class|
       header += current_time.to_s
     end
 
-    header += '(Plugin: ' + plugin_class.to_s + ")\n"
+    header += ' (Plugin: ' + plugin_class.to_s + ")\n"
     puts header
     puts '-' * header.size # Underline the header.
 
diff --git a/lib/mailshears/plugins/davical.rb b/lib/mailshears/plugins/davical.rb
index fae30d8..0c63ee2 100644
--- a/lib/mailshears/plugins/davical.rb
+++ b/lib/mailshears/plugins/davical.rb
@@ -26,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
 
@@ -97,7 +97,10 @@ class DavicalDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT principal_id FROM principal 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