From 1aa3432da4e6cfcb98786cbd85b102d848361bb0 Mon Sep 17 00:00:00 2001
From: lbessard <lbessard>
Date: Mon, 10 Sep 2007 12:32:07 +0000
Subject: [PATCH] Bug on Load Project fixed

---
 objdictgen/nodelist.py    | 13 +++++++++----
 objdictgen/nodemanager.py | 23 +++++++++++++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/objdictgen/nodelist.py b/objdictgen/nodelist.py
index 2b6ceea..f516769 100644
--- a/objdictgen/nodelist.py
+++ b/objdictgen/nodelist.py
@@ -23,7 +23,7 @@
 
 from node import *
 import eds_utils
-import os, shutil
+import os, shutil, types
 
 #-------------------------------------------------------------------------------
 #                          Definition of NodeList Object
@@ -102,11 +102,13 @@ class NodeList:
                 result = self.LoadEDS(file)
                 if result != None:
                     return result
-                
+        
+        print "Load Master"
         result = self.LoadMasterNode(netname)
         if result != None:
             return result
             
+        print "Load Slaves"
         result = self.LoadSlaveNodes(netname)
         if result != None:
             return result
@@ -163,9 +165,12 @@ class NodeList:
         else:
             masterpath = os.path.join(self.Root, "master.od")
         if os.path.isfile(masterpath):
-            return self.Manager.OpenFileInCurrent(masterpath)
+            result = self.Manager.OpenFileInCurrent(masterpath)
         else:
-            return self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"])
+            result = self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"])
+        if not isinstance(result, types.IntType):
+            return result
+        return None
     
     def SaveMasterNode(self, netname = None):
         if netname:
diff --git a/objdictgen/nodemanager.py b/objdictgen/nodemanager.py
index c4ea0bf..338fc0c 100755
--- a/objdictgen/nodemanager.py
+++ b/objdictgen/nodemanager.py
@@ -247,7 +247,7 @@ class NodeManager:
                 node.SetSpecificMenu(AddMenuEntries)
                 return None
             except:
-                return "Syntax Error\nBad OD Profile file!."
+                return "Syntax Error\nBad OD Profile file!"
         else:
             # Default profile
             node.SetProfileName("None")
@@ -259,15 +259,18 @@ class NodeManager:
     Open a file and store it in a new buffer
     """
     def OpenFileInCurrent(self, filepath):
-        # Open and load file
-        file = open(filepath, "r")
-        node = load(file)
-        file.close()
-        self.CurrentNode = node
-        # Add a new buffer and defining current state
-        index = self.AddNodeBuffer(self.CurrentNode.Copy(), True)
-        self.SetCurrentFilePath(filepath)
-        return index
+        try:
+            # Open and load file
+            file = open(filepath, "r")
+            node = load(file)
+            file.close()
+            self.CurrentNode = node
+            # Add a new buffer and defining current state
+            index = self.AddNodeBuffer(self.CurrentNode.Copy(), True)
+            self.SetCurrentFilePath(filepath)
+            return index
+        except:
+            return "Unable to load file \"%s\"!"%filepath
 
     """
     Save current node in  a file
-- 
2.39.2