support search_field and cmp argument in search URL

Author: kmaehashi

atwiki/test/test_uri.py

@@ -26,8 +26,10 @@ def test_path_output(self):
     uri = AtWikiURI(base)
 
     self.assertEqual(uri.search(), '{0}/search'.format(base))
-    self.assertEqual(uri.search('test'), '{0}/?cmd=search&keyword=test&andor=and'.format(base))
-    self.assertEqual(uri.search('test', False), '{0}/?cmd=search&keyword=test&andor=or'.format(base))
+    self.assertEqual(uri.search('test'), '{0}/?cmd=search&keyword=test&andor=and&search_field=&cmp=cmp'.format(base))
+    self.assertEqual(uri.search('test', is_and=False), '{0}/?cmd=search&keyword=test&andor=or&search_field=&cmp=cmp'.format(base))
+    self.assertEqual(uri.search('test', wiki_syntax=True), '{0}/?cmd=search&keyword=test&andor=and&search_field=source&cmp=cmp'.format(base))
+    self.assertEqual(uri.search('test', complete=False), '{0}/?cmd=search&keyword=test&andor=and&search_field=&cmp='.format(base))
     self.assertEqual(uri.tag(), '{0}/tag/?p=0'.format(base))
     self.assertEqual(uri.tag('test'), '{0}/tag/test?p=0'.format(base))
     self.assertEqual(uri.tag('test', 1), '{0}/tag/test?p=1'.format(base))

atwiki/uri.py

@@ -50,10 +50,13 @@ def get_absolute_uri(self, uripart):
   # Wiki-wide APIs
   ########################################
 
-  def search(self, keyword=None, is_and=True):
+  def search(self, keyword=None, is_and=True, wiki_syntax=False, complete=True):
     if keyword is not None:
       andor = 'and' if is_and else 'or'
-      return '{0}/?cmd=search&keyword={1}&andor={2}'.format(self._base, urlquote(keyword), andor)
+      search_field = 'source' if wiki_syntax else ''
+      cmpmode = 'cmp' if complete else ''
+      return '{0}/?cmd=search&keyword={1}&andor={2}&search_field={3}&cmp={4}'.format(
+          self._base, urlquote(keyword), andor, search_field, cmpmode)
     else:
       return '{0}/search'.format(self._base)