Fixed api2 quota bug

thirdpart/seaserv/__init__.py

@@ -2,7 +2,9 @@
 import service
 from service import ccnet_rpc, monitor_rpc, seafserv_rpc, \
     seafserv_threaded_rpc, ccnet_threaded_rpc
-from service import send_command, check_quota, web_get_access_token, unset_repo_passwd
+from service import send_command, check_quota, web_get_access_token, \
+    unset_repo_passwd, get_user_quota_usage, get_user_share_usage, \
+    get_user_quota
 from service import get_emailusers, count_emailusers, get_session_info
 from service import get_org_groups, get_personal_groups_by_user, \
     get_group_repoids, get_personal_groups, list_share_repos, remove_share, \

thirdpart/seaserv/service.py

@@ -34,6 +34,7 @@ Commit:
 
 from datetime import datetime
 import json
+import logging
 import os
 import sys
 import ConfigParser
@@ -144,6 +145,9 @@ CALC_SHARE_USAGE = False
 if config.has_option('quota', 'calc_share_usage'):
     CALC_SHARE_USAGE = config.getboolean('quota', 'calc_share_usage')
 
+# Get an instance of a logger
+logger = logging.getLogger(__name__)
+
 #### Basic ccnet API ####
 
 def get_emailusers(start, limit):
@@ -860,8 +864,33 @@ def check_quota(repo_id):
     try:
         ret = seafserv_threaded_rpc.check_quota(repo_id)
     except SearpcError, e:
+        logger.error(e)
         ret = -1
     return ret
+
+def get_user_quota(user):
+    try:
+        ret = seafserv_threaded_rpc.get_user_quota(user)
+    except SearpcError, e:
+        logger.error(e)
+        ret = 0
+    return ret
+
+def get_user_quota_usage(user):
+    try:
+        ret = seafserv_threaded_rpc.get_user_quota_usage(user)
+    except SearpcError, e:
+        logger.error(e)
+        ret = 0
+    return ret
+
+def get_user_share_usage(user):
+    try:
+        ret = seafserv_threaded_rpc.get_user_share_usage(user)
+    except SearpcError, e:
+        logger.error(e)
+        ret = 0
+    return ret
     
 # access token
 def web_get_access_token(repo_id, obj_id, op, username):