Object select fix and source attribute ANSI quoted (#19)

* Synced MDDE_LDM with Rabobank version. * Updated XML export after updates.
CrossBreezeNL · May 14, 2024 · 683dc5a · 683dc5a
1 parent 0b9dc46
commit 683dc5a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/decomposed/extensions/MDDE_LDM/ExtendedModelDefinition/a_CheckGlobalScript.xml b/decomposed/extensions/MDDE_LDM/ExtendedModelDefinition/a_CheckGlobalScript.xml
@@ -213,7 +213,7 @@ Function SelectSourceObjectAttribute(objSourceObject)
          Exit Function
       End If
 
-      &#39; Get a reference the real source object
+      &#39; Get a reference to the real source object
       Dim objRealSourceObject : Set objRealSourceObject = GetRealObject(objSourceObject.GetExtendedAttribute(&quot;mdde_JoinedObject&quot;))
 
       &#39; If the selected source object is a scalar business rule, we automatically set the output attribute here without showing the object picker (if there is only one output attribute).
@@ -223,13 +223,13 @@ Function SelectSourceObjectAttribute(objSourceObject)
          For Each objAttribute in objRealSourceObject.Attributes
             &#39; If the current attribute is an output attribute, select this one (for now, if it turns output there where multiple outputs, the variable will be unset later and object picker will be shown).
             If objAttribute.HasStereotype(&quot;mdde_OutputAttribute&quot;) Then
-               Set SelectMappingSourceAttribute = objAttribute
+               Set SelectSourceObjectAttribute = objAttribute
                intOutputAttributeCount = intOutputAttributeCount + 1
             End If
          Next
 
          &#39; Of the output attribute wasn&#39;t found, show an error and stop the method.   
-         If SelectMappingSourceAttribute Is Nothing Then
+         If intOutputAttributeCount = 0 Then
             MsgBox _
                 &quot;The selected scalar business rule doesn&#39;t have an output attribute!&quot; &amp; vbCrLf &amp; vbCrLf _
                   &amp; &quot;Please make sure there is only one attribute in the scalar business rule with the stereotype &#39;Output attribute (MDDE)&#39;.&quot; _
@@ -238,7 +238,7 @@ Function SelectSourceObjectAttribute(objSourceObject)
             Exit Function
          &#39; If there are multiple output attributes, show the object picker.
          ElseIf intOutputAttributeCount &gt; 1 Then
-            Set SelectMappingSourceAttribute = Nothing
+            Set SelectSourceObjectAttribute = Nothing
          End If
       End If   
 

diff --git a/...n_ClassifierIsPivotBusinessRule/Templates/mdde_Mapping_Stereotyped_XmlExport_Template.xml b/...n_ClassifierIsPivotBusinessRule/Templates/mdde_Mapping_Stereotyped_XmlExport_Template.xml
@@ -3,10 +3,10 @@
 <a:Name>mdde_Mapping_Stereotyped_XmlExport_Template</a:Name>
 <a:TemplateTargetItem.Value>&lt;PivotConfig
 .if (%mdde_PivotHeaderAttributeSelector%)
- PivotHeaderAttribute=&quot;%mdde_PivotAggregatedAttribute_SourceObject.Code%.%mdde_PivotHeaderAttribute.Code%&quot;
+ PivotHeaderAttribute=&quot;&amp;quot;%mdde_PivotAggregatedAttribute_SourceObject.Code%&amp;quot;.&amp;quot;%mdde_PivotHeaderAttribute.Code%&amp;quot;&quot;
 .endif()
 .if (%mdde_PivotAggregatedAttributeSelector%)
- PivotAggregatedAttribute=&quot;%mdde_PivotAggregatedAttribute_SourceObject.Code%.%mdde_PivotAggregatedAttribute.Code%&quot;
+ PivotAggregatedAttribute=&quot;&amp;quot;%mdde_PivotAggregatedAttribute_SourceObject.Code%&amp;quot;.&amp;quot;%mdde_PivotAggregatedAttribute.Code%&amp;quot;&quot;
 .endif()
 .if (%mdde_PivotAggregateFunction%)
  PivotAggregateFunction=&quot;%.X:mdde_PivotAggregateFunction%&quot;

diff --git a/...apping/Templates/mdde_BaseStructuralFeatureMapping_SourceAttribute_XmlExport_Template.xml b/...apping/Templates/mdde_BaseStructuralFeatureMapping_SourceAttribute_XmlExport_Template.xml
@@ -6,7 +6,7 @@
   .if (%SourceFeature%)
     .comment If the source object is also known, the mapping is correct and we present the source attribute.
     .if (%mdde_SourceObject%)
-%mdde_SourceObject.Code%.%SourceFeature.Code%
+&quot;%mdde_SourceObject.Code%&quot;.&quot;%SourceFeature.Code%&quot;
     .endif
   .comment If the mapped to value is a numeric value or encapsulated in single quotes, it&#39;s a static value.
   .elsif (%mdde_IsLiteralValue%)

diff --git a/...on_ParentIsMDDEMapping/Templates/mdde_BaseStructuralFeatureMapping_XmlExport_Template.xml b/...on_ParentIsMDDEMapping/Templates/mdde_BaseStructuralFeatureMapping_XmlExport_Template.xml
@@ -3,7 +3,7 @@
 <a:Name>mdde_BaseStructuralFeatureMapping_XmlExport_Template</a:Name>
 <a:TemplateTargetItem.Value>&lt;%Feature.mdde_NamedObject_XmlElementName%Mapping Id=&quot;%ObjectID%&quot; TargetAttribute=&quot;%Feature.Code%&quot;
 .if (%mdde_BaseStructuralFeatureMapping_SourceAttribute_XmlExport_Template%)
- SourceAttribute=&quot;%mdde_BaseStructuralFeatureMapping_SourceAttribute_XmlExport_Template%&quot; IsLiteralValue=&quot;%mdde_IsLiteralValue%&quot;
+ SourceAttribute=&quot;%.X:mdde_BaseStructuralFeatureMapping_SourceAttribute_XmlExport_Template%&quot; IsLiteralValue=&quot;%mdde_IsLiteralValue%&quot;
 .endif()
 .comment Add the Aggregate function if it is specified.
 .if (%mdde_Aggregate?%)

diff --git a/...es/mdde_JoinCondition/Templates/mdde_JoinCondition_ParentAttribute_XmlExport_Template.xml b/...es/mdde_JoinCondition/Templates/mdde_JoinCondition_ParentAttribute_XmlExport_Template.xml
@@ -5,7 +5,7 @@
 .if %mdde_ParentLiteralValue%
 %mdde_ParentLiteralValue%
 .elsif (%mdde_ParentSourceObject%) &amp;&amp; (%mdde_ParentAttribute%)
-%mdde_ParentSourceObject.Code%.%mdde_ParentAttribute.Code%
+&amp;quot;%mdde_ParentSourceObject.Code%&amp;quot;.&amp;quot;%mdde_ParentAttribute.Code%&amp;quot;
 .endif</a:TemplateTargetItem.Value>
 <a:CreationDate>1654155830</a:CreationDate>
 <a:Creator>WesselsH1</a:Creator>