[Spambayes-checkins] spambayes pop3proxy.py,1.68,1.69

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv3132

Modified Files:
	pop3proxy.py 
Log Message:
Add 'show clues' button to the review messages page
as requested by Paul Moore.

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** pop3proxy.py	4 Apr 2003 00:00:48 -0000	1.68
--- pop3proxy.py	4 Apr 2003 01:11:57 -0000	1.69
***************
*** 906,909 ****
--- 906,911 ----
              row.subject.href="view?key=%s&corpus=%s" % (key, label)
              row.from_ = messageInfo.fromHeader
+             subj = cgi.escape(messageInfo.subjectHeader)
+             row.classify.href="showclues?key=%s&subject=%s" % (key, subj)
              setattr(row, 'class', ['stripe_on', 'stripe_off'][stripe]) # Grr!
              row = str(row).replace('TYPE', label).replace('KEY', key)
***************
*** 1084,1092 ****
          self._writePostamble()
  
!     def onClassify(self, file, text, which):
!         """Classify an uploaded or pasted message."""
!         message = file or text
!         message = message.replace('\r\n', '\n').replace('\r', '\n') # For Macs
! 
          cluesTable = self.html.cluesTable.clone()
          cluesRow = cluesTable.cluesRow.clone()
--- 1086,1090 ----
          self._writePostamble()
  
!     def _buildCluesTable(self, message, subject=None):
          cluesTable = self.html.cluesTable.clone()
          cluesRow = cluesTable.cluesRow.clone()
***************
*** 1099,1103 ****
          results = self.html.classifyResults.clone()
          results.probability = probability
!         results.cluesBox = self._buildBox("Clues:", 'status.gif', cluesTable)
          results.classifyAnother = self._buildClassifyBox()
          self._writePreamble("Classify")
--- 1097,1125 ----
          results = self.html.classifyResults.clone()
          results.probability = probability
!         if subject is None:
!             heading = "Clues:"
!         else:
!             heading = "Clues for: " + subject
!         results.cluesBox = self._buildBox(heading, 'status.gif', cluesTable)
!         return results
! 
!     def onShowclues(self, key, subject):
!         """Show clues for a message - linked from the Review page."""
!         self._writePreamble("Message clues", parent=('review', 'Review'))
!         message = state.unknownCorpus.get(key).getSubstance()
!         message = message.replace('\r\n', '\n').replace('\r', '\n') # For Macs
!         if message:
!             results = self._buildCluesTable(message, subject)
!             del results.classifyAnother
!             self.write(results)
!         else:
!             self.write("<p>Can't find message %r. Maybe it expired.</p>" % key)
!         self._writePostamble()
! 
!     def onClassify(self, file, text, which):
!         """Classify an uploaded or pasted message."""
!         message = file or text
!         message = message.replace('\r\n', '\n').replace('\r', '\n') # For Macs
!         results = self._buildCluesTable(message)
          results.classifyAnother = self._buildClassifyBox()
          self._writePreamble("Classify")