From 4327849cdc47d4474e99c3b98d37f9779be70779 Mon Sep 17 00:00:00 2001
From: Evan Thoms <ethoms@usgs.gov>
Date: Wed, 27 Jan 2021 20:29:39 -0900
Subject: [PATCH] Validate Database tool has all new functions as of 1/15/21 of
 the ArcMap version and runs with no errors

---
 GeMS_Tools_AGP2.tbx                   | Bin 241152 -> 241152 bytes
 Scripts/GeMS_ValidateDatabase_AGP2.py |  16 ++++++++++++----
 Scripts/GeMS_utilityFunctions.py      |  15 +++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/GeMS_Tools_AGP2.tbx b/GeMS_Tools_AGP2.tbx
index 3280d3ae84c33542aca3acf6d14ca90a751fac3f..f1cb28e422edc1b7d86c1292fb5a4d1ba3c5949c 100644
GIT binary patch
delta 94
zcmZp;!`E<!Z$l0n>w)I~4ThTw*&IZt&tJ-zG+jW3nPs!Mj3FbKyLpxDL@+C0x_~tk
s%jACf7c7>h#zvF%f~+RTe^r=%?-)}+v#Mgdsv;v0Gi_H@WWL=40Es6dng9R*

delta 100
zcmZp;!`E<!Z$l0ntAW{4L(a{GY!0H+PnR+WOn=YLC^TI_hM8rvxQrnqLTvLY*@<9o
t$mD+c7p$fRCMK4X^@A)Y$A49re(xAlK(nf1yQ(515HoF8Rb;;10|3zJB2oYV

diff --git a/Scripts/GeMS_ValidateDatabase_AGP2.py b/Scripts/GeMS_ValidateDatabase_AGP2.py
index 3127361..26b2aa7 100644
--- a/Scripts/GeMS_ValidateDatabase_AGP2.py
+++ b/Scripts/GeMS_ValidateDatabase_AGP2.py
@@ -8,13 +8,21 @@
 # Edited 7/15/20 to work in ArcGIS Pro 2.5 with Python 3
 # Evan Thoms
 # 10/8/20 updates from Ralph's version '7 October 2020'
+# 1/27/21 added all of the following updates from the ArcMap version - ET
+#
+# 22 December 2020: Edited output text to correctly identify XXX_Validation.gdb. Added option to delete unused rows in Glossary and DataSources - RH
+# 23 December 2020: Refreshing GeoMaterialDict now also refreshes the domain associated with GeoMaterial field in DescriptionOfMapUnits - RH
+# 28 December 2020: Added warning if active edit session on input GDB - RH
+# 15 January 2021: Added warning if SRF not in (NAD83, WGS84)
+#    Added reminder to document any schema extensions
+#    Added feature dataset SRF names to database inventory     - RH
 
 import arcpy, os, os.path, sys, time, glob
 from arcpy import metadata as md
 from GeMS_utilityFunctions import *
 from GeMS_Definition import *
 
-versionString = 'GeMS_ValidateDatabase_AGP2.py, version of 8 October 2020'
+versionString = 'GeMS_ValidateDatabase_AGP2.py, version of 27 January 2021'
 
 
 metadataSuffix = '-vFgdcMetadata.txt'
@@ -856,9 +864,9 @@ def deleteExtraRows(table,field,vals):
     # write starting messages
     addMsgAndPrint(versionString)
 
-# having trouble getting this to work in Python 3, punting for now, 1/27/21
-#    if editSessionActive(inGdb):
-#        arcpy.AddWarning ("\nDatabase is being edited. Results may be incorrect if there are unsaved edits\n")
+    if editSessionActive(inGdb):
+       arcpy.AddWarning ("\nDatabase is being edited. Results may be incorrect if there are unsaved edits\n")
+       
     if refreshGeoMaterialDict == 'true':
         addMsgAndPrint('Refreshing GeoMaterialDict')
         gmd = inGdb+'/GeoMaterialDict'
diff --git a/Scripts/GeMS_utilityFunctions.py b/Scripts/GeMS_utilityFunctions.py
index 15e095d..2d2893e 100644
--- a/Scripts/GeMS_utilityFunctions.py
+++ b/Scripts/GeMS_utilityFunctions.py
@@ -202,13 +202,12 @@ def editSessionActive(gdb):
             row = next(rows)
             with arcpy.da.UpdateCursor(tbl, fld) as rows2:
                 row2 = next(rows2)
-    except: # RuntimeError as e:
-        arcpy.AddMessage("workspace already in transaction mode")
-        #if e == "workspace already in transaction mode":
-            # this error means that no edit session is active
-        edit_session = False
-        # else:
-            # # we have some other error going on, report it
-            # raise
+    except RuntimeError as e:
+        if "workspace already in transaction mode" in str(e):
+            # # this error means that no edit session is active
+            edit_session = False
+        else:
+            # # # we have some other error going on, report it
+            raise
     return edit_session