[Cluster-devel] conga/luci load_site.py

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-09-18 21:11:26

Modified files:
	luci           : load_site.py 

Log message:
	fix a *.css.dtml naming bug, and support importing controller page templates

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- conga/luci/load_site.py	2006/09/15 21:25:37	1.11
+++ conga/luci/load_site.py	2006/09/18 21:11:26	1.12
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# $Id: load_site.py,v 1.11 2006/09/15 21:25:37 rmccabe Exp $
+# $Id: load_site.py,v 1.12 2006/09/18 21:11:26 rmccabe Exp $
 
 ##############################################################################
 #
@@ -143,11 +143,13 @@
 
 	try:
 		call(object.manage_addFile, id=name, file=open(f,'rb'), content_type=t)
-		if verbose: print 'Uploaded', name
+		if verbose:
+			print 'Uploaded', name
 	except:
-		if verbose: print name, 'exists trying to delete then upload again'
+		if verbose:
+			print name, 'exists trying to delete then upload again'
 		try:
-			call(object.manage_delObjects, ids=name)
+			call(object.manage_delObjects, ids=[name])
 			if verbose: print 'Uploaded', name
 			try:
 				call(object.manage_addFile, id=name, file=open(f,'rb'), content_type=t)
@@ -161,6 +163,29 @@
 def upload_js(object, f):
 	upload_txt(object, f, t='text/javascript')
 
+def upload_cpt(object, f):
+	dir, name = os.path.split(f)
+
+	nobject = object.__class__(object.url+'/manage_addProduct/CMFFormController',
+							username=object.username,
+							password=object.password)
+
+	dbid = name.split('.')[0]
+
+	try:
+		call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
+		if verbose: print 'Uploaded', dbid
+	except:
+		if verbose: print name, 'exists trying to delete then upload again'
+		try:
+			call(object.manage_delObjects, ids=[dbid])
+			if verbose: print 'Deleted', dbid
+			try:
+				call(nobject.manage_addControllerPageTemplate, id=dbid, file=open(f,'rb'))
+				if verbose: print 'Uploaded', dbid
+			except: print 'Unable to upload', dbid
+		except: print 'Unable to delete', dbid
+	
 def upload_pt(object, f):
 	dir, name = os.path.split(f)
 
@@ -172,17 +197,17 @@
 
 	try:
 		call(nobject.manage_addPageTemplate, id=dbid, file=open(f,'rb'))
-		if verbose: print 'Uploaded', name
+		if verbose: print 'Uploaded', dbid
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
-			call(object.manage_delObjects, ids=dbid)
-			if verbose: print 'Deleted', name
+			call(object.manage_delObjects, ids=[dbid])
+			if verbose: print 'Deleted', dbid
 			try:
 				call(nobject.manage_addPageTemplate, id=dbid, file=open(f,'rb'))
-				if verbose: print 'Uploaded', name
-			except: print 'Unable to upload', name
-		except: print 'Unable to delete', name
+				if verbose: print 'Uploaded', dbid
+			except: print 'Unable to upload', dbid
+		except: print 'Unable to delete', dbid
 
 from sgmllib import SGMLParser
 
@@ -300,7 +325,7 @@
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
-			call(object.manage_delObjects, ids=name)
+			call(object.manage_delObjects, ids=[name])
 			if verbose: print 'Deleted', name
 			try:
 				call(object.manage_addDTMLDocument, id=name, title=title, file=body)
@@ -335,9 +360,9 @@
 		db_id = name.split('.')
 		db_id_len = len(db_id)
 		if db_id_len > 2 and db_id[db_id_len - 2] != 'dtml':
-			db_id = str.join(db_id[:-1])
-	except:
-		db_id = name
+			db_id = apply(lambda x,y: x + '.' + y, db_id[:-1])
+		name = db_id
+	except: pass
 
 	try:
 		call(object.manage_addDTMLMethod, id=name, file=f)
@@ -345,7 +370,7 @@
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
-			call(object.manage_delObjects, ids=name)
+			call(object.manage_delObjects, ids=[name])
 			if verbose: print 'Deleted', name
 			try:
 				call(object.manage_addDTMLMethod, id=name, file=f)
@@ -362,7 +387,7 @@
 	except:
 		if verbose: print name, 'exists trying to delete then upload again'
 		try:
-			call(object.manage_delObjects, ids=name)
+			call(object.manage_delObjects, ids=[name])
 			if verbose: print 'Deleted', name
 			try:
 				call(object.manage_addImage, id=name, file=open(f,'rb'))