sync up

.gitignore

@@ -8,4 +8,6 @@ status/
 *.properties
 key.txt
 *.csv
-~*
+~*
+*.zip
+*.log

.vscode/launch.json

@@ -1,81 +1,74 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
-    "configurations": [
+    "configurations": [        
         {
             "name": "Python",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
             "program": "${file}",
             "cwd": "${workspaceFolder}",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
             "args": [
-                "Sandbox"
-                ,"OPPCO"
-                ,"LIHEAP"
-                ,"db.oppco@501commons.org"
-                ,"-insertattempts"
-                ,"1"
+                "Prod"
+                ,"UCA"
+                ,"Cruises_Upsert"
+                ,"daveb@uncruise.com"
+//                ,"-insertattempts"
+//                ,"0"
 //                ,"-noupdate"
 //                ,"-rootdir"
 //                ,"C:\\repo\\Salesforce-Importer-Private"
                 ,"-noexportodbc"
                 ,"-noexportsf"
+                ,"-emailattachments"
+                ,"-interactivemode"
+                ,"-displayalerts"
 //                ,"-skipexcelrefresh"
                 ,"-waittime"
-                ,"1"
+                ,"30"
+                ,"-location"
+                ,"Local"
             ],
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         },
         {
             "name": "Python: Attach",
             "type": "python",
             "request": "attach",
-            "localRoot": "${workspaceFolder}",
-            "remoteRoot": "${workspaceFolder}",
             "port": 3000,
-            "secret": "my_secret",
             "host": "localhost"
         },
         {
             "name": "Python: Terminal (integrated)",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${file}",
             "cwd": "",
             "console": "integratedTerminal",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
         },
         {
             "name": "Python: Terminal (external)",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${file}",
             "cwd": "",
             "console": "externalTerminal",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
         },
         {
             "name": "Python: Flask (0.11.x or later)",
             "type": "python",
             "request": "launch",
             "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
             "cwd": "${workspaceFolder}",
             "env": {
@@ -87,84 +80,68 @@
                 "--no-reload"
             ],
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         },
         {
             "name": "Python: Flask (0.10.x or earlier)",
             "type": "python",
             "request": "launch",
             "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${workspaceFolder}/run.py",
             "cwd": "${workspaceFolder}",
             "args": [],
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         },
         {
             "name": "Python: PySpark",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
             "osx": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+                "python": "${env:SPARK_HOME}/bin/spark-submit"
             },
             "windows": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
+                "python": "${env:SPARK_HOME}/bin/spark-submit.cmd"
             },
             "linux": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+                "python": "${env:SPARK_HOME}/bin/spark-submit"
             },
             "program": "${file}",
             "cwd": "${workspaceFolder}",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         },
         {
             "name": "Python: Module",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "module": "module.name",
             "cwd": "${workspaceFolder}",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         },
         {
             "name": "Python: Pyramid",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "cwd": "${workspaceFolder}",
             "env": {},
             "envFile": "${workspaceFolder}/.env",
             "args": [
                 "${workspaceFolder}/development.ini"
             ],
-            "debugOptions": [
-                "RedirectOutput",
-                "Pyramid"
-            ]
         },
         {
             "name": "Python: Watson",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${workspaceFolder}/console.py",
             "cwd": "${workspaceFolder}",
             "args": [
@@ -174,9 +151,6 @@
             ],
             "env": {},
             "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
         }
     ]
 }

Clients/501C/DataLoader/Insert-Contact.sdl

@@ -1,5 +1,5 @@
 #Mapping values
-#Tue Jan 30 02:34:23 PST 2018
+#Format Source=Destination
 npe01__PreferredPhone__c=npe01__PreferredPhone__c
 npe01__Preferred_Email__c=npe01__Preferred_Email__c
 npe01__Primary_Address_Type__c=npe01__Primary_Address_Type__c

Clients/501C/DataLoader/RunDataLoader.bat

@@ -1,3 +1,4 @@
 echo incoming %1 %2 %3
-cd "C:\Program Files (x86)\salesforce.com\Data Loader\bin"
-call process C:\repo\Salesforce-Importer-Private\Clients\%2\Salesforce-Importer\Clients\%2\DataLoader\ %3_%1
+set DATALOADER_BIN=C:\repo\Salesforce-Importer-Private\Clients\%2\Salesforce-Importer\dependencies\salesforce.com\dataloader\v62.0.1\bin
+cd %DATALOADER_BIN%
+call %DATALOADER_BIN%\process.bat C:\repo\Salesforce-Importer-Private\Clients\%2\Salesforce-Importer\Clients\%2\DataLoader\ %3_%1

Clients/501C/DataLoader/Update-Contact.sdl

@@ -1,5 +1,5 @@
 #Mapping values
-#Tue Jan 30 02:46:50 PST 2018
+#Format Source=Destination
 FirstName=FirstName
 LastName=LastName
 MailingCity=MailingCity

Clients/501C/DataLoader/log-conf.xml

@@ -1,35 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration>
-        <appender name="A1" class="org.apache.log4j.FileAppender">
-            <param name="File"   value="${java.io.tmpdir}/sdl.log" />
-            <param name="Append" value="false" />	    	
-            <layout class="org.apache.log4j.PatternLayout">
-        <param name="ConversionPattern" 
-                       value="%d %-5p [%t] %C{2} %M (%F:%L) - %m%n"/>
-            </layout>	    
-    </appender>
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-           <layout class="org.apache.log4j.PatternLayout">
-             <param name="ConversionPattern"
-            value="%d %-5p [%t] %C{2} %M (%F:%L) - %m%n"/>
-           </layout>	    
-    </appender>
-
-    <category name="org.apache.log4j.xml">
-      <priority value="warn" />
-        <appender-ref ref="A1" />
-          <appender-ref ref="STDOUT" />
-    </category>
-
-    <logger name="org.apache" >
-          <level value ="warn" />
+<configuration>
+  <appenders>
+    <File name="fileAppender" fileName="${sys:java.io.tmpdir}/sdl.log" append="true">
+      <PatternLayout pattern="%d %-5p [%t] %C{2} %M (%F:%L) - %m%n"/>
+    </File>
+    <CONSOLE name="STDOUT" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d %-5p [%t] %C{2} %M (%F:%L) - %m%n"/>
+    </CONSOLE>
+  </appenders>
+  <loggers>
+    <logger name="org.apache.log4j.xml" level="warn">
+      <AppenderRef ref="fileAppender"/>
+      <AppenderRef ref="STDOUT" />
     </logger>
-
-    <root>
-       <priority value ="@LOG_LEVEL@" />
-           <appender-ref ref="A1" />
-          <appender-ref ref="STDOUT" />
-        </root>
-</log4j:configuration>
+    <logger name="org.apache" level="warn">
+      <AppenderRef ref="fileAppender"/>
+      <AppenderRef ref="STDOUT" />
+    </logger>
+    <root level="info">
+      <AppenderRef ref="fileAppender"/>
+      <AppenderRef ref="STDOUT" />
+    </root>
+  </loggers>
+</configuration>