Changeset 884 for MGET/Branches/Jason/PythonPackage/src/GeoEco/Metadata.py

Timestamp:

01/04/12 17:18:48 (17 months ago)

Author:

jjr8

Message:

Fixed build break. Rebuilt ArcGIS 9.3 toolbox.

Files:

• MGET/Branches/Jason/PythonPackage/src/GeoEco/Metadata.py (modified) (3 diffs)

MGET/Branches/Jason/PythonPackage/src/GeoEco/Metadata.py

@@ -524 +524 @@
         self.AppendPropertyXMLNode(self, u'COMVersionIndependentProgID', node, document)
         self.AppendPropertyXMLNode(self, u'COMVersionDependentProgID', node, document)
+        
         propertiesNode = node.appendChild(document.createElement(u'Properties'))
         for (name, prop) in inspect.getmembers(self.Object, inspect.isdatadescriptor):
@@ -529 +530 @@
                 propertyNode = propertiesNode.appendChild(document.createElement(u'PropertyMetadata'))
                 prop.__doc__.Obj.AppendXMLNodes(propertyNode, document)
+
+        inheritedMethodNames = set()
+        for c in inspect.getmro(self.Object)[1:]:
+            inheritedMethodNames.update(set([m[0] for m in inspect.getmembers(c, inspect.ismethod)]))
+                
         methodsNode = node.appendChild(document.createElement(u'Methods'))
         for (name, method) in inspect.getmembers(self.Object, inspect.ismethod):
             if isinstance(method.__doc__, DynamicDocString) and isinstance(method.__doc__.Obj, MethodMetadata):
                 methodNode = methodsNode.appendChild(document.createElement(u'MethodMetadata'))
-                method.__doc__.Obj.AppendXMLNodes(methodNode, document)
+                method.__doc__.Obj.AppendXMLNodes(methodNode, document, name in inheritedMethodNames)
 
 
@@ -839 +845 @@
         return doc
 
-    def AppendXMLNodes(self, node, document):
+    def AppendXMLNodes(self, node, document, isInherited):
         super(MethodMetadata, self).AppendXMLNodes(node, document)
         self.AppendPropertyXMLNode(self, u'IsExposedToPythonCallers', node, document)
         self.AppendPropertyXMLNode(self, u'IsExposedByCOM', node, document)
-        self.AppendPropertyXMLNode(self, u'IsExposedAsArcGISTool', node, document)
+
+        # If this method is inherited from a parent class, force
+        # IsExposedAsArcGISTool to false, so that
+        # CreateArcGISToolbox.exe does not try to create a toolbox
+        # entry multiple times for the same method.
+
+        if not isInherited:
+            self.AppendPropertyXMLNode(self, u'IsExposedAsArcGISTool', node, document)
+        else:
+            n = node.appendChild(document.createElement(u'IsExposedAsArcGISTool'))
+            n.appendChild(document.createTextNode(u'false'))
+        
         self.AppendPropertyXMLNode(self, u'ArcGISDisplayName', node, document)
         self.AppendPropertyXMLNode(self, u'ArcGISToolCategory', node, document)