Ticket #233: xapian_omegascript_addfilter_lower.diff

query.cc

@@ -712 +712 @@
 enum tagval {
 CMD_,
 CMD_add,
+CMD_addfilter,
 CMD_allterms,
 CMD_and,
 CMD_cgi,
@@ -753 +754 @@
 CMD_list,
 CMD_log,
 CMD_lookup,
+CMD_lower,
 CMD_lt,
 CMD_map,
 CMD_max,
@@ -824 +826 @@
 //name minargs maxargs evalargs ensure
 {"",{CMD_,         N, N, 0, 0}},// commented out code
 T(add,             0, N, N, 0), // add a list of numbers
+T(addfilter,       1, 1, N, 0), // add filter term
 T(allterms,        0, 1, N, 0), // list of all terms matching document
 T(and,             1, N, 0, 0), // logical shortcutting and of a list of values
 T(cgi,             1, 1, N, 0), // return cgi parameter value
@@ -867 +870 @@
 T(list,            2, 5, N, 0), // pretty print list
 T(log,             1, 2, 1, 0), // create a log entry
 T(lookup,          2, 2, N, 0), // lookup in named cdb file
+T(lower,           1, 1, N, 0), // convert string to lower case
 T(lt,              2, 2, N, 0), // test <
 T(map,             1, 2, 1, 0), // map a list into another list
 T(max,             1, N, N, 0), // maximum of a list of values
@@ -1050 +1054 @@
                 value = int_to_string(total);
                 break;
             }
+            case CMD_addfilter: {
+                add_bterm(args[0]);
+                break;
+            }
             case CMD_allterms: {
                 // list of all terms indexing document
                 int id = q0;
@@ -1449 +1457 @@
                 close(fd); // FIXME: cache fds?
                 break;
             }
+            case CMD_lower: {
+                value = Xapian::Unicode::tolower(args[0]);
+                break;
+            }
             case CMD_lt:
                 if (string_to_int(args[0]) < string_to_int(args[1]))
                     value = "true";

docs/omegascript.rst

@@ -59 +59 @@
 ${...}
         commented out code
 
+$addfilter{term}
+        add a filter term, similar to passing a B CGI variable
+
 $allterms{docid}
         list of all terms matching document
 
@@ -241 +244 @@
         "tld_en" with "tld_$or{$opt{lang},en}" and automatically translate
         into the currently set language, or English if no language is set.
 
+$lower{STUFF}
+        return stuff converted to lower case 
+
 $map{LIST,STUFF)
         map a list into the evaluated argument. If "LIST" is
         1, 2 then::