Oops, ignore this:

+                box_name = "essay.q"+str(index)
+                syslog('info', "Box name: %s", box_name)

I just deleted it.

On Sat, Jul 28, 2012 at 12:14 AM, Ana Cutillas <email address hidden> wrote:

> Ana Cutillas has proposed merging lp:~acoconut/systers/flexible_essays
> into lp:systers.
>
> Requested reviews:
>   Robin J (robin-jeffries)
>   beachbrake (wordsofagirl)
>
> For more details, see:
> https://code.launchpad.net/~acoconut/systers/flexible_essays/+merge/117141
>
> I made the changes I talked about in my emails earlier.
>
> Basically, I'm reading the pck file in subscribe.py and then I check every
> question name against the questions coming from the form (which are no
> longer all called essay, they each have its own name) and then I store the
> questions in the database with the question name as an ID for every
> question. The question number is also stored in the pickle file, read and
> added to the database.
> --
> https://code.launchpad.net/~acoconut/systers/flexible_essays/+merge/117141
> You are the owner of lp:~acoconut/systers/flexible_essays.
>
> === modified file 'Mailman/Cgi/listinfo.py'
> --- Mailman/Cgi/listinfo.py     2009-08-14 15:41:17 +0000
> +++ Mailman/Cgi/listinfo.py     2012-07-27 22:13:21 +0000
> @@ -22,6 +22,7 @@
>  import os
>  import cgi
>
> +from Mailman import DlistUtils
>  from Mailman import mm_cfg
>  from Mailman import Utils
>  from Mailman import MailList
> @@ -36,7 +37,6 @@
>  i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
>
>
> -
>  def main():
>      parts = Utils.GetPathPieces()
>      if not parts:
> @@ -62,7 +62,6 @@
>      list_listinfo(mlist, language)
>
>
> -
>  def listinfo_overview(msg=''):
>      # Present the general listinfo overview
>      hostname = Utils.get_domain()
> @@ -152,7 +151,6 @@
>      print doc.Format()
>
>
> -
>  def list_listinfo(mlist, lang):
>      # Generate list specific listinfo
>      doc = HeadlessDocument()
> @@ -189,10 +187,29 @@
>
>      # If activated, the content and presence of questions and a field to
> answer them. Added by Systers.
>      try:
> -        if mlist.essay_enabled:
> -            replacements['<mm-questions>'] = """<TR>
> -            <TD COLSPAN="3">""" + mlist.questions
> -            replacements['<mm-essay-box>'] = TextArea('essay', '',
> rows=8, cols=60).Format() + """        </TD></TR>"""# Added to support
> subscribe essays
> +        if mlist.essay_enabled: # Added to support subscribe essays
> +            html_questions = []
> +            index = 0
> +            for question in mlist.questions:
> +                box_name = "essay.q"+str(index)
> +                syslog('info', "Box name: %s", box_name)
> +                index = index + 1
> +                question_name = "'"+question[1]+"'"
> +                html_questions.append("""<TR>
> +                <TD COLSPAN="3">""" + question[0] + """</TD>""")
> +                if (question[2] == 'smallbox'):
> +                    html_questions.append("""<TD>""" +
> TextArea(question_name,\
> +                            '', rows=1, cols=60).Format() +
> """</TD></TR>""")
> +                elif (question[2] == 'largebox'):
> +                    html_questions.append("""<TD>""" +
> TextArea(question_name, \
> +                            '', rows=8, cols=60).Format() +
> """</TD></TR>""")
> +                elif (question[2] == 'checkbox'):
> +                    #TODO (Ana Cutillas): consider creating a class like
> TextArea for checkboxes?
> +                    html_questions.append("""<TD><input type='checkbox'
> name='""" \
> +                            + question[1] + """' value =' """\
> +                            + question[1] + """'></TD></TR>""")
> +            replacements['<mm-questions>'] = ''.join(html_questions)
> +            replacements['<mm-essay-box>'] = ''
>          else:
>              replacements['<mm-questions>'] = ''
>              replacements['<mm-essay-box>'] = ''
>
> === modified file 'Mailman/Cgi/subscribe.py'
> --- Mailman/Cgi/subscribe.py    2009-08-14 15:41:17 +0000
> +++ Mailman/Cgi/subscribe.py    2012-07-27 22:13:21 +0000
> @@ -26,6 +26,7 @@
>  from Mailman import MailList
>  from Mailman import Errors
>  from Mailman import i18n
> +from Mailman import DlistUtils # to write to the database
>  from Mailman import Message
>  from Mailman.DlistUserDesc import DlistUserDesc # to support subscribe
> essays
>  from Mailman.htmlformat import *
> @@ -137,12 +138,25 @@
>
>      # Added to support mailing lists that require essays to join
>      if mlist.essay_enabled:
> -        essay = cgidata.getvalue('essay', '')
> -        if not essay:    # Check for empty essays.
> -            if not error_msg:
> -                print_error(mlist, doc)
> -                error_msg = True
> -            results.append(_('To subscribe to this list, you must answer
> the questions asked directly above the large text box.'))
> +        # We need to retrieve the questions to be able to
> +        # retrieve the content from cgi.
> +        essay = []
> +        for question in mlist.questions:
> +            answer = cgidata.getvalue(question[1], '')
> +            if (answer):
> +                # The question has been answered
> +                essay.append((question[1], answer, question[5]))
> +            else:
> +                if (question[2] != 'checkbox'):
> +                    # If the answer is empty and it's not a checkbox
> +                    # the user left fields empty
> +                    if not error_msg:
> +                        print_error(mlist, doc)
> +                        error_msg = True
> +                    results.append(_('To subscribe to this list, you must
> answer the questions asked directly above the large text box.'))
> +                else:
> +                    # If the answer is an empty checkbox, the user didn't
> check it
> +                    essay.append((question[1], 'False', question[5]))
>      else:      # has to be here, else error message when calling
> DlistUserDesc
>          essay = cgidata.getvalue('essay', 'None')
>
> @@ -215,6 +229,14 @@
>  may have to be first confirmed by you via email, or approved by the list
>  moderator.  If confirmation is required, you will soon get a confirmation
>  email which contains further instructions.""")
> +    question_index = 0
> +    if (isinstance(essay, str)): #There's only one question, so it comes
> as a string.
> +        form = DlistUtils.FormQuestion(mlist)
> +        form.recordAnswer(email, question_index, essay, 1)
> +    else:
> +        for answer in essay:
> +            form = DlistUtils.FormQuestion(mlist)
> +            form.recordAnswer(email, answer[0], answer[1], answer[2])
>
>      try:
>          userdesc = DlistUserDesc(email, fullname, password, digest, lang,
> essay)
>
> === modified file 'Mailman/DlistUtils.py'
> --- Mailman/DlistUtils.py       2010-01-31 20:29:48 +0000
> +++ Mailman/DlistUtils.py       2012-07-27 22:13:21 +0000
> @@ -289,6 +289,62 @@
>          self.store.find(Alias,Alias.subscriber_id ==
> obsolete_id).set(subscriber_id = new_id)
>          self.store.find(Subscriber,Subscriber.subscriber_id ==
> obsolete_id).remove()
>
> +class FormQuestion(object):
> +    __storm_table__ = "form_question"
> +    form_question_id = Int(primary = True,default = AutoReload)
> +    content = Unicode()
> +    user_email = Unicode()
> +    version = Int()
> +    question_id = Unicode()
> +    status = Unicode()
> +
> +    def __init__(self,mlist):
> +        self.mlist = mlist
> +        self.database = getConn(mlist)
> +
> +    @decfunc
> +    def recordAnswer(self, addr, question, answer, version):
> +        """Save the answer for a question of the subscribe form,
> returning its id."""
> +        subscriber = Subscriber(self.mlist)
> +        userID = addr.decode('utf-8')
> +        status = u"pending"
> +        question_unicode = question.decode('utf-8')
> +        answer_unicode = answer.decode('utf-8')
> +
> +        command = "form_question =
> self.store.add(FormQuestion())\nform_question.content =
> answer_unicode\nform_question.email = userID\nform_question.version =
> version\nform_question.question_id = question_unicode\nform_question.status
> = status\n"
> +        if DEBUG_MODE:
> +            syslog('info', 'DlistUtils:(recordAnswer)executing
> query:\n%s', command)
> +            syslog('info', 'DlistUtils:(recordAnswer) query parameters:\n
> content:%s\n userid:%s\n version:%s\n question_id:%s\n status:%s\n ',
> answer_unicode, userID, version, question_unicode, status)
> +        #form_question_id has autoreload set, its value will be serially
> updated in database
> +        self.user_email = userID
> +        self.content = answer_unicode
> +        self.version = version
> +        self.question_id = question_unicode
> +        self.status = status
> +        self.store.add(self)
> +        formQuestionID =
> self.store.find(FormQuestion).max(FormQuestion.form_question_id)
> +        if DEBUG_MODE:
> +            syslog('info', 'Result of query(formQuestionID) is: %s\n',
> formQuestionID)
> +        return formQuestionID
> +
> +    @decfunc
> +    def get_answer(self, user_email, form_question_id):
> +        """Execute a SELECT statement, returning the results as a list."""
> +        command = "result =
> self.store.find(FormQuestion,form_question.user_email ==
> user_email)\nform_question.form_question_id = form_question_id]\n"
> +        if DEBUG_MODE:
> +             syslog('info', 'DlistUtils(get_answer):Executing
> query:\n%s', command)
> +        result = self.store.find(FormQuestion,FormQuestion.user_email ==
> user_email)
> +        syslog('info', "Result %s", result)
> +        return result.content
> +
> +    def acceptAnswer(self, addr):
> +        #TODO (Ana Cutillas): Finish this function if we need it.
> +        """Sets the status of the answers to accepted"""
> +        subscriber = Subscriber(self.mlist)
> +        userID = subscriber.getSubscriber_id_raw_or_die(addr)
> +#        command = "form_question = self.store.
> +
> +
>  class Message(object):
>      __storm_table__ = "message"
>      message_id = Int(primary = True,default = AutoReload)
>
> === modified file 'bin/rmlist'
> --- bin/rmlist  2009-07-31 10:49:01 +0000
> +++ bin/rmlist  2012-07-27 22:13:21 +0000
> @@ -152,12 +152,7 @@
>
>      # Remove the database in PostgreSQL if it was a dynamic list. Added
> by Systers.
>      try:
> -        conn = DlistUtils.getConn(None)
> -        old_iso_lvl = conn.isolation_level
> -        conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
> -        cursor = conn.cursor()
> -        cursor.execute('DROP DATABASE "%s"' % listname)
> -        conn.set_isolation_level(old_iso_lvl)
> +        DlistUtils.remove_dlist(listname)
>      except:
>          syslog('error', 'Tried to remove the database for %s, no such
> database (ok if it was a non dlist). If it was a dlist, the postgreSQL
> database for this list needs to be removed manually.' % listname)
>
>
>
>