X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fdavical_plugin.rb;h=363e08ef298cfc402aaf051ad486fedd3f553323;hp=557c1dd1b3bf18e012cdf234e6400b05d4de7925;hb=20b843bddcd73833d41f98ff79d92ef59bb4d81e;hpb=f819b178c5c1cb8adda0182c610e5c52fad8bea7

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index 557c1dd..363e08e 100644
--- a/lib/common/davical_plugin.rb
+++ b/lib/common/davical_plugin.rb
@@ -17,20 +17,9 @@ module DavicalPlugin
   end
 
 
-  def describe_domain(domain)
-    # DAViCal doesn't have a concept of domains.
-    return domain.to_s()
-  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
 
 
@@ -41,28 +30,18 @@ module DavicalPlugin
     #
     usernames = []
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-      # User #1 is the super-user, and not tied to an email address.
-      sql_query =  "SELECT username FROM usr WHERE user_no > 1"
+    # 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')
-      end
-
-      connection.close()
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+    connection.query(sql_query) do |result|
+      usernames = result.field_values('username')
     end
 
+    connection.close()
+
     return usernames.map{ |u| User.new(u) }
   end
 
@@ -72,33 +51,22 @@ module DavicalPlugin
   def get_principal_id(user)
     principal_id = nil
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      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, [user.to_s()]) do |result|
-        if result.num_tuples > 0
-          principal_id = result[0]['principal_id']
-        end
-      end
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-      connection.close()
+    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;'
 
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+    connection.query(sql_query, [user.to_s()]) do |result|
+      if result.num_tuples > 0
+        principal_id = result[0]['principal_id']
+      end
     end
 
+    connection.close()
+
     return principal_id
   end