From 3bd48fc65d1bae526e9f6eb431572eb1a316c3a5 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Tue, 13 May 2003 16:42:31 +0000
Subject: [PATCH] More namespace fix-ups.

git-svn-id: http://dom-editor.googlecode.com/svn/branches/Gtk2@485 ef21e15d-ca94-4315-9c45-0d95b1b2e117
---
 Dome/Model.py   |  4 +++-
 Dome/Program.py |  7 ++++---
 Dome/View.py    | 17 +++--------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Dome/Model.py b/Dome/Model.py
index 913fafa..8cf6480 100644
--- a/Dome/Model.py
+++ b/Dome/Model.py
@@ -259,7 +259,9 @@ class Model:
 		return new
 	
 	def remove_ns(self, node):
-		raise Exception("Shouldn't need this now!")
+		print "remove_ns: Shouldn't need this now!"
+		return
+
 		nss = GetAllNs(node.parentNode)
 		dns = nss.get(None, None)
 		create = node.ownerDocument.createElementNS
diff --git a/Dome/Program.py b/Dome/Program.py
index 96da7f7..9bb135f 100644
--- a/Dome/Program.py
+++ b/Dome/Program.py
@@ -51,7 +51,8 @@ def load(node, parent, ns):
 					action[0] = 'map'
 				elif action[0] == 'add_attrib':
 					action[1] = "UNUSED"
-				elif action[0] == 'do_search' and action[2] != 'unused':
+				elif action[0] == 'do_search' and len(action) > 2 and \
+				  action[2] != 'unused':
 					print "Converting search namespaces..."
 					for p, u in action[2].iteritems():
 						print "Convert", p, u
@@ -61,7 +62,7 @@ def load(node, parent, ns):
 					action[2] = 'unused'
 				op = Op(action)
 			elif op_node.localName == 'block':
-				op = load(op_node, block)
+				op = load(op_node, block, ns)
 			else:
 				if op_node.nodeType == Node.ELEMENT_NODE and op_node.localName != 'fail':
 					print "** WARNING ** Unknown op:", op_node
@@ -133,7 +134,7 @@ def load_dome_program(prog, ns):
 			assert not done_update
 			new.code = load(node, new, ns)
 		if node.localName == 'dome-program':
-			new.add_sub(load_dome_program(node))
+			new.add_sub(load_dome_program(node, ns))
 		
 	new.modified = 0
 	return new
diff --git a/Dome/View.py b/Dome/View.py
index ebba2ed..8b6318e 100644
--- a/Dome/View.py
+++ b/Dome/View.py
@@ -1349,7 +1349,7 @@ class View:
 		except:
 			raise Beep
 		
-		new = node.ownerDocument.importNode(root.documentElement, 1)
+		new = self.model.import_with_ns(root.documentElement)
 		new.setAttributeNS(None, 'uri', uri)
 
 		if last_mod:
@@ -1598,19 +1598,6 @@ class View:
 		doc = support.parse_data(data, path)
 		self.set_root_from_doc(doc)
 
-	def load_node(self, root):
-		new = self.model.doc.importNode(root, 1)
-		
-		self.model.strip_space(new)
-
-		if self.root:
-			self.model.unlock(self.root)
-		self.move_to([])
-		self.model.replace_node(self.root, new)
-		self.model.lock(new)
-		self.root = new
-		self.move_to(self.root)
-	
 	def select_dups(self):
 		node = self.get_current()
 		select = []
@@ -1826,6 +1813,8 @@ class View:
 		self.model.normalise(self.get_current())
 	
 	def remove_ns(self):
+		print "remove_ns: Disabled"
+		return
 		nodes = self.current_nodes[:]
 		self.move_to([])
 		nodes = map(self.model.remove_ns, nodes)
-- 
2.11.4.GIT