Merge pull request #258 from worldbank/v3.2

V3.2
worldbank · Aug 3, 2023 · dc57121 · dc57121
2 parents a998a4a + 3be59dd
commit dc57121
Show file tree

Hide file tree

Showing 27 changed files with 178 additions and 135 deletions.
diff --git a/run/iecodebook.do b/run/iecodebook.do
diff --git a/run/output/iecorrect/hyphen-id.do b/run/output/iecorrect/hyphen-id.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:21
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:43
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-missingid.do b/run/output/iecorrect/iecorrect-missingid.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:43
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-multiple-ids.do b/run/output/iecorrect/iecorrect-multiple-ids.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:43
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-nobs.do b/run/output/iecorrect/iecorrect-nobs.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-precision.do b/run/output/iecorrect/iecorrect-precision.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:19
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-simple-num-id-drop.do b/run/output/iecorrect/iecorrect-simple-num-id-drop.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-simple-num-id-numeric.do b/run/output/iecorrect/iecorrect-simple-num-id-numeric.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:19
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-simple-num-id-string.do b/run/output/iecorrect/iecorrect-simple-num-id-string.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:19
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-simple-num-id.do b/run/output/iecorrect/iecorrect-simple-num-id.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:21
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:44
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-template-single-id.do b/run/output/iecorrect/iecorrect-template-single-id.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:19
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-test-idcond.do b/run/output/iecorrect/iecorrect-test-idcond.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:42
 ==============================================================================*/
 
 

diff --git a/run/output/iecorrect/iecorrect-wildcard-strings.do b/run/output/iecorrect/iecorrect-wildcard-strings.do
@@ -1,6 +1,6 @@
 /*==============================================================================
 This do-file was created using iecorrect
-Last updated by luizaandrade on  6 Feb 2023 at 11:19:20
+Last updated by luizaandrade on 31 Jul 2023 at 19:15:43
 ==============================================================================*/
 
 

diff --git a/src/ado_files/iecodebook.ado b/src/ado_files/iecodebook.ado
@@ -1,4 +1,4 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 // Main syntax ---------------------------------------------------------------------------------
 
@@ -158,7 +158,8 @@ cap program drop iecodebook_export
   program    iecodebook_export
 
   syntax [anything] [using/]  ///
-    , [replace] [save] [saveas(string asis)] [trim(string asis)]     /// User-specified options
+    , [replace] [save] [saveas(string asis)] /// User-specified options
+      [trim(string asis)] [trimkeep(string asis)]  /// User-specified options
       [SIGNature] [reset] [PLAINtext(string)] [noexcel] [verify]      /// Signature and verify options
       [match] [template(string asis)] [tempfile]    // Programming options
 
@@ -274,7 +275,7 @@ qui {
         di as err "You are dropping all variables. This is not allowed. {bf:iecodebook} will now exit."
         error 198
       }
-      keep `theKeepList' // Keep only variables mentioned in the dofiles
+      keep `theKeepList' `trimkeep' // Keep only variables mentioned in the dofiles
   } // End [trim] option
 
   // Prepare to save and sign
@@ -703,7 +704,6 @@ qui {
     }
     if "`: list allVars - theNameList'" != "" {
       if "`drop'" != "" {
-        pause
         local firstDrop  "drop `: list allVars - theNameList'"
       }
       else {

diff --git a/src/ado_files/iecompdup.ado b/src/ado_files/iecompdup.ado
@@ -1,4 +1,4 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 	capture program drop iecompdup
 	program iecompdup , rclass

diff --git a/src/ado_files/iecorrect.ado b/src/ado_files/iecorrect.ado
@@ -1,4 +1,4 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 cap program drop iecorrect
 	program 	 iecorrect

diff --git a/src/ado_files/ieduplicates.ado b/src/ado_files/ieduplicates.ado
@@ -1,4 +1,4 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 	capture program drop ieduplicates
 	program ieduplicates , rclass

diff --git a/src/ado_files/iefieldkit.ado b/src/ado_files/iefieldkit.ado
@@ -1,11 +1,11 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 capture program drop iefieldkit
 program iefieldkit, rclass
 
 	* UPDATE THESE LOCALS FOR EACH NEW VERSION PUBLISHED
-	local version "3.1"
-	local versionDate "7JAN2023"
+	local version "3.2"
+	local versionDate "31JUL2023"
 
 	syntax [anything]
 

diff --git a/src/ado_files/ietestform.ado b/src/ado_files/ietestform.ado
@@ -1,4 +1,4 @@
-*! version 3.1 7JAN2023  DIME Analytics [email protected]
+*! version 3.2 31JUL2023  DIME Analytics [email protected]
 
 capture program drop ietestform
 		program ietestform , rclass
@@ -232,9 +232,17 @@ qui {
 		TEST - Encryption key not included/errors
 	***********************************************/
 
-	*converting public_key to string to convert from numeric incase of missing public_key
-	tostring public_key, replace
-	local public_key = public_key[1]
+	*Testing if a variable pulbic_key at all exists
+	cap confirm variable public_key
+	if _rc {
+		local public_key = ""
+	}
+	*If varialbe exists, convert whatever value (or missing) to string
+	else {
+		tostring public_key, replace
+		local public_key = public_key[1]
+	}
+
 
 	cap assert !missing("`public_key'")
 

diff --git a/src/help_files/iecodebook.sthlp b/src/help_files/iecodebook.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:iecodebook}
 {hline}
@@ -83,7 +83,7 @@ and optionally reduces the dataset to only the variables used in a set of specif
 {p 2 4}, [{bf:replace}] [{opt save}] [{bf:verify}] {break}
     [{opt sign:ature}] [{opt reset}] {break}
 	[{opt plain:text}({it:compact} | {it:detailed})] [{opt noexcel}] {break}
-    [{bf:trim(}{it:"/path/to/dofile1.do"} [{it:"/path/to/dofile2.do"}] [...]{bf:)}]{p_end}
+    [{bf:trim(}{it:"/path/to/dofile1.do"} [{it:"/path/to/dofile2.do"}] [...]{bf:)}] [{opth trimkeep(varlist)}]{p_end}
 
 {hline}
 
@@ -157,7 +157,7 @@ It will break with an error and describe all changes if there are any difference
 A new codebook will not be written in this case.{p_end}
 {break}
 {synopt:{opt plain:text}({it:compact} | {it:detailed})}This option requests that the codebook be created as a plaintext file.
-This file contains the default output of {help codebook} if argument {it:detailed}} is used, 
+This file contains the default output of {help codebook} if argument {it:detailed}} is used,
 and the compact output of {help codebook} if argument {it:compact} is used.
 Only one of the arguments can be used}.{p_end}
 {synopt:{opt noexcel}}This option requests that the codebook be created as a plaintext file.
@@ -174,6 +174,8 @@ or overwrite an existing datasignature.{p_end}
 {break}
 {synopt:{opt trim()}}This option takes one or more dofiles as inputs, and trims the current dataset to only include variables used in those dofiles,
 before executing any of the other {bf: export} tasks requested.{p_end}
+{synopt:{opt trimkeep()}}This option adjusts {opt trim()} to retain additional
+variables (such as ID variables) that are desired, but not used in code.{p_end}
 {synoptline}
 
 {marker example}

diff --git a/src/help_files/iecompdup.sthlp b/src/help_files/iecompdup.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:iecompdup}
 {hline}

diff --git a/src/help_files/iecorrect.sthlp b/src/help_files/iecorrect.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:iecorrect}
 {hline}

diff --git a/src/help_files/ieduplicates.sthlp b/src/help_files/ieduplicates.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:ieduplicates}
 {hline}

diff --git a/src/help_files/iefieldkit.sthlp b/src/help_files/iefieldkit.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:iefieldkit}
 {hline}

diff --git a/src/help_files/ietestform.sthlp b/src/help_files/ietestform.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 7 Jan 2023}{...}
+{* 31 Jul 2023}{...}
 {hline}
 help for {hi:ietestform}
 {hline}

diff --git a/src/iefieldkit.pkg b/src/iefieldkit.pkg
@@ -1,4 +1,4 @@
-v 3.1
+v 3.2
 d iefieldkit. DIME Analytics iefieldkit
 d DIME Analytics, World Bank Group, Development Economics Research
 f /ado_files/iefieldkit.ado

diff --git a/src/stata.toc b/src/stata.toc
@@ -1,3 +1,3 @@
-v 3.1
+v 3.2
 d DIME Analytics, World Bank Group, Development Economics Research
 p iefieldkit DIME Analytics iefieldkit