PLCControler.py
changeset 570 37ba389e5c01
parent 567 eb523c4fa2da
child 616 8a60ffcfd70b
--- a/PLCControler.py	Sun Oct 09 23:31:13 2011 +0200
+++ b/PLCControler.py	Sun Oct 09 23:31:50 2011 +0200
@@ -23,7 +23,7 @@
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from xml.dom import minidom
-from types import StringType, UnicodeType
+from types import StringType, UnicodeType, TupleType
 import cPickle
 import os,sys,re
 import datetime
@@ -311,7 +311,14 @@
                 self.Project.setcontentHeader(properties)
             if name is not None or properties is not None:
                 self.BufferProject()
-            
+    
+    # Return project name
+    def GetProjectName(self, debug=False):
+        project = self.GetProject(debug)
+        if project is not None:
+            return project.getname()
+        return None
+    
     # Return project properties
     def GetProjectProperties(self, debug = False):
         project = self.GetProject(debug)
@@ -1358,6 +1365,8 @@
         return True
 
     def IsLocatableType(self, type, debug = False):
+        if isinstance(type, TupleType):
+            return False 
         project = self.GetProject(debug)
         if project is not None:
             datatype = project.getdataType(type)
@@ -2695,6 +2704,13 @@
             return True
 
 #-------------------------------------------------------------------------------
+#                       Search in Current Project Functions
+#-------------------------------------------------------------------------------
+
+    def SearchInProject(self, criteria):
+        return self.Project.Search(criteria)
+
+#-------------------------------------------------------------------------------
 #                      Current Buffering Management Functions
 #-------------------------------------------------------------------------------