Update AppSchemaDataAccess.xsd in tutorial.

RiniAngreani · RiniAngreani · commit 1cf2f6fb018a · 2013-12-04T10:50:07.000+08:00
diff --git a/data/app-schema-tutorial/workspaces/gsml/gsml_GeologicUnit/AppSchemaDataAccess.xsd b/data/app-schema-tutorial/workspaces/gsml/gsml_GeologicUnit/AppSchemaDataAccess.xsd
@@ -237,23 +237,16 @@
                   Flag to indicate that we want to connect to an xml data source]]>
                 </documentation>
               </annotation>
-            </element>  
-            <element name="groupBy" minOccurs="0" maxOccurs="1">
+            </element>
+            <element name="isDenormalised" type="boolean" default="true" minOccurs="0">
               <annotation>
                 <documentation>
                   <![CDATA[
-              This is how we achieve our basic support for multivalued properties. If you have a source featuretype
-              serving features produced by a join query, you have to specify here as many GroupByAttribute
-              elements as attributes needed to make a unique feature from the joined results, so complex datastore
-              will be able of recognizing where a target feature with multiple valued attributes ends.
-            ]]>
+                  Flag to indicate if the data is denormalised or not.  If data is not denormalised
+                  (flag = false) then its safe for us to apply the system configured maxFeatures
+                  value when building the SQL query to run ]]>
                 </documentation>
               </annotation>
-              <complexType>
-                <sequence>
-                  <element name="GroupByAttribute" type="string" minOccurs="0" maxOccurs="unbounded" />
-                </sequence>
-              </complexType>
             </element>
             <element name="attributeMappings" minOccurs="0">
               <annotation>
@@ -327,7 +320,16 @@
     </annotation>
     <sequence>
       <choice minOccurs="0">
-        <element name="OCQL" type="string" />
+        <sequence>            
+          <element name="OCQL" type="string" />          
+          <element name="index" type="string" minOccurs="0" maxOccurs="1">
+            <annotation>
+              <documentation>
+                <![CDATA[ The index of database row if denormalised. Example of usage is timeseries endPosition that reflects the last timePosition where the timePosition value is dynamic. ]]>
+              </documentation>
+            </annotation>
+          </element>
+        </sequence>
         <element name="Expression">
           <complexType>
             <sequence>
@@ -443,8 +445,23 @@
             <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
             a multivalued property. AppSchemaDataAccess will treat all the attribute mappings having this flag
             set to true as multivalued attributes and will create as many instances of it as Features of
-            the surrogate datastore lie inside the group mapping, as defined by the groupBy element in 
-            a FeatureTypeMapping ]]>
+            the surrogate datastore lie inside the FeatureTypeMapping ]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="encodeIfEmpty" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to determine whether to skip a attribute mapping if it is empty default to false]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="isList" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
+            a container of a list of values. This is similar to isMultiple except the values are concatenated
+            as one big value instead of multiple elements with each value.]]>
           </documentation>
         </annotation>
       </element>
diff --git a/data/app-schema-tutorial/workspaces/gsml/gsml_MappedFeature/AppSchemaDataAccess.xsd b/data/app-schema-tutorial/workspaces/gsml/gsml_MappedFeature/AppSchemaDataAccess.xsd
@@ -237,23 +237,16 @@
                   Flag to indicate that we want to connect to an xml data source]]>
                 </documentation>
               </annotation>
-            </element>  
-            <element name="groupBy" minOccurs="0" maxOccurs="1">
+            </element>
+            <element name="isDenormalised" type="boolean" default="true" minOccurs="0">
               <annotation>
                 <documentation>
                   <![CDATA[
-              This is how we achieve our basic support for multivalued properties. If you have a source featuretype
-              serving features produced by a join query, you have to specify here as many GroupByAttribute
-              elements as attributes needed to make a unique feature from the joined results, so complex datastore
-              will be able of recognizing where a target feature with multiple valued attributes ends.
-            ]]>
+                  Flag to indicate if the data is denormalised or not.  If data is not denormalised
+                  (flag = false) then its safe for us to apply the system configured maxFeatures
+                  value when building the SQL query to run ]]>
                 </documentation>
               </annotation>
-              <complexType>
-                <sequence>
-                  <element name="GroupByAttribute" type="string" minOccurs="0" maxOccurs="unbounded" />
-                </sequence>
-              </complexType>
             </element>
             <element name="attributeMappings" minOccurs="0">
               <annotation>
@@ -327,7 +320,16 @@
     </annotation>
     <sequence>
       <choice minOccurs="0">
-        <element name="OCQL" type="string" />
+        <sequence>            
+          <element name="OCQL" type="string" />          
+          <element name="index" type="string" minOccurs="0" maxOccurs="1">
+            <annotation>
+              <documentation>
+                <![CDATA[ The index of database row if denormalised. Example of usage is timeseries endPosition that reflects the last timePosition where the timePosition value is dynamic. ]]>
+              </documentation>
+            </annotation>
+          </element>
+        </sequence>
         <element name="Expression">
           <complexType>
             <sequence>
@@ -443,8 +445,23 @@
             <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
             a multivalued property. AppSchemaDataAccess will treat all the attribute mappings having this flag
             set to true as multivalued attributes and will create as many instances of it as Features of
-            the surrogate datastore lie inside the group mapping, as defined by the groupBy element in 
-            a FeatureTypeMapping ]]>
+            the surrogate datastore lie inside the FeatureTypeMapping ]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="encodeIfEmpty" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to determine whether to skip a attribute mapping if it is empty default to false]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="isList" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
+            a container of a list of values. This is similar to isMultiple except the values are concatenated
+            as one big value instead of multiple elements with each value.]]>
           </documentation>
         </annotation>
       </element>
diff --git a/data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/AppSchemaDataAccess.xsd b/data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/AppSchemaDataAccess.xsd
@@ -237,23 +237,16 @@
                   Flag to indicate that we want to connect to an xml data source]]>
                 </documentation>
               </annotation>
-            </element>  
-            <element name="groupBy" minOccurs="0" maxOccurs="1">
+            </element>
+            <element name="isDenormalised" type="boolean" default="true" minOccurs="0">
               <annotation>
                 <documentation>
                   <![CDATA[
-              This is how we achieve our basic support for multivalued properties. If you have a source featuretype
-              serving features produced by a join query, you have to specify here as many GroupByAttribute
-              elements as attributes needed to make a unique feature from the joined results, so complex datastore
-              will be able of recognizing where a target feature with multiple valued attributes ends.
-            ]]>
+                  Flag to indicate if the data is denormalised or not.  If data is not denormalised
+                  (flag = false) then its safe for us to apply the system configured maxFeatures
+                  value when building the SQL query to run ]]>
                 </documentation>
               </annotation>
-              <complexType>
-                <sequence>
-                  <element name="GroupByAttribute" type="string" minOccurs="0" maxOccurs="unbounded" />
-                </sequence>
-              </complexType>
             </element>
             <element name="attributeMappings" minOccurs="0">
               <annotation>
@@ -327,7 +320,16 @@
     </annotation>
     <sequence>
       <choice minOccurs="0">
-        <element name="OCQL" type="string" />
+        <sequence>            
+          <element name="OCQL" type="string" />          
+          <element name="index" type="string" minOccurs="0" maxOccurs="1">
+            <annotation>
+              <documentation>
+                <![CDATA[ The index of database row if denormalised. Example of usage is timeseries endPosition that reflects the last timePosition where the timePosition value is dynamic. ]]>
+              </documentation>
+            </annotation>
+          </element>
+        </sequence>
         <element name="Expression">
           <complexType>
             <sequence>
@@ -443,8 +445,23 @@
             <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
             a multivalued property. AppSchemaDataAccess will treat all the attribute mappings having this flag
             set to true as multivalued attributes and will create as many instances of it as Features of
-            the surrogate datastore lie inside the group mapping, as defined by the groupBy element in 
-            a FeatureTypeMapping ]]>
+            the surrogate datastore lie inside the FeatureTypeMapping ]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="encodeIfEmpty" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to determine whether to skip a attribute mapping if it is empty default to false]]>
+          </documentation>
+        </annotation>
+      </element>
+      <element name="isList" type="boolean" default="false" minOccurs="0">
+        <annotation>
+          <documentation>
+            <![CDATA[ Flag to indicate the target element addressed by this mapping has to be treated as
+            a container of a list of values. This is similar to isMultiple except the values are concatenated
+            as one big value instead of multiple elements with each value.]]>
           </documentation>
         </annotation>
       </element>
