From 9907ed4105b98dbbfc68b67a91bd3dd205246a2d Mon Sep 17 00:00:00 2001
From: Gerry Nelson <45608078+gerrynelson63@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:30:15 -0500
Subject: [PATCH] optionally return json from getfolderid (#41)

---
 __pycache__/sharedfunctions.cpython-36.pyc | Bin 8304 -> 8310 bytes
 getfolderid.py                             |  23 ++++++++++++++-------
 sharedfunctions.py                         |   3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/__pycache__/sharedfunctions.cpython-36.pyc b/__pycache__/sharedfunctions.cpython-36.pyc
index e4c7ea3f4e17201448edecce85d4762ddb125049..6a173026d7c1bd5e21d59e93e0d5e4b354a59c0a 100644
GIT binary patch
delta 265
zcmez1@XdkCn3tDJ)XY9E)Mq1C2$Q^ler{fgezJagW=VN|QFdltx_&`rS!QKoNq&A#
zvHs>trc!1u76t|eXCN+4nEZn^mZgL-on>-3+abo8o2A$vFfnf1{F`$MGvl+#6L>E%
zs%=i@+sDLcyje+b9W!Ib=8GbtjEv_dKNmg1d5f($Gq)fo_15GqVlIrgCjS&OWxPLG
zUtF9qeY3lGAq!*F<ek#;j2V+}N?S92oh&L7$e6h~U8ataF>CTOSye{Q$vkq(j5(VP
z<eV89(<hh6E3)SSU8N}=HF=JFkw7|-U6ctTazI4hWH|*}QAZA04g(Gc4qgsZo-__Y
K2{Dck4mkj@^-j6~

delta 277
zcmez7@WFx0n3tDpVbSu~X1|SGAxzRb$yPDxnI+}<McJ8o=`jVBWto+UCHeU|#W9;}
znM#?tm>C!toPoGFZt@@2Sf+I5$+2vQ7-wu&V1K~GxOFol*A!;Pr<14gUSd?;oXNM3
ziP31YhTuA8#`MkCMMN1H&rW_TdW18ItvEBcASX3y@-8tK#;D2v#Y`pdF#-+c1Dedh
z!o$SD$i>LP$j2nYSd_BaSG<sg@z&)1((;U{lkZDgGk%#YEfWYdF;}LJkuhWP8(CFG
zkI6!E%8Xf?&E%XJ8Pg_L$t$ww0FBZVzcqQ0e33v3kX@7xBC<e4&SVt@TTurNSq=jZ
T2M%5iQ=T*qK?yOA5Dqy2H<?ZS

diff --git a/getfolderid.py b/getfolderid.py
index ae0b696..67b82a6 100755
--- a/getfolderid.py
+++ b/getfolderid.py
@@ -9,7 +9,8 @@
 #
 # Change History
 #
-# 27JAN2017 Comments added    
+# 27JAN2017 Comments added  
+# 08FEB2020 Added the option to return full json     
 #
 #
 # Copyright © 2018, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
@@ -29,19 +30,27 @@
 
 import argparse
 
-from sharedfunctions import getfolderid
+from sharedfunctions import getfolderid, printresult
 
 # setup command-line arguements    
 parser = argparse.ArgumentParser()
 parser.add_argument("-f","--folderpath", help="Enter the path to the viya folder.",required='True')
+parser.add_argument("-o","--output", help="Output Style", choices=['csv','json','simple'],default='simple')
+
 args = parser.parse_args()
 path_to_folder=args.folderpath
+output_style=args.output
 
 # call the get folderid function and pass it the entered path
 targets=getfolderid(path_to_folder)
 
-#print results if any are returned
-if targets[0] is not None:
-    print("Id  = "+targets[0])
-    print("URI = "+targets[1])
-    print("Path = "+targets[2])
\ No newline at end of file
+# default simple output style prints with original print method
+# but can also choose json or csv
+if output_style=='simple':
+
+    #print results if any are returned
+    if targets[0] is not None:
+        print("Id  = "+targets[0])
+        print("URI = "+targets[1])
+        print("Path = "+targets[2])
+else: printresult(targets[3],output_style)
\ No newline at end of file
diff --git a/sharedfunctions.py b/sharedfunctions.py
index d73b2e7..5cc85a6 100755
--- a/sharedfunctions.py
+++ b/sharedfunctions.py
@@ -148,6 +148,7 @@ def callrestapi(reqval, reqtype, acceptType='application/json', contentType='app
 # when a Viya content path is passed in return the id, path and uri
 # change history
 #   01dec2017 initial development
+#   08Feb2020 return full json as 4 item in list that is returned
 
 def getfolderid(path):
     
@@ -167,7 +168,7 @@ def getfolderid(path):
         targetname=result['name']
         targeturi="/folders/folders/"+targetid
                 
-    return [targetid,targeturi,targetname]
+    return [targetid,targeturi,targetname,result]
   
     
 # getbaseurl