Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

etc/tmarc.xsl: changed ! to | in matching on d901 or d907
src/client.c: Removed local/mixed/remote option while keeping new apply_filter code.

diff --cc .project
index 009a45b,009a45b..abaaf39
--- 1/.project
--- 2/.project
+++ b/.project
@@@ -30,6 -30,6 +30,10 @@@
                                        <value>make</value>
                                </dictionary>
                                <dictionary>
++                                      <key>org.eclipse.cdt.make.core.buildLocation</key>
++                                      <value>${workspace_loc:/pazpar2.master/Debug}</value>
++                              </dictionary>
++                              <dictionary>
                                        <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
                                        <value>clean</value>
                                </dictionary>

diff --cc src/client.c
index 16099ba,8841c10..9367153
--- 1/src/client.c
--- 2/src/client.c
+++ b/src/client.c
@@@ -979,6 -1023,14 +1012,8 @@@ int client_parse_query(struct client *c
          wrbuf_puts(se->wrbuf, " ");
      }
  
 -    if (cn_recordfilter) {
 -        wrbuf_puts(se->wrbuf, "@and ");
 -        ccl_pquery(se->wrbuf, cn_recordfilter);
 -        wrbuf_puts(se->wrbuf, " ");
 -    }
 -
+     apply_limit(sdb, facet_limits, se->wrbuf);
+ 
      if (!pqf_strftime || !*pqf_strftime)
          ccl_pquery(se->wrbuf, cn);
      else