Merge branch 'master' of bn.git:plabudda/se

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xsl

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:gml="http://www.opengis.net/gml" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:p5_default_db="https://biuro.biall-net.pl/wfs/default_db"
     xmlns:wfs="http://www.opengis.net/wfs"
+    xmlns:ogc="http://www.opengis.net/ogc"
     exclude-result-prefixes="xs"
     version="2.0">
     <xsl:output indent="yes" />
@@ -208,8 +210,13 @@
              <xsl:choose>
                  <xsl:when test="string($xpath_dita)= string($xpath) and string($featureID_name)=string($featureID_name_dita)">
                      <!-- calculate query to api default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:IN7_DZIENNIK_KORESP&SRSNAME=EPSG:3003&featureID=IN7_DZIENNIK_KORESP.1000'-->
+                     <!--<property name="OGC_Filter">%26lt;ogc:Filter%26gt;%26lt;ogc:PropertyIsNull%26gt;%26lt;ogc:PropertyName%26gt;the_geom%26lt;/ogc:PropertyName%26gt;%26lt;/ogc:PropertyIsNull%26gt;%26lt;/ogc:Filter%26gt;</property>-->
+                     
+                     <xsl:variable name="OGC_Filter">&amp;Filter=&lt;ogc:Filter&gt;&lt;ogc:PropertyIsEqualTo&gt;&lt;ogc:PropertyName&gt;<xsl:value-of select="$xpath_dita"/>&lt;/ogc:PropertyName&gt;&lt;ogc:Literal&gt;<xsl:value-of select="$xpath_value_dita"/>&lt;/ogc:Literal&gt;&lt;/ogc:PropertyIsEqualTo&gt;&lt;/ogc:Filter&gt;</xsl:variable>
+                     
                      <xsl:variable name="url">
-                         <xsl:value-of select="$api_url"/>/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=<xsl:value-of select="$typeName_dita"/>&amp;SRSNAME=EPSG:3003&amp;featureID=<xsl:value-of select="$featureID_name_dita"/>.<xsl:value-of select="$xpath_value_dita"/>
+                         <!--<xsl:value-of select="$api_url"/>/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=<xsl:value-of select="$typeName_dita"/>&amp;SRSNAME=EPSG:3003&amp;featureID=<xsl:value-of select="$featureID_name_dita"/>.<xsl:value-of select="$xpath_value_dita"/>-->
+                         <xsl:value-of select="$api_url"/>/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=<xsl:value-of select="$typeName_dita"/>&amp;SRSNAME=EPSG:3003<xsl:value-of select="$OGC_Filter"/>
                      </xsl:variable>
 
                             <xsl:element name="target">

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main.dita

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <topic id="untitled4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
+  xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
   <title><ph>Pismo nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
     <ph>z dnia</ph>
     <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></title>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main_build_recurse_ant.dita

@@ -14,12 +14,12 @@
       <strow>
         <stentry>
           <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
-          <p>Nadawca:</p><ph/>
-          <p xpath="name1"/><ph/>
-          <p xpath="name2"/><ph/>
-          <p xpath="miasto"/><ph/>
-          <p xpath="nr_rach"/><ph/>
-          <p xpath="BILLING_OWNER_EMAIL"/><ph/>
+            <p>Nadawca:</p><ph/>
+            <p xpath="name1"/><ph/>
+            <p xpath="name2"/><ph/>
+            <p xpath="miasto"/><ph/>
+            <p xpath="nr_rach"/><ph/>
+            <p xpath="BILLING_OWNER_EMAIL"/><ph/>
         </RelatedFeature></stentry>
         <stentry>
           <p>Odbiorca:</p><ph/>
@@ -35,7 +35,7 @@
   
  
     <p>Tresc: </p>
-    <p xpath="K_ZAWARTOS_HTML">
+    <p xpath="K_ZAWARTOSC_HTML">
     </p>
    <!-- <data-about>
       <data><apiname base="PROCES_INCLUDE">1607</apiname></data>

SE/schema/default_db_xml_cache.public/topicProcesy5.xsd

@@ -28,22 +28,7 @@
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:uiDomain.xsd:1.2"/>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:softwareDomain.xsd:1.2"/>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:highlightDomain.xsd:1.2"/>
-  <xs:redefine
-    schemaLocation="../../../../../../../Applications/Oxygen_18/frameworks/dita/DITA-OT2.x/plugins/org.oasis-open.dita.v1_2/schema/technicalContent/xsd/programmingDomain.xsd">
-    <xs:complexType mixed="true" name="apiname.class">
-      <xs:complexContent>
-        <xs:extension base="apiname.class">
-          <xs:attributeGroup ref="procesy5-dita-extensions"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-    <xs:group name="codeblock.content">
-      <xs:sequence>
-        <xs:group ref="codeblock.content"/>
-        <xs:element ref="RelatedFeature"/>
-      </xs:sequence>
-    </xs:group>
-  </xs:redefine>
+  <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:programmingDomain.xsd:1.2"/>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:utilitiesDomain.xsd:1.2"/>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:indexingDomain.xsd:1.2"/>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:hazardstatementDomain.xsd:1.2"/>
@@ -55,6 +40,14 @@
   <!-- =================  MODULE INLCUDE DEFINITION  ==================  -->
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:commonElementMod.xsd:1.2"/>
   <!-- ======== Table elements ======== -->
+  <xs:redefine schemaLocation="urn:oasis:names:tc:dita:xsd:commonElementMod.xsd:1.2">
+    <xs:group name="stentry.content">
+      <xs:choice>
+        <xs:group ref="stentry.content"/>
+        <xs:element ref="RelatedFeature"/>
+      </xs:choice>
+    </xs:group>
+  </xs:redefine>
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:tblDeclMod.xsd:1.2"/>
   <!-- ======= MetaData elements, plus keyword and indexterm ======= -->
   <xs:include schemaLocation="urn:oasis:names:tc:dita:xsd:metaDeclMod.xsd:1.2"/>
@@ -145,9 +138,10 @@
     <xs:complexType mixed="true">
       <xs:choice>
         <xs:group ref="topic"/>
-        <xs:sequence maxOccurs="unbounded">
+        <xs:choice maxOccurs="unbounded">
           <xs:group ref="ph"/>
-        </xs:sequence>
+          <xs:group ref="p"/>
+        </xs:choice>
       </xs:choice>
       <xs:attribute name="typeName" use="required">
         <xs:annotation>