Merge branch 'bug/segmentation' into develop

Shakeel Mohamed · Shakeel Mohamed · commit 49f57a7076db · 2014-09-03T13:46:21.000-07:00
diff --git a/splunklib/results.py b/splunklib/results.py
@@ -246,7 +246,7 @@ def _parse_results(self, stream):
                         elem.clear()
 
                 elif elem.tag in ('text', 'v') and event == 'end':
-                    text = elem.text if elem.text is not None else ""
+                    text = "".join(elem.itertext())
                     values.append(text.encode('utf8'))
                     elem.clear()
 
diff --git a/tests/test_results.py b/tests/test_results.py
@@ -133,6 +133,28 @@ def test_read_raw_field(self):
 
         self.assert_parsed_results_equals(xml_text, expected_results)
 
+    def test_read_raw_field_with_segmentation(self):
+        xml_text = """
+<?xml version='1.0' encoding='UTF-8'?>
+<results preview='0'>
+<meta>
+<fieldOrder>
+<field>_raw</field>
+</fieldOrder>
+</meta>
+	<result offset='0'>
+		<field k='_raw'><v xml:space='preserve' trunc='0'>07-13-2012 09:27:27.307 -0700 INFO  Metrics - group=search_concurrency, <sg h="1">system total</sg>, <sg h="2">active_hist_searches=0</sg>, active_realtime_searches=0</v></field>
+	</result>
+</results>
+""".strip()
+        expected_results = [
+            {
+                '_raw': '07-13-2012 09:27:27.307 -0700 INFO  Metrics - group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0',
+            },
+        ]
+
+        self.assert_parsed_results_equals(xml_text, expected_results)
+
     def assert_parsed_results_equals(self, xml_text, expected_results):
         results_reader = results.ResultsReader(StringIO(xml_text))
         actual_results = [x for x in results_reader]
