Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...

Conflicts:
	src/session.c

Fixed.

diff --cc js/pz2.js
index 7edf35d,7edf35d..5d0c614
--- 1/js/pz2.js
--- 2/js/pz2.js
+++ b/js/pz2.js
@@@ -126,6 -126,6 +126,8 @@@ var pz2 = function ( paramArray 
      if (this.useSessions && paramArray.autoInit !== false) {
          this.init(this.sessionId, this.serviceId);
      }
++    // Version parameter
++    this.version = paramArray.version || null;
  };
  
  pz2.prototype = 
@@@ -557,7 -557,7 +559,9 @@@
                  "command": "termlist", 
                  "session": this.sessionID, 
                  "name": this.termKeys,
--                "windowid" : window.name
++                "windowid" : window.name, 
++              "version" : this.version
++      
              },
              function(data) {
                  if ( data.getElementsByTagName("termlist") ) {
@@@ -587,12 -587,12 +591,22 @@@
                                      .childNodes[0].nodeValue || 'ERROR'
                              };
  
++                          // Only for xtargets: id, records, filtered
                              var termIdNode = 
                                  terms[j].getElementsByTagName("id");
                              if(terms[j].getElementsByTagName("id").length)
                                  term["id"] = 
                                      termIdNode[0].childNodes[0].nodeValue;
                              termList[listName][j] = term;
++
++                          var recordsNode  = terms[j].getElementsByTagName("records");
++                          if (recordsNode && recordsNode.length)
++                              term["records"] = recordsNode[0].childNodes[0].nodeValue;
++                              
++                          var filteredNode  = terms[j].getElementsByTagName("filtered");
++                          if (filteredNode && filteredNode.length)
++                              term["filtered"] = filteredNode[0].childNodes[0].nodeValue;
++                              
                          }
                      }
  
@@@ -638,7 -638,7 +652,8 @@@
                "command": "bytarget", 
                "session": this.sessionID, 
                "block": 1,
--              "windowid" : window.name
++              "windowid" : window.name,
++              "version" : this.version
            },
              function(data) {
                  if ( data.getElementsByTagName("status")[0]

diff --cc src/client.c
Simple merge

diff --cc src/session.c
index eb50ad1,18c9aee..f0f672c
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -1044,7 -1045,9 +1045,9 @@@ static int targets_termlist_nb(WRBUF wr
                       ht[i].hits);
  
          if (version >= 2) {
+             // Should not print if we know it isn't a approximation.
+             wrbuf_printf(wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", ht[i].approximation);
 -            wrbuf_printf(wrbuf, "<records>%d</records>\n", ht[i].records);
 +            wrbuf_printf(wrbuf, "<records>%d</records>\n", ht[i].records - ht[i].filtered);
              wrbuf_printf(wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
          }