From 7bd7e23b99337969f879118b83455b807a4a5794 Mon Sep 17 00:00:00 2001
From: Timothy Washington <timothyw@frye.local>
Date: Sat, 4 Sep 2010 11:25:47 -0400
Subject: [PATCH] -- basic adding of user (along with group) now in code --
 basic adding of default bookkeeping now in code

---
 etc/xml/default.bookkeeping.xml |  2 +-
 src/commands/add.clj            | 50 +++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/etc/xml/default.bookkeeping.xml b/etc/xml/default.bookkeeping.xml
index 2d96add..4be20d2 100755
--- a/etc/xml/default.bookkeeping.xml
+++ b/etc/xml/default.bookkeeping.xml
@@ -31,7 +31,7 @@
 		<account:account type="liability" 	id="" name="" counterWeight="credit"/>
 		<account:account type="revenue" 	id="" name="" counterWeight="credit" />
 	-->
-    <account:accounts id='main.accounts' >  
+	<account:accounts id='main.accounts' >  
 	</account:accounts>  
 	
 	<journal:journals id='main.journals' >
diff --git a/src/commands/add.clj b/src/commands/add.clj
index f636ce2..24d9020 100644
--- a/src/commands/add.clj
+++ b/src/commands/add.clj
@@ -29,14 +29,6 @@
 					
 					(println "user ALREADY exists") ;; TODO - throw error to user
 					
-;;					(let [ parsed-check (clojure.xml/parse (ByteArrayInputStream. (.getBytes check-user "UTF-8")))] 
-					
-;;				(println "parsed-checked[" parsed-check "]")
-;;				(if	(and	(= (keyword "user") (:tag parsed-check))
-;;							(= 	(:id (:attr (:previous @bkell/shell ))) 	;; checking incoming user against existing user 
-;;									(:id (:attrs parsed-check)))
-;;						)
-;;						(println "user[" (:id (:attrs parsed-check)) "] ALREADY exists") ;; TODO - throw error to user 
 					(do 
 						
 						(println "ADDING user[" (:previous @bkell/shell ) "]")  
@@ -68,9 +60,9 @@
 																		)
 															]
 															
-												(println "CREATED group [" db-group "] / XML[" (with-out-str (clojure.xml/emit db-group)) "]" )
 												
-												;; PUT to eXist
+												;; PUT to eXist 
+												(println "CREATing group [" db-group "] / XML[" (with-out-str (clojure.xml/emit db-group)) "]" )
 												(execute-http-call 		
 																							(str db-base-URL db-system-DIR (working-dir-lookup :group)
 																															"/" "group." (:id (:attrs (:previous @bkell/shell ))) 
@@ -82,24 +74,34 @@
 																						
 													
 												)
+												
+												;; 3. add to aauth.users ... PUT to eXist 
+												;; 4. profile Details ... PUT to eXist	... TODO 
+												(println "CREATing user [" (:previous @bkell/shell ) "] / XML[" (with-out-str (clojure.xml/emit (:previous @bkell/shell ))) "]" )
+												(execute-http-call 		
+																							(str db-base-URL db-system-DIR (working-dir-lookup :user)
+																															"/" "user." (:id (:attrs (:previous @bkell/shell ))) 
+																															"/" "user." (:id (:attrs (:previous @bkell/shell ))))
+																							"PUT" 
+																							{	"Content-Type" "text/xml"
+																								"Authorization" "Basic YWRtaW46"}
+																							(with-out-str (clojure.xml/emit (:previous @bkell/shell )))
+												)
+												
+												;; 5. add associated Bookkeeping to Group ... PUT to eXist 
+												(execute-http-call 		
+																							(str db-base-URL db-system-DIR (working-dir-lookup :bookkeeping)
+																															"/" "group." (:id (:attrs (:previous @bkell/shell ))) 
+																															"/bookkeeping.main.bookkeeping/bookkeeping.main.bookkeeping" )
+																							"PUT" 
+																							{	"Content-Type" "text/xml"
+																								"Authorization" "Basic YWRtaW46"}
+																							(slurp "etc/xml/default.bookkeeping.xml" )
+												)
 										)
 								)
 						)
-							
-						
-						
-						;; 3. add to aauth.users ... PUT to eXist
-						
-						
-						;; 4. profile Details ... PUT to eXist
-						
-						
-						;; 5. add associated Bookkeeping to Group ... PUT to eXist
-						;;(println "...loading default.bookkeeping.xml[" (clojure.xml/parse "etc/xml/default.bookkeeping.xml") "]")
-						
 						
-;;					)
-;;				)
 			)
 			)
 	)
-- 
2.11.4.GIT