phelipetls / reportforce Goto Github PK

diff --git a/reportforce/helpers/generators.py b/reportforce/helpers/generators.py
index ff5bb22..566102f 100644
+++ a/reportforce/helpers/generators.py
--- b/reportforce/helpers/generators.py
@@ -31,13 +31,11 @@ def report_generator(get_report):
         df = pd.DataFrame(report_cells, index=indices, columns=columns)
         yield df
 
-        if id_column:
-            already_seen = ",".join(df[id_column].values)
-            set_filters([(id_column, "!=", already_seen)], metadata)
-
-            increment_logical_filter(metadata)
+        if id_column and len(df[id_column]):
+            inc = 2000
+            for ix in range(0, len(df[id_column]), inc):
+                already_seen = ",".join(map(lambda val: '"%s"' % val,
+                                            df[id_column][(ix*inc):inc+(ix*inc)]))
+                set_filters([(id_column, "!=", already_seen)], metadata)
+                increment_logical_filter(metadata)
 
             while not report["allData"]:
                 # getting what is needed to build the dataframe
@@ -49,10 +47,8 @@ def report_generator(get_report):
                 yield df
 
                 # filtering out already seen values for the next report
-                already_seen += ",".join(df[id_column].values)
-                update_filter(-1, "value", already_seen, metadata)
+                already_seen = ",".join(map(lambda val: '"%s"' % val,
+                                            df[id_column][(ix*inc):inc+(ix*inc)]))
+                set_filters([(id_column, "!=", already_seen)], metadata)
+                increment_logical_filter(metadata)
 
     @functools.wraps(get_report)
     def concat(*args, **kwargs):

diff --git a/reportforce/helpers/xml.py b/reportforce/helpers/xml.py
index b07e140..c305057 100644
--- a/reportforce/helpers/xml.py
+++ b/reportforce/helpers/xml.py
@@ -1,11 +1,15 @@
 import urllib
 import xml.etree.ElementTree as ET
+import xml.sax.saxutils
 
 namespace = {
     "soapenv": "http://schemas.xmlsoap.org/soap/envelope/",
     "urn": "urn:partner.soap.sforce.com",
 }
 
+def escape(s):
+    """escape a value for XML"""
+    return saxutils.escape(s)
 
 def read_successful_response(response):
     """Parse XML returned by SOAP API response in case of a successful login.
diff --git a/reportforce/login.py b/reportforce/login.py
index 7c47e4f..e4db73c 100644
--- a/reportforce/login.py
+++ b/reportforce/login.py
@@ -1,7 +1,7 @@
 import getpass
 import requests
 
-from .helpers.xml import read_failed_response, read_successful_response
+from .helpers.xml import read_failed_response, read_successful_response, escape
 
 DEFAULT_VERSION = "47.0"
 
@@ -111,9 +111,9 @@ def soap_login(username, password, security_token, version="47.0", domain="login
             </n1:login>
         </env:Body>
     </env:Envelope>""".format(
-        username=username,
-        password=password if password else getpass.getpass(),
-        token=security_token if security_token else getpass.getpass("Security Token: "),
+        username=escape(username),
+        password=escape(password) if password else escape(getpass.getpass()),
+        token=escape(security_token) if security_token else escape(getpass.getpass("Security Token: ")),
     )
 
     response = requests.post(soap_url, headers=soap_headers, data=soap_body)