a.binder 9 năm trước cách đây
mục cha
commit
13283c1dad

+ 11 - 16
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build.xml

@@ -36,6 +36,7 @@
     <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
     <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
+    <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
     <property name="detect_resource_type_dir" location="${basedir}/../../../default_db.instance.xml/detect_resource_type" />
     <property name="detect_resource_type_dir" location="${basedir}/../../../default_db.instance.xml/detect_resource_type" />
     <property name="build_complexType_dir" location="${basedir}/../../../default_db.instance.xml/build_complexType" />
     <property name="build_complexType_dir" location="${basedir}/../../../default_db.instance.xml/build_complexType" />
     
     
@@ -180,8 +181,6 @@
             <arg line="base64 -"/>-->
             <arg line="base64 -"/>-->
         </exec>
         </exec>
         <echo> Ustalono $passwordBase64Basic na ${passwordBase64Basic_tested} </echo>
         <echo> Ustalono $passwordBase64Basic na ${passwordBase64Basic_tested} </echo>
-        
-        
     </target>
     </target>
     
     
     
     
@@ -198,7 +197,6 @@
         <input  addproperty="xpath_value" message="Podaj xpath_value -  podaj wartosc do wyszukiwania - np 1234"/>
         <input  addproperty="xpath_value" message="Podaj xpath_value -  podaj wartosc do wyszukiwania - np 1234"/>
         <input  addproperty="passwordBase64Basic" message="Podaj passwordBase64Basic -  Username i Password w typie base64 "/>
         <input  addproperty="passwordBase64Basic" message="Podaj passwordBase64Basic -  Username i Password w typie base64 "/>
         <echo> $typeName=${typeName_tested}; $xpath=${xpath_tested}; $xpath_value=${xpath_value} $passwordBase64Basic=${passwordBase64Basic_tested}</echo>
         <echo> $typeName=${typeName_tested}; $xpath=${xpath_tested}; $xpath_value=${xpath_value} $passwordBase64Basic=${passwordBase64Basic_tested}</echo>
-        
         <antcall target="buildpdf_recursed"/>
         <antcall target="buildpdf_recursed"/>
     </target>
     </target>
     
     
@@ -227,7 +225,7 @@
         </condition>
         </condition>
     </target>
     </target>
     
     
-    <target name="check_dita" depends="install_folders,set_dita,dita_fail,dita_ok">
+    <target name="check_dita" depends="set_dita,dita_fail,dita_ok">
         <echo> testujemy czy jest dita</echo>
         <echo> testujemy czy jest dita</echo>
     </target>
     </target>
     
     
@@ -239,7 +237,6 @@
     
     
     <target name="dita_ok" if="${test_if_dita}">
     <target name="dita_ok" if="${test_if_dita}">
         <!-- polaczenie pdfa -->
         <!-- polaczenie pdfa -->
-        
         <antcall target="build_recurse_ant_merge_dita_from_temp.xsl"/>
         <antcall target="build_recurse_ant_merge_dita_from_temp.xsl"/>
     </target>
     </target>
     
     
@@ -253,10 +250,10 @@
                             <arg value="echo ${typeName_tested} |sed 's/.*://'"/><!-- tu wchodzi -DtypeName=p5_default_db:CRM_PROCES  -->
                             <arg value="echo ${typeName_tested} |sed 's/.*://'"/><!-- tu wchodzi -DtypeName=p5_default_db:CRM_PROCES  -->
                         </exec>
                         </exec>
                                                          <!-- element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES -->
                                                          <!-- element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES -->
-                        <property name="main_build_recurse_ant.dita" value="${p5_tr_map_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"/>
+                        <property name="main_build_recurse_ant.dita" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"  />
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                                     
                                     
-                        <property name="main_build_recurse_ant.dita_with_id" value="${temp}/${main_build_recurse_ant.tr_map_sed}.with_id.xml"/>
+                        <property name="main_build_recurse_ant.dita_with_id" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"  />
                         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"/>
                         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"/>
                         
                         
                         
                         
@@ -395,7 +392,7 @@
     
     
    
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-        <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+            <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
             </factory>
@@ -408,16 +405,17 @@
     </target>
     </target>
     
     
     <target name="main_build_recurse_ant.tr_map_with_id"  if="${test_if_tr_map}">
     <target name="main_build_recurse_ant.tr_map_with_id"  if="${test_if_tr_map}">
-        <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <!-- nie trzeba - korzystamy z SimpleSchema natywnymi przeksztalceniami -->
+        <!--<xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
             <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
             <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
-            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
+            <param name="typeName" expression="${typeName_tested}"/> <!-\- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -\->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-        </xslt>
+        </xslt>-->
     </target>
     </target>
    
    
    
    
@@ -514,7 +512,7 @@
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <record action="stop" name="ant.log"/>
         <record action="stop" name="ant.log"/>
         <ant  antfile="${build_recurse_ant.xml}" dir="." />
         <ant  antfile="${build_recurse_ant.xml}" dir="." />
-        
+
         <!-- pozbierac wszystkie do kupy xmle  -->
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     </target>
     
     
@@ -655,8 +653,5 @@
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
         </echo>
         </echo>
         <echo message="OUTPUT__END"/>
         <echo message="OUTPUT__END"/>
-    </target>
-
-
-    
+    </target>    
 </project>
 </project>

+ 10 - 14
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/build.xml

@@ -36,6 +36,7 @@
     <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
     <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
+    <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
     <property name="detect_resource_type_dir" location="${basedir}/../../../default_db.instance.xml/detect_resource_type" />
     <property name="detect_resource_type_dir" location="${basedir}/../../../default_db.instance.xml/detect_resource_type" />
     <property name="build_complexType_dir" location="${basedir}/../../../default_db.instance.xml/build_complexType" />
     <property name="build_complexType_dir" location="${basedir}/../../../default_db.instance.xml/build_complexType" />
     
     
@@ -180,8 +181,6 @@
             <arg line="base64 -"/>-->
             <arg line="base64 -"/>-->
         </exec>
         </exec>
         <echo> Ustalono $passwordBase64Basic na ${passwordBase64Basic_tested} </echo>
         <echo> Ustalono $passwordBase64Basic na ${passwordBase64Basic_tested} </echo>
-        
-        
     </target>
     </target>
     
     
     
     
@@ -198,7 +197,6 @@
         <input  addproperty="xpath_value" message="Podaj xpath_value -  podaj wartosc do wyszukiwania - np 1234"/>
         <input  addproperty="xpath_value" message="Podaj xpath_value -  podaj wartosc do wyszukiwania - np 1234"/>
         <input  addproperty="passwordBase64Basic" message="Podaj passwordBase64Basic -  Username i Password w typie base64 "/>
         <input  addproperty="passwordBase64Basic" message="Podaj passwordBase64Basic -  Username i Password w typie base64 "/>
         <echo> $typeName=${typeName_tested}; $xpath=${xpath_tested}; $xpath_value=${xpath_value} $passwordBase64Basic=${passwordBase64Basic_tested}</echo>
         <echo> $typeName=${typeName_tested}; $xpath=${xpath_tested}; $xpath_value=${xpath_value} $passwordBase64Basic=${passwordBase64Basic_tested}</echo>
-        
         <antcall target="buildpdf_recursed"/>
         <antcall target="buildpdf_recursed"/>
     </target>
     </target>
     
     
@@ -252,10 +250,10 @@
                             <arg value="echo ${typeName_tested} |sed 's/.*://'"/><!-- tu wchodzi -DtypeName=p5_default_db:CRM_PROCES  -->
                             <arg value="echo ${typeName_tested} |sed 's/.*://'"/><!-- tu wchodzi -DtypeName=p5_default_db:CRM_PROCES  -->
                         </exec>
                         </exec>
                                                          <!-- element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES -->
                                                          <!-- element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES -->
-                        <property name="main_build_recurse_ant.dita" value="${p5_tr_map_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"/>
+                        <property name="main_build_recurse_ant.dita" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"  />
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                                     
                                     
-                        <property name="main_build_recurse_ant.dita_with_id" value="${temp}/${main_build_recurse_ant.tr_map_sed}.with_id.xml"/>
+                        <property name="main_build_recurse_ant.dita_with_id" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.xml"  />
                         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"/>
                         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"/>
                         
                         
                         
                         
@@ -394,7 +392,7 @@
     
     
    
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-        <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+            <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
             </factory>
@@ -407,16 +405,17 @@
     </target>
     </target>
     
     
     <target name="main_build_recurse_ant.tr_map_with_id"  if="${test_if_tr_map}">
     <target name="main_build_recurse_ant.tr_map_with_id"  if="${test_if_tr_map}">
-        <xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <!-- nie trzeba - korzystamy z SimpleSchema natywnymi przeksztalceniami -->
+        <!--<xslt basedir="./" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
             <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
             <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
-            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
+            <param name="typeName" expression="${typeName_tested}"/> <!-\- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -\->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-        </xslt>
+        </xslt>-->
     </target>
     </target>
    
    
    
    
@@ -513,7 +512,7 @@
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <record action="stop" name="ant.log"/>
         <record action="stop" name="ant.log"/>
         <ant  antfile="${build_recurse_ant.xml}" dir="." />
         <ant  antfile="${build_recurse_ant.xml}" dir="." />
-        
+
         <!-- pozbierac wszystkie do kupy xmle  -->
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     </target>
     
     
@@ -654,8 +653,5 @@
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
         </echo>
         </echo>
         <echo message="OUTPUT__END"/>
         <echo message="OUTPUT__END"/>
-    </target>
-
-
-    
+    </target>    
 </project>
 </project>