Bläddra i källkod

DataModel: Obsolescence conditions, workaround a code issue by using COALESCE when an obsolescence condition can be NULL.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4819 a333f486-631f-4898-b8df-5754b55c2be0
cisou 8 år sedan
förälder
incheckning
cbf070e0ae

+ 7 - 7
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -30,7 +30,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='inactive'</condition>
+          <condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -137,7 +137,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='inactive'</condition>
+          <condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -897,7 +897,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='obsolete'</condition>
+          <condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -1667,7 +1667,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='obsolete'</condition>
+          <condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -2943,7 +2943,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='inactive'</condition>
+          <condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -3102,7 +3102,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='inactive'</condition>
+          <condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -3228,7 +3228,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='inactive'</condition>
+          <condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>

+ 2 - 2
datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml

@@ -26,7 +26,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition>status='obsolete'</condition>
+          <condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>
@@ -283,7 +283,7 @@
           </attributes>
           </attributes>
         </reconciliation>
         </reconciliation>
         <obsolescence>
         <obsolescence>
-          <condition><![CDATA[status='obsolete' OR (server_id!=0 AND server_id_obsolescence_flag)]]></condition>
+          <condition><![CDATA[COALESCE(status='obsolete' OR (server_id!=0 AND server_id_obsolescence_flag),0)]]></condition>
         </obsolescence>
         </obsolescence>
       </properties>
       </properties>
       <fields>
       <fields>