Merge pull request #1339 from ajaxorg/streaming-codesearch

Streaming codesearch
nuclearsandwich · Apr 20, 2012 · fd7351d · fd7351d
2 parents 240a722 + 7507691
commit fd7351d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/client/ext/searchinfiles/searchinfiles.js b/client/ext/searchinfiles/searchinfiles.js
@@ -251,7 +251,13 @@ module.exports = ext.register("ext/searchinfiles/searchinfiles", {
         davProject.report(node.getAttribute("path"), "codesearch", options, function(data, state, extra){
             _self.replaceAll = false; // reset
 
-            var matches = parseInt(data.getAttribute("count"), 10);
+            var matches = data.getElementsByTagNameNS("DAV:", "excerpt").length;
+            var queryDetails = data.getElementsByTagNameNS("DAV:", "querydetail");
+            window.data = data;
+            if(queryDetails.length === 1) {
+                queryDetails[0].setAttribute("count", ""+matches);
+                queryDetails[0].setAttribute("filecount", ""+data.getElementsByTagNameNS("DAV:", "response").length);
+            }
             if (state !== apf.SUCCESS || !matches) {
                 var optionsDesc = [];
                 if (Util.isTrue(options.casesensitive)) {

diff --git a/support/jsdav b/support/jsdav