[PATCH 3/5] go: update the addrlookup utility to go 1

diff --git a/51/a5495c103818cabddfae06d45a713e20bc12d9 b/51/a5495c103818cabddfae06d45a713e20bc12d9
new file mode 100644 (file)
index 0000000..c7a3947
--- /dev/null
+++ b/51/a5495c103818cabddfae06d45a713e20bc12d9
@@ -0,0 +1,100 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AD08A429E44\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:57:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id MfDt92nZHOrt for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Apr 2012 12:57:06 -0700 (PDT)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4BC00431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:56:43 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id D7890584BAD\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 21:56:41 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 5673ADF2A7; Mon, 30 Apr 2012 21:56:41 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 70C5CDF2A3;\r
+       Mon, 30 Apr 2012 21:55:53 +0200 (CEST)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1SOwhM-0003yp-3G; Mon, 30 Apr 2012 21:55:52 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/5] go: update the addrlookup utility to go 1\r
+Date: Mon, 30 Apr 2012 21:55:42 +0200\r
+Message-Id:\r
+ <1335815744-15258-3-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To:\r
+ <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References: <20120430195420.2528.48612@thinkbox.jade-hamburg.de>\r
+       <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 30 Apr 2012 19:57:09 -0000\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ bindings/go/src/notmuch-addrlookup/addrlookup.go |    6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/bindings/go/src/notmuch-addrlookup/addrlookup.go b/bindings/go/src/notmuch-addrlookup/addrlookup.go\r
+index 16958e5..dabfeb0 100644\r
+--- a/bindings/go/src/notmuch-addrlookup/addrlookup.go\r
++++ b/bindings/go/src/notmuch-addrlookup/addrlookup.go\r
+@@ -86,7 +86,7 @@ func addresses_by_frequency(msgs *notmuch.Messages, name string, pass uint, addr\r
+       //      "<?(?P<mail>\\b\\w+([-+.]\\w+)*\\@\\w+[-\\.\\w]*\\.([-\\.\\w]+)*\\w\\b)>?)"\r
+       pattern = `.*` + strings.ToLower(name) + `.*`\r
+       var re *regexp.Regexp = nil\r
+-      var err os.Error = nil\r
++      var err error = nil\r
+       if re,err = regexp.Compile(pattern); err != nil {\r
+               log.Printf("error: %v\n", err)\r
+               return &freqs\r
+@@ -103,7 +103,7 @@ func addresses_by_frequency(msgs *notmuch.Messages, name string, pass uint, addr\r
+               for _,header := range headers {\r
+                       froms := strings.ToLower(msg.GetHeader(header))\r
+                       //println("  froms: ["+froms+"]")\r
+-                      for _,from := range strings.Split(froms, ",", -1) {\r
++                      for _,from := range strings.Split(froms, ",") {\r
+                               from = strings.Trim(from, " ")\r
+                               match := re.FindString(from)\r
+                               //println("  -> match: ["+match+"]")\r
+@@ -179,7 +179,7 @@ type address_matcher struct {\r
+ \r
+ func new_address_matcher() *address_matcher {\r
+       var cfg *config.Config\r
+-      var err os.Error\r
++      var err error\r
+ \r
+       // honor NOTMUCH_CONFIG\r
+       home := os.Getenv("NOTMUCH_CONFIG")\r
+-- \r
+1.7.10\r
+\r