Merge lp:~pratyush-nigam/sahana-eden/savesearch into lp:sahana-eden

[Pratyush Nigam]

[lp:~pratyush-nigam/sahana-eden/savesearch]

2384. By Pratyush Nigam on 2011-07-31

removed the 80 characters in a single line

2385. By Pratyush Nigam on 2011-08-10

Merging

2386. By Pratyush Nigam on 2011-08-10

Merging

2387. By Pratyush Nigam on 2011-08-10

Removed some of the persisting errors

2388. By Pratyush Nigam on 2011-08-11

Started work on getting updates for the saved searches

2389. By Pratyush Nigam on 2011-08-11

Merging

2390. By Pratyush Nigam on 2011-08-12

Changes to find updates for the user who are subscribed to the saved searches
Work in Progress

2391. By Pratyush Nigam on 2011-08-12

Merging

2392. By Pratyush Nigam on 2011-08-13

Got the subscription update part working to some extent.

2393. By Pratyush Nigam on 2011-08-13

Merging

2394. By Pratyush Nigam on 2011-08-14

Changes made to implement the subscription sending feature

2395. By Pratyush Nigam on 2011-08-14

Merging

2396. By Pratyush Nigam on 2011-08-14

Made some changes with respect to what gets displayed in the Search Criteria Column

2397. By Pratyush Nigam on 2011-08-14

Changes made to send subscription emails, email formatting and cronjob settings left

2398. By Pratyush Nigam on 2011-08-14

Email Formatting Improved and Cron jobs are set

2399. By Pratyush Nigam on 2011-08-15

Merging and Customized the saved searches tab

2400. By Pratyush Nigam on 2011-08-15

Merging

[Michael Howden (michael-howden)]

review: Approve

[lp:~pratyush-nigam/sahana-eden/savesearch]

2401. By Pratyush Nigam on 2011-08-18

Code Documenting

2402. By Pratyush Nigam on 2011-08-19

Conflict removed and Merging

[Michael Howden (michael-howden)]

review: Needs Fixing

[lp:~pratyush-nigam/sahana-eden/savesearch]

2403. By Pratyush Nigam on 2011-08-19

Implemented the suggested changes

2404. By Pratyush Nigam on 2011-08-19

Merging

2405. By Pratyush Nigam on 2011-08-20

Playing with crud string

2406. By Pratyush Nigam on 2011-08-20

Made changes to rectify the errors in search criteria

2407. By Pratyush Nigam on 2011-08-20

Merging

2408. By Pratyush Nigam on 2011-08-20

Made changes to format email
---------- This line and the following will be ignored --------------

modified:
  controllers/msg.py
  controllers/pr.py

2409. By Pratyush Nigam on 2011-08-20

Merging

=== modified file 'controllers/msg.py'
--- controllers/msg.py	2011-08-06 18:24:53 +0000
+++ controllers/msg.py	2011-08-20 19:52:33 +0000
@@ -850,6 +850,136 @@
     return items
 
 
+# -----------------------------------------------------------------------------
+def subscription():
+    resourcename = "subscription"
+    #form for the subscrption preferences of the user
+    return s3_rest_controller(module, resourcename)
+
+
+# -----------------------------------------------------------------------------
+def load_search(id):
+    var = {}
+    var["load"] = id
+    s3mgr.load("pr_save_search")
+    rows = db(db.pr_save_search.id == id).select(db.pr_save_search.ALL)
+    import cPickle
+    for row in rows:
+        search_vars = cPickle.loads(row.search_vars)
+        prefix = str(search_vars["prefix"])
+        function = str(search_vars["function"])
+        date = str(row.modified_on)
+        break
+    field = "%s.modified_on__gt" %(function)
+    date = date.replace(" ","T")
+    date = date + "Z"
+    var[field] = date
+    #var["transform"] = "eden/static/formats/xml/import.xsl"
+    r = current.manager.parse_request(prefix, 
+                                      function, 
+                                      args=["search"], 
+                                      #extension="xml", 
+                                      get_vars=Storage(var) 
+                                     )
+    #redirect(URL(r=request, c=prefix, f=function, args=["search"],vars=var))
+    response.s3.no_sspag=True
+    output = r()
+    #extract the updates
+    return output
+
+
+# -----------------------------------------------------------------------------
+def get_criteria(id):
+        s = ""
+        try:
+            id = id.replace("'","'")
+            search_vars = cPickle.loads(id)
+            s = "<p>"
+            pat = '_'
+            for var in search_vars.iterkeys():
+                if var == "criteria" :
+                    c_dict = search_vars[var]
+                    #s = s + crud_string("pr_save_search", "Search Criteria")
+                    for j in c_dict.iterkeys():
+                        if not re.match(pat,j):
+                            st = str(j)
+                            st = st.replace("_search_"," ")
+                            st = st.replace("_advanced","")
+                            st = st.replace("_simple","")
+                            st = st.replace("text","text matching")
+                            """st = st.replace(search_vars["function"],"")
+                            st = st.replace(search_vars["prefix"],"")"""
+                            st = st.replace("_"," ")
+                            s = "%s <b> %s </b>: %s <br />" %(s, st.capitalize(), str(c_dict[j]))
+                elif var == "simple" or var == "advanced":
+                    continue
+                else:
+                    if var == "function":
+                        v1 = "Resource Name"
+                    elif var == "prefix":
+                        v1 = "Module"
+                    s = "%s<b>%s</b>: %s<br />" %(s, v1, str(search_vars[var]))
+            s = s + "</p>"        
+            return s
+        except:
+            return s
+
+
+# -----------------------------------------------------------------------------
+def check_updates(user_id):
+    #Check Updates for all the Saved Searches Subscribed by the User
+    message = "<h2>Saved Searches' Update</h2>"
+    flag = 0
+    s3mgr.load("pr_save_search")
+    rows = db(db.pr_save_search.user_id == user_id).select(db.pr_save_search.ALL)
+    for row in rows :
+        if row.subscribed:
+            records = load_search(row.id)
+            #message = message + "<b>" + get_criteria(row.id) + "</b>"
+            if str(records["items"]) != "No Matching Records":
+                message = message + str(records["items"]) + "<br />" #Include the Saved Search details
+                flag = 1                
+            db.pr_save_search[row.id] = dict(modified_on = request.utcnow)
+    if flag == 0:
+        return
+    else:
+        return XML(message)
+
+
+# -----------------------------------------------------------------------------
+def subscription_messages():
+    
+    subs = None
+    if request.args[0] == "daily":
+        subs = db(db.msg_subscription.subscription_frequency == "daily").select(
+                                                                                db.msg_subscription.ALL)
+    if request.args[0] == "weekly":
+        subs = db(db.msg_subscription.subscription_frequency=="weekly").select(
+                                                                               db.msg_subscription.ALL)
+    if request.args[0] == "monthly":
+        subs = db(db.msg_subscription.subscription_frequency=="monthly").select(
+                                                                                db.msg_subscription.ALL)
+    if subs:    
+        for sub in subs:
+            #check if the message is not empty
+            message = check_updates(sub.user_id)
+            if message == None:
+                return
+            person_id = auth.s3_user_to_person(sub.user_id)
+            rows = db(db.pr_person.id == person_id).select(db.pr_person.ALL)
+            for row in rows:
+                pe_id = row.pe_id
+                break
+            msg.send_by_pe_id(pe_id,
+                              subject="Subscription Updates",
+                              message=message,
+                              sender_pe_id = None,
+                              pr_message_method = "EMAIL",
+                              sender="[e-mail]",
+                              fromaddress="[e-mail]")
+    return
+
+
 # =============================================================================
 # Enabled only for testing:
 #
@@ -870,5 +1000,4 @@
     return s3_rest_controller(module, resourcename)
 
 
-# END =========================================================================
-
+# END ================================================================================

=== modified file 'controllers/pr.py'
--- controllers/pr.py	2011-08-16 16:10:39 +0000
+++ controllers/pr.py	2011-08-20 19:52:33 +0000
@@ -4,6 +4,7 @@
     VITA Person Registry, Controllers
 
     @author: nursix
+    @author: Pratyush Nigam <[e-mail]>
     @see: U{http://eden.sahanafoundation.org/wiki/BluePrintVITA}
 """
 
@@ -108,6 +109,8 @@
 
     # Load Model
     s3mgr.load("pr_address")
+    s3mgr.load("pr_save_search")
+    s3mgr.load("msg_subscription")  
 
     # Handle Personalised Map Configs
     gis_config_form_setup()
@@ -146,8 +149,67 @@
                 r.table.volunteer.writable = True
 
         return True
-
+    
+    def postp(r, output):
+        if r.component_name == "save_search":
+            # Handle Subscribe/Unsubscribe requests
+            if "subscribe" in r.get_vars:
+                save_search_id = r.get_vars.get("subscribe", None)
+                db.pr_save_search[save_search_id] = dict(subscribed = True)
+            if "unsubscribe" in r.get_vars:
+                save_search_id = r.get_vars.get("unsubscribe", None)
+                db.pr_save_search[save_search_id] = dict(subscribed = False)
+                
+            s3_action_buttons(r)
+            rows = db(db.pr_save_search.subscribed == False).select(
+                                                                    db.pr_save_search.id)
+            restrict_s = [str(row.id) for row in rows]
+            rows = db(db.pr_save_search.subscribed == True).select(
+                                                                   db.pr_save_search.id)
+            restrict_u = [str(row.id) for row in rows]
+            response.s3.actions = \
+            response.s3.actions + [
+                                   dict(label=str(T("Load Search")), _class="action-btn",
+                                        url=str(URL(r=request,
+                                                    f="load_search",
+                                                    args=["[id]"]                                                    
+                                                    ),
+                                                )
+                                        )
+                                   ]
+            vars = {}
+            #vars["person.uid"] = r.uid
+            vars["subscribe"] = "[id]"
+            response.s3.actions.append(
+                                       dict(label=str(T("Subscribe")), _class="action-btn",
+                                            url = str( URL(r = request,
+                                                           f = "person",
+                                                           args = [s3_logged_in_person(),
+                                                                   "save_search"
+                                                                   ],
+                                                           vars = vars)),
+                                                           restrict = restrict_s
+                                            )                                   
+                                       )
+            var = {}
+            #var["person.uid"] = r.uid
+            var["unsubscribe"] = "[id]"
+            response.s3.actions.append(
+                                       dict(label=str(T("Unsubscribe")), _class="action-btn",
+                                            url = str( URL(r = request,
+                                                           f = "person",
+                                                           args = [s3_logged_in_person(),
+                                                                   "save_search",
+                                                                   ],
+                                                           vars = var)),
+                                                           restrict = restrict_u
+                                            )                                   
+                                       )
+            
+        return output
+        
     response.s3.prep = prep
+    response.s3.postp = postp
 
     s3mgr.configure("pr_group_membership",
                     list_fields=["id",
@@ -179,10 +241,10 @@
         s3mgr.model.add_component("hrm_training",
                                   pr_person="person_id")
         tabs.append((T("Training"), "training"))
-
     # Configuration tabs
     tabs = tabs + [(T("Subscriptions"), "pe_subscription"),
                    (T("Saved Searches"), "save_search"),
+                   (T("Subscription Details"), "subscription"),
                    (T("Map Settings"), "config")]
 
     s3mgr.configure("pr_person", listadd=False, insertable=True)
@@ -539,67 +601,6 @@
     form2 = SQLFORM(persons, record, _id="form2", _action=("%s/%s" % (myUrl, perID2)))
     return dict(form1=form1, form2=form2, perID1=perID1, perID2=perID2)
 
-#------------------------------------------------------------------------------
-#UI for Saved Searches
-#
-def save_search():
-
-    if not auth.is_logged_in():
-        redirect(URL(f="index") )
-    else :
-        module = "pr"
-        resourcename = "save_search"
-        tablename = "%s_%s" % (module, resourcename)
-        s3mgr.load(tablename)
-        table = db[tablename]
-
-        if "subscribe" in request.args:
-            rows = db(db.pr_save_search.id == request.args[0]).select(
-                                                                      db.pr_save_search.ALL)
-            for row in rows:
-            #process subscribe/un-subscribe action
-                if str(row.id) in request.args:
-                        if row.subscribed:
-                            db.pr_save_search[row.id] = dict(subscribed = False)
-                        else:
-                            db.pr_save_search[row.id] = dict(subscribed = True)
-                        redirect(URL(f="save_search"))
-
-        def prep(r):
-            if r.interactive :
-                s3mgr.configure(tablename,
-                                insertable = False,
-                                editable = False,
-                                listadd = False,
-                                deletable = True,
-                                list_fields=["search_vars","subscribed"])
-            return True
-
-        def postp(r, output):
-            s3_action_buttons(r)
-            values = [dict(col=2, key="True", display=str(T("Yes"))),
-                      dict(col=2, key="False", display=str(T("No")))
-                      ]
-            response.s3.dataTableDisplay = values
-            response.s3.actions = \
-            response.s3.actions + [
-                                   dict(label=str(T("Load Search")), _class="action-btn",
-                                        url=URL(f="load_search",
-                                                args=["[id]"])
-                                        )
-                                   ]
-            response.s3.actions.append(
-                                   dict(label=str(T("Subscribe/Unsubscribe")), _class="action-btn",
-                                            url = str( URL(f="save_search",
-                                                           args = ["[id]", "subscribe"]))
-                                            )
-                                   )
-            return output
-
-        response.s3.prep = prep
-        response.s3.postp = postp
-        return s3_rest_controller(module, resourcename)
-
 
 #------------------------------------------------------------------------------
 #Function to redirect for loading the search
@@ -607,17 +608,16 @@
 def load_search():
     var = {}
     var["load"] = request.args[0]
-    rows = db(db.pr_save_search.id == request.args[0]).select(
-                                                               db.pr_save_search.ALL)
+    s3mgr.load("pr_save_search")
+    rows = db(db.pr_save_search.id == request.args[0]).select(db.pr_save_search.ALL)
+    import cPickle
     for row in rows:
         search_vars = cPickle.loads(row.search_vars)
         prefix = str(search_vars["prefix"])
         function = str(search_vars["function"])
         break
-    redirect(URL(prefix,function, args=["search"],
-                 vars=var))
+    redirect(URL(r=request, c=prefix, f=function, args=["search"],vars=var))    
     return
 
 
-# END =========================================================================
-
+# END =========================================================================
\ No newline at end of file

=== modified file 'deployment-templates/cron/crontab'
--- deployment-templates/cron/crontab	2011-07-08 22:55:36 +0000
+++ deployment-templates/cron/crontab	2011-08-20 19:52:33 +0000
@@ -28,3 +28,10 @@
 # Poll RMS Feeds (Haiti-specific)
 #*/5   *       *       *       *       web2py *applications/eden/cron/rms_sms2record.py
 #*/5   *       *       *       *       web2py *applications/eden/cron/rms_tweet2request.py
+# Send Subscription Messages
+# Daily
+# 0   0   *   *   *   web2py    *msg/subscription_updates/daily
+# Weekly
+# 0   0   *   *   1	  web2py    *msg/subscription_updates/weekly
+# Monthly
+# 0   0   1   *   *   web2py    *msg/subscription_updates/monthly

=== modified file 'deployment-templates/models/000_config.py'
--- deployment-templates/models/000_config.py	2011-08-19 04:23:49 +0000
+++ deployment-templates/models/000_config.py	2011-08-20 19:52:33 +0000
@@ -402,6 +402,9 @@
 # Human Resource Management
 #deployment_settings.hrm.email_required = False
 
+# Save Search Widget
+deployment_settings.save_search.widget = True
+
 # Terms of Service to be able to Register on the system
 #deployment_settings.options.terms_of_service = T("Terms of Service\n\nYou have to be eighteen or over to register as a volunteer.")
 # Should we use internal Support Requests?

=== modified file 'models/04_pr.py'
--- models/04_pr.py	2011-08-14 13:15:49 +0000
+++ models/04_pr.py	2011-08-20 19:52:33 +0000
@@ -4,6 +4,7 @@
     Person Registry
 
     @author: nursix
+    @author: Pratyush Nigam <[e-mail]>
     @see: U{http://eden.sahanafoundation.org/wiki/BluePrintVITA}
 
 """
@@ -853,78 +854,84 @@
 # =============================================================================
 # Saved Searches
 #
-# @ToDo: Conditional Model Load
-tablename = "pr_save_search"
-table = db.define_table(tablename,
-                        Field("user_id", "integer",
-                              default = auth.user_id),
-                        Field("search_vars", "string",
-                              label = T("Search Criteria")),
-                        Field("subscribed", "boolean",
-                              default=False),
-                        person_id(),
-                         *s3_timestamp())
-table.person_id.default = s3_logged_in_person()
-table.user_id.readable = False
-table.user_id.writable = False
-
-# @ToDo: If this can't be moved inside the conditional model load, then
-# move to 00_db.py with the other imports
-import cPickle
-
-def get_criteria(id):
-    s = ""
-    try:
-        id = id.replace("&apos;", "'")
-        search_vars = cPickle.loads(id)
-        s = "<p>"
-        pat = '_'
-        for var in search_vars.iterkeys():
-            if var == "criteria" :
-                c_dict = search_vars[var]
-                for j in c_dict.iterkeys():
-                    if not re.match(pat,j):
-                        s = "%s<b>%s</b>: %s<br />" % (s,
-                                                       str(j).capitalize(),
-                                                       str(c_dict[j]))
-            elif var == "simple" or var == "advanced":
-                continue
-            else:
-                s = "%s<b>%s</b>: %s<br />" % (s,
-                                               str(var).capitalize(),
-                                               str(search_vars[var]))
-        s = "%s</p>" % s
-        return XML(s)
-    except:
-        return XML(s)
-
-table.search_vars.represent = lambda id: get_criteria(id = id)
-
-s3mgr.configure(tablename,
-                insertable = False,
-                editable = False,
-                listadd = False,
-                deletable = True,
-                list_fields=["search_vars",
-                             "subscribed"])
-
-s3mgr.model.add_component(tablename, pr_person="person_id")
-
-s3.crud_strings[tablename] = Storage(
-    title_create = T("Save Search"),
-    title_display = T("Saved Search Details"),
-    title_list = T("Saved Searches"),
-    title_update = T("Edit Saved Search"),
-    title_search = T("Search Saved Searches"),
-    subtitle_create = T("Add Saved Search"),
-    subtitle_list = T("Saved Searches"),
-    label_list_button = T("List Saved Searches"),
-    label_create_button = T("Save Search"),
-    label_delete_button = T("Delete Saved Search"),
-    msg_record_created = T("Saved Search added"),
-    msg_record_modified = T("Saved Search updated"),
-    msg_record_deleted = T("Saved Search deleted"),
-    msg_list_empty = T("No Search saved"))
+def saved_search_tables():
+    tablename = "pr_save_search" 
+    table = db.define_table(tablename,
+                            Field("user_id","integer", default = auth.user_id), 
+                            Field("search_vars","string", label = T("Search Criteria")),
+                            Field("subscribed","boolean", default=False),
+                            person_id(label = T("Person")),    
+                            migrate=migrate, *s3_timestamp())
+    db.pr_save_search.person_id.default = s3_logged_in_person()            
+    db.pr_save_search.user_id.readable = False
+    db.pr_save_search.user_id.writable = False
+
+    import cPickle
+    def get_criteria(id):
+        s = ""
+        try:
+            id = id.replace("&apos;","'")
+            search_vars = cPickle.loads(id)
+            s = "<p>"
+            pat = '_'
+            for var in search_vars.iterkeys():
+                if var == "criteria" :
+                    c_dict = search_vars[var]
+                    #s = s + crud_string("pr_save_search", "Search Criteria")
+                    for j in c_dict.iterkeys():
+                        if not re.match(pat,j):
+                            st = str(j)
+                            st = st.replace("_search_"," ")
+                            st = st.replace("_advanced","")
+                            st = st.replace("_simple","")
+                            st = st.replace("text","text matching")
+                            """st = st.replace(search_vars["function"],"")
+                            st = st.replace(search_vars["prefix"],"")"""
+                            st = st.replace("_"," ")
+                            s = "%s <b> %s </b>: %s <br />" %(s, st.capitalize(), str(c_dict[j]))
+                elif var == "simple" or var == "advanced":
+                    continue
+                else:
+                    if var == "function":
+                        v1 = "Resource Name"
+                    elif var == "prefix":
+                        v1 = "Module"
+                    s = "%s<b>%s</b>: %s<br />" %(s, v1, str(search_vars[var]))
+            s = s + "</p>"        
+            return XML(s)
+        except:
+            return XML(s)
+
+    db.pr_save_search.search_vars.represent = lambda id : get_criteria(id = id)
+
+    s3mgr.configure(tablename,
+                    insertable = False,
+                    editable = False,
+                    listadd = False,
+                    deletable = True,
+                    list_fields=["search_vars"])
+                
+    s3mgr.model.add_component(table, pr_person="person_id")
+
+    s3.crud_strings[tablename] = Storage(
+                                         title_create = T("Save Search"),
+                                         title_display = T("Saved Search Details"),
+                                         title_list = T("Saved Searches"),
+                                         title_update = T("Edit Saved Search"),
+                                         title_search = T("Search Saved Searches"),
+                                         subtitle_create = T("Add Saved Search"),
+                                         subtitle_list = T("Saved Searches"),
+                                         label_list_button = T("List Saved Searches"),
+                                         label_create_button = T("Save Search"),
+                                         label_delete_button = T("Delete Saved Search"),
+                                         msg_record_created = T("Saved Search added"),
+                                         msg_record_modified = T("Saved Search updated"),
+                                         msg_record_deleted = T("Saved Search deleted"),
+                                         msg_list_empty = T("No Search saved"))
+    
+# Provide a handle to this load function
+s3mgr.model.loader(saved_search_tables,
+                   "pr_save_search")
 
 
 # =============================================================================

=== modified file 'models/msg.py' (properties changed: -x to +x)
--- models/msg.py	2011-08-06 18:24:53 +0000
+++ models/msg.py	2011-08-20 19:52:33 +0000
@@ -40,7 +40,7 @@
                                       represent = lambda direction: \
                                         (direction and ["In"] or ["Out"])[0],
                                       label = T("Direction")),
-
+                                migrate=migrate,
                                 *(s3_timestamp() + s3_uid() + s3_deletion_status()))
 
         s3mgr.configure(tablename,
@@ -77,7 +77,7 @@
                                 Field("record_uuid", # null in this field implies subscription to the entire resource
                                       type=s3uuid,
                                       length=128),
-
+                                migrate=migrate,
                                 *(s3_timestamp() + s3_uid() + s3_deletion_status()))
 
         s3mgr.configure(tablename,
@@ -105,7 +105,7 @@
                         # - as easy for admin to edit source in 000_config.py as to edit DB (although an admin panel can be nice)
                         #Field("outbound_mail_server"),
                         #Field("outbound_mail_from"),
-                         *s3_timestamp())
+                        migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         # SMS
@@ -118,7 +118,7 @@
                                                            zero=None)),
                                 # Moved to deployment_settings
                                 #Field("default_country_code", "integer", default=44),
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         tablename = "msg_modem_settings"
@@ -128,7 +128,7 @@
                                 Field("modem_baud", "integer", default = 115200),
                                 Field("enabled", "boolean", default = True),
                                 #Field("preference", "integer", default = 5), To be used later
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         tablename = "msg_api_settings"
@@ -141,7 +141,7 @@
                                 Field("to_variable", "string", default = "to"),
                                 Field("enabled", "boolean", default = True),
                                 #Field("preference", "integer", default = 5), To be used later
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         tablename = "msg_smtp_to_sms_settings"
@@ -151,14 +151,14 @@
                                 Field("subject", length=64),
                                 Field("enabled", "boolean", default = True),
                                 #Field("preference", "integer", default = 5), To be used later
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         tablename = "msg_tropo_settings"
         table = db.define_table(tablename,
                                 Field("token_messaging"),
                                 #Field("token_voice"),
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         # ---------------------------------------------------------------------
         # Outbound Messages
@@ -200,7 +200,7 @@
                                 opt_msg_status,
                                 Field("system_generated", "boolean", default = False),
                                 Field("log"),
-
+                                migrate=migrate,
                                 *(s3_timestamp() + s3_uid() + s3_deletion_status()))
 
         s3mgr.model.add_component(table, msg_log="message_id")
@@ -222,7 +222,7 @@
                                 Field("recipient"),
                                 Field("message"),
                                 Field("network"),
-                                )
+                                migrate=migrate)
 
         # ---------------------------------------------------------------------
         # Inbound Messages
@@ -237,7 +237,7 @@
                                                            zero=None),
                                       default = "EMAIL"),
                                 Field("log"),
-
+                                migrate=migrate,
                                 *(s3_timestamp() + s3_uid() + s3_deletion_status()))
 
         # ---------------------------------------------------------------------
@@ -245,7 +245,7 @@
         tablename = "msg_email_inbound_status"
         table = db.define_table(tablename,
                                 Field("status"),
-                                )
+                                migrate=migrate)
 
         # ---------------------------------------------------------------------
         # SMS store for persistence and scratch pad for combining incoming xform chunks
@@ -256,7 +256,7 @@
                                 Field("totalno", "integer"),
                                 Field("partno", "integer"),
                                 Field("message", "string", length = 160),
-                                )
+                                migrate=migrate)
 
         # =====================================================================
         def msg_compose( redirect_module = "msg",
@@ -278,8 +278,8 @@
             if auth.is_logged_in() or auth.basic():
                 pass
             else:
-                redirect(URL(c="default", f="user", args="login",
-                    vars={"_next":URL(redirect_module,redirect_function, vars=redirect_vars)}))
+                redirect(URL(r=request, c="default", f="user", args="login",
+                    vars={"_next":URL(r=request, c=redirect_module, f=redirect_function, vars=redirect_vars)}))
 
             # Model options
             table1.sender.writable = table1.sender.readable = False
@@ -305,7 +305,7 @@
                 """ Set the sender and use msg.send_by_pe_id to route the message """
                 if not request.vars.pe_id:
                     session.error = T("Please enter the recipient")
-                    redirect(URL(redirect_module,redirect_function,
+                    redirect(URL(r=request, c=redirect_module, f=redirect_function,
                                  vars=redirect_vars))
                 table = db.pr_person
                 query = (table.uuid == auth.user.person_uuid)
@@ -319,11 +319,11 @@
                     # Trigger a Process Outbox
                     msg.process_outbox(contact_method = request.vars.pr_message_method)
                     session.flash = T("Check outbox for the message status")
-                    redirect(URL(redirect_module,redirect_function,
+                    redirect(URL(r=request, c=redirect_module, f=redirect_function,
                                  vars=redirect_vars))
                 else:
                     session.error = T("Error in message")
-                    redirect(URL(redirect_module,redirect_function,
+                    redirect(URL(r=request, c=redirect_module, f=redirect_function,
                                  vars=redirect_vars))
 
             logform = crud.create(table1,
@@ -345,7 +345,7 @@
                                 Field("oauth_secret",
                                       readable = False, writable = False),
                                 Field("twitter_account", writable = False),
-                                 *s3_timestamp())
+                                migrate=migrate, *s3_timestamp())
 
         def twitter_settings_onvalidation(form):
             """ Complete oauth: take tokens from session + pin from form, and do the 2nd API call to Twitter """
@@ -382,7 +382,7 @@
         tablename = "msg_twitter_search"
         table = db.define_table(tablename,
                                 Field("search_query", length = 140),
-                                )
+                                migrate = migrate)
         # ---------------------------------------------------------------------
         resourcename = "twitter_search_results"
         tablename = "msg_twitter_search_results"
@@ -391,7 +391,7 @@
                                 Field("posted_by"),
                                 Field("posted_at"),
                                 Field("twitter_search", db.msg_twitter_search),
-                                )
+                                migrate = migrate)
         #table.twitter_search.requires = IS_ONE_OF(db, "twitter_search.search_query")
         #table.twitter_search.represent = lambda id: db(db.msg_twitter_search.id == id).select(db.msg_twitter_search.search_query, limitby = (0,1)).first().search_query
 
@@ -404,7 +404,7 @@
                                       "posted_at",
                                       "twitter_search",
                                     ])
-
+        
         # ---------------------------------------------------------------------
         # Pass variables back to global scope (response.s3.*)
         return dict(msg_compose=msg_compose,
@@ -422,6 +422,43 @@
                  "msg_tag",
                  "msg_channel",
                  "msg_outbox")
+    
+    # ---------------------------------------------------------------------
+    msg_subscription_mode_opts = {
+                                      1:T("Email"),
+                                      #2:T("SMS"),
+                                      #3:T("Email and SMS")
+                                      }
+    """msg_subscription_frequency_opts = {
+                                           1:T("Email"),
+                                           2:T("SMS"),
+                                           3:T("Email and SMS")
+                                           }"""
+    tablename = "msg_subscription" 
+    table = db.define_table(tablename,
+                            Field("user_id","integer",
+                                  default = auth.user_id,
+                                  ), 
+                            Field("subscribe_mode","integer",
+                                  default = 1,
+                                  readable = False,
+                                  requires = IS_IN_SET(msg_subscription_mode_opts,
+                                                       zero=None)
+                                  ),
+                            Field("subscription_frequency",
+                                  requires = IS_IN_SET(["daily","weekly","monthly"]),
+                                  default = "daily",
+                                  ),
+                            person_id(label = T("Person")),
+                            migrate=migrate, *s3_timestamp())
+    db.msg_subscription.person_id.default = s3_logged_in_person()        
+    db.msg_subscription.user_id.writable = False
+    db.msg_subscription.user_id.readable = False
+    db.msg_subscription.user_id.requires = IS_NOT_IN_DB(db, 'msg_subscription.user_id')
+    s3mgr.configure("msg_subscription",    
+                    list_fields=["subscribe_mode",
+                                 "subscription_frequency"])
+    s3mgr.model.add_component("msg_subscription", pr_person="person_id")
 
     # =========================================================================
     # CAP: Common Alerting Protocol
@@ -488,7 +525,7 @@
                                 location_id(),
                                 Field("image", "upload", autodelete = True),
                                 Field("url", requires=IS_NULL_OR(IS_URL())),
-
+                                migrate=migrate,
                                 *(s3_timestamp() + s3_uid() + s3_deletion_status()))
         # Pass variables back to global scope (response.s3.*)
         return dict()
@@ -498,4 +535,3 @@
                  "msg_report")
 
 # END =========================================================================
-

=== modified file 'models/zz_last.py'
--- models/zz_last.py	2011-08-10 07:39:32 +0000
+++ models/zz_last.py	2011-08-20 19:52:33 +0000
@@ -5,6 +5,7 @@
 # Pass Tasks to Scheduler instance
 # http://www.vimeo.com/27478796
 # NB Avoid passing state into the async call as state may change before the message is executed (race condition)
+import sys
 try:
     from gluon.scheduler import Scheduler
 except:

=== modified file 'modules/s3/s3aaa.py'
--- modules/s3/s3aaa.py	2011-08-17 23:44:42 +0000
+++ modules/s3/s3aaa.py	2011-08-20 19:52:33 +0000
@@ -1636,7 +1636,7 @@
         utable = db.pr_person
         ptable = self.settings.table_user
         query = (utable.id == user_id) & \
-                (utable.person_uuid == ptable.uuid)
+                (ptable.person_uuid == utable.uuid)
         record = db(query).select(ptable.id,
                                   limitby=(0, 1)).first()
         if record:

=== modified file 'modules/s3/s3cfg.py'
--- modules/s3/s3cfg.py	2011-08-18 18:20:37 +0000
+++ modules/s3/s3cfg.py	2011-08-20 19:52:33 +0000
@@ -63,9 +63,10 @@
         self.req = Storage()
         self.inv = Storage()
         self.hrm = Storage()
-
+        self.save_search = Storage()
+        
         T = current.T
-
+        
         # These are copied from modules/s3/s3aaa.py
         self.aaa.acl =  Storage(CREATE = 0x0001,
                                 READ   = 0x0002,
@@ -446,6 +447,10 @@
     def get_hrm_email_required(self):
         return self.hrm.get("email_required", True)
 
+    # Save Search and Subscription
+    def get_save_search_widget(self):
+        return self.save_search.get("widget", True)
+    
     # -----------------------------------------------------------------------------
     # Active modules list
     def has_module(self, module_name):

=== modified file 'modules/s3/s3search.py'
--- modules/s3/s3search.py	2011-08-08 19:47:35 +0000
+++ modules/s3/s3search.py	2011-08-20 19:52:33 +0000
@@ -5,6 +5,7 @@
 
     @author: Fran Boon <fran[at]aidiq.com>
     @author: Dominic König <dominic[at]aidiq.com>
+    @author: Pratyush Nigam <[e-mail]>
 
     @requires: U{B{I{gluon}} <http://web2py.com>}
 
@@ -36,6 +37,7 @@
 import re
 import sys
 import gluon.contrib.simplejson as jsonlib
+import cPickle
 
 try:
     import cPickle
@@ -1068,6 +1070,100 @@
                     query = query & q
         return (query, errors)
     # -------------------------------------------------------------------------
+    def save_search_widget(self, r, search_vars, **attr):
+        request = self.request
+        user_id = current.session.auth.user.id
+        save_search_btn_id = "save_my_filter_btn_%s" % str(request.utcnow.microsecond)
+        save_search_processing_id = "save_search_processing_%s" % str(request.utcnow.microsecond)
+        save_search_a_id  = "save_search_a_%s" % str(request.utcnow.microsecond)        
+        arg = str(user_id) + "/save_search"
+        save_search_a = DIV("View and Subscribe to Saved Searches ",
+                            A("Here",
+                          _href = URL(r=request, c="pr", f="person", args=[arg]),
+                        _target = "_blank"
+                        ),
+                        ".",
+                        _id = save_search_a_id,
+                        _class = "save_search_a"
+                        )
+        search_vars["prefix"] = r.prefix
+        search_vars["function"] = r.function
+        s3mgr = self.manager
+        s3mgr.load("pr_save_search")
+        db = current.db
+        if len (db(db.pr_save_search.user_id == user_id).select(db.pr_save_search.id,
+                                                                               limitby = (0,1))):
+            rows = db(db.pr_save_search.user_id == user_id).select(db.pr_save_search.ALL)
+            for row in rows:
+                pat = '_'
+                s_v = cPickle.loads(row.search_vars)
+                if ((search_vars["prefix"] == s_v["prefix"]) and \
+                    (search_vars["function"] == s_v["function"])):
+                    s_dict = s_v["criteria"]
+                    if "criteria" in search_vars:
+                        c_dict = search_vars["criteria"]
+                    else:
+                        break
+                    diff = [ k for k in c_dict if k not in s_dict ]
+                    if not len(diff):
+                        flag = 1 
+                        for j in s_dict.iterkeys():
+                           if not re.match(pat,j):
+                               if c_dict[j] != s_dict[j]:                               
+                                   flag = 0
+                                   break
+                        if flag == 1:
+                            return DIV(save_search_a,
+                                       _style = "font-size:12px; padding:5px 0px 5px 90px;",                                  
+                                       _id = "save_search" 
+                                       )
+                         
+        save_search_btn = A("Save Search",
+                                    _class = "save_search_btn",
+                                    _id = save_search_btn_id,
+                                    _href = "#",
+                                    _title = "Save this search")
+        save_search_a["_style"] = "display:none;"
+        save_search_processing = IMG(_src = "/" + request.application + "/static/img/ajax-loader.gif",
+                                    _id = save_search_processing_id,
+                                    _class = "save_search_processing_id",
+                                    _style = "display:none;"
+                                    )
+        s_var = {}
+        s_var["save"] = True
+        jurl = URL(r=request, c=r.prefix, f=r.function, args=["search"], vars = s_var)
+        save_search_script = SCRIPT("".join("""
+                                        $("#%s").live( 'click', function () {
+                                            $("#%s").show();
+                                            $("#%s").hide();
+                                            $.ajax({ 
+                                                url: '%s',
+                                                data: '%s', 
+                                                success: function(data) {
+                                                                    $("#%s").show();
+                                                                    $("#%s").hide();
+                                                                    },                                                                    
+                                                type: 'POST'
+                                                });   
+                                            return false;                                     
+                                            });
+                                        """%
+                                        (save_search_btn_id,
+                                         save_search_processing_id,
+                                         save_search_btn_id,
+                                         jurl,
+                                         jsonlib.dumps(search_vars),
+                                         save_search_a_id,
+                                         save_search_processing_id)))
+        save_search  = DIV(save_search_processing,
+                                save_search_a,
+                                save_search_btn,  
+                                save_search_script,
+                                _style = "font-size:12px; padding:5px 0px 5px 90px;",                                  
+                                _id = "save_search" 
+                                )
+        return save_search
+    # -------------------------------------------------------------------------
     def search_interactive(self, r, **attr):
         """
             Interactive search
@@ -1084,9 +1180,11 @@
         db = current.db
         table = self.table
         tablename = self.tablename
+        s3mgr = self.manager
+        gis = s3mgr.gis
         gis = current.gis
         T = current.T
-
+        
         vars = request.get_vars
 
         # Get representation
@@ -1191,6 +1289,7 @@
             if not search_id:
                 r.error(400, self.manager.ERROR.BAD_RECORD)
             r.post_vars = r.vars
+            s3mgr.load("pr_save_search")
             search_table = current.db.pr_save_search
             record = current.db(search_table.id == search_id).select(limitby=(0,1)).first()
             if not record:
@@ -1237,60 +1336,12 @@
         errors = simple and self.__simple and simple_form.errors or \
                  self.__advanced and advanced_form.errors or \
                  None
-
-        #Append the Save Search Widget
-        if r.http == "POST" and session.auth :
-            save_search_btn_id = "save_my_filter_btn_%s" % str(request.utcnow.microsecond)
-            save_search_processing_id = "save_search_processing_%s" % str(request.utcnow.microsecond)
-            save_search_a_id  = "save_search_a_%s" % str(request.utcnow.microsecond)
-            save_search_a = DIV(T("View and Subscribe to Saved Searches "),
-                          A("Here",
-                            _href = URL(c='pr',f='save_search'),
-                            _target = "_blank"
-                            ),
-                         ".",
-                         _id = save_search_a_id,
-                         _class = "save_search_a"
-                         )
-            save_search_btn = A("Save Search",
-                                      _class = "save_search_btn",
-                                      _id = save_search_btn_id,
-                                      _href = "#",
-                                      _title = T("Save this search"))
-            save_search_a["_style"] = "display:none;"
-            save_search_processing = IMG(_src = "/" + request.application + "/static/img/ajax-loader.gif",
-                                      _id = save_search_processing_id,
-                                      _class = "save_search_processing_id",
-                                      _style = "display:none;"
-                                      )
-            search_vars["prefix"] = r.prefix
-            search_vars["function"] = r.function
-            s_var = {}
-            s_var["save"] = True
-            save_search_script = SCRIPT( """
-                                           $("#""" + save_search_btn_id + """").live( 'click', function () {
-                                               $("#""" + save_search_processing_id+ """").show();
-                                               $("#""" + save_search_btn_id + """").hide();
-                                               $.ajax({
-                                                   url: '""" + URL(r.prefix,r.function,args=["search"],
-                                                                    vars = s_var) + """',
-                                                   data: '"""  + jsonlib.dumps(search_vars) + """',
-                                                   success: function(data) {
-                                                                       $("#""" + save_search_a_id + """").show();
-                                                                       $("#""" + save_search_processing_id+ """").hide();
-                                                                       },
-                                                   type: 'POST'
-                                                   });
-                                               return false;
-                                               });
-                                           """)
-            save_search  = DIV(save_search_processing,
-                                  save_search_a,
-                                  save_search_btn,
-                                  save_search_script,
-                                  _style = "font-size:12px; padding:5px 0px 5px 90px;",
-                                  _id = "save_search"
-                                  )
+        
+        settings = resource.manager.deployment_settings         
+        
+        # Append the Save Search Widget
+        if r.http == "POST" and session.auth and settings.get_save_search_widget :
+            save_search = self.save_search_widget(r, search_vars, **attr)    
         else:
             save_search  = DIV()
         if self.__simple:
@@ -1738,6 +1789,7 @@
         # r contains the resource name:
         tablename = r.tablename
         component = r.component_name
+        s3mgr = self.manager
         db = current.db
         session = current.session
         auth =  current.auth
@@ -1756,14 +1808,14 @@
                 key = str(i)
                 s_vars[key] = str(search_vars[i])
         search_str = cPickle.dumps(s_vars)
-        table = db.pr_save_search
-        query = (table.user_id == user_id) & \
-                (table.search_vars == search_str)
-        if len (db(query).select()) == 0:
+        s3mgr.load("pr_save_search")
+        if len (db( (db.pr_save_search.user_id == user_id) & \
+                    (db.pr_save_search.search_vars == search_str)).select()) == 0:
             new_search = {}
             new_search["search_vars"] = search_str
-            _id = table.insert(**new_search)
-        msg = "success"
+            search_table = db.pr_save_search 
+            _id = search_table.insert(**new_search) 
+        msg = "success" 
         return msg
 
 
@@ -2232,4 +2284,3 @@
         return output
 
 # =============================================================================
-