Browse Source

TODO integracja plikow

a.binder 8 năm trước cách đây
mục cha
commit
2496e967f4

+ 1 - 1
SE/schema/WPS_Functions/ant/p5ant.create_new_WPS_Function.xsl

@@ -23,7 +23,7 @@
     
     <xsl:template match="p5ant:project" mode="p5ant:create_new_WPS_Function.project" > <!-- xpath-default-namespace="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/ant/ant.xsd" -->
         <xsl:element name="project" inherit-namespaces="yes">
-            <xsl:namespace name="{$p5ant.WPS_Functions.PRODUCT.prefix.input}" select="concat('http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/',$p5ant.WPS_Functions.PRODUCT.name.input,'.xsd')"/>
+            <xsl:namespace name="{$p5ant.WPS_Functions.PRODUCT.prefix.input}" select="concat('http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/',$p5ant.WPS_Functions.PRODUCT.name.input,'/',$p5ant.WPS_Functions.PRODUCT.prefix.input,'.xsd')"/>
             <!--<xsl:namespace name="test" select="concat('http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/',$p5ant.WPS_Functions.PRODUCT.name.input,'.xsd')"/>-->
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="#current"/>

+ 5 - 0
SE/schema/WPS_Functions/folders_interface/build.p5fi.INSTALL.xml

@@ -11,4 +11,9 @@
   <target if="p5fi.INSTALL.install_example.ifdef" name="INSTALL.install_example">
     <copy file="${p5fi.INSTALL.install_example}" tofile="${p5fi.install_example}" />
   </target>
+  
+  
+  
+  
+  
 </project>

+ 3 - 0
SE/schema/WPS_Functions/folders_interface/build.p5fi.SYSTEM.xml

@@ -4,4 +4,7 @@
   <include as="PRODUCT" file="build.p5fi.PRODUCT.xml" optional="true" />
   <property location="${p5build_SE.SYSTEM.StandardOutPath}/folders_interface.log" name="p5fi.SYSTEM.StandardOutPath" />
   <property location="${p5build_SE.SYSTEM.StandardErrorPath}/folders_interface.log" name="p5fi.SYSTEM.StandardErrorPath" />
+  
+  
+  
 </project>

+ 177 - 67
SE/schema/WPS_Functions/folders_interface/build_folders_interface.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:p5fi="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/folders_interface.xsd"
+<project xmlns:p5fi="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/folders_interface/p5fi.xsd"
          xmlns:props="antlib:org.apache.ant.props"
          basedir="../../."
          default="default"
@@ -13,7 +13,7 @@
   
    <include file="../xmlschema_interface/build_xmlschema_interface.xml" as="p5xmli"/>
    <include as="WPS_Functions" file="../build.WPS_Functions.PRODUCT.xml"/>
-   <include file="../system_ui_info_speech/build.system_ui_info_speech.PRODUCT.xml"/>
+   <include file="../system_ui_info_speech/build_system_ui_info_speech.xml" as="p5suis"/>
    <include file="../documentation_generator/build.p5dg.PRODUCT.xml"/>
    <include file="${p5build_SE.build}" as="p5build_SE"/>   
    
@@ -27,18 +27,18 @@
    
    <!-- https://biuro.biall-net.pl/SE/version-git/index.php?
       -D_route=UrlAction_Ant -D_task=ant -Dpath=default_db.in7_dziennik_koresp/etykieta -Dtemplate=recurse_ant.buildpdf_recursed_xsl_mail -DtypeName=default_db:IN7_DZIENNIK_KORESP -DprimaryKey=62875 -DprimaryKeyField=ID 
-   -Dp5xmli.TypeName.local=default_db:IN7_DZIENNIK_KORESP  -DNamespaceObjectInstanceTable.local=IN7_DZIENNIK_KORESP -DconfirmAntfile=confirmAntfile -DconfirmAntfileTarget=confirmAntfileTarget  -D_route=UrlAction_Ant -D_task=ant -Dpath=default_db.in7_dziennik_koresp/etykieta -Dtemplate=recurse_ant.buildpdf_recursed_xsl_mail -Dfolders_interface.primaryKey.local=62875 -Dfolders_interface.primaryKeyField.local=ID -DantFunctionUrl=https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&amp;_task=ant&amp;path=default_db.in7_dziennik_koresp/etykieta&amp;template=buildpdf_recursed_xsl_mail&amp;typeName=default_db:IN7_DZIENNIK_KORESP&amp;primaryKey=63007&amp;primaryKeyField=ID
+   -Dp5xmli.TypeName.local=default_db:IN7_DZIENNIK_KORESP  -DNamespaceObjectInstanceTable.local=IN7_DZIENNIK_KORESP -DconfirmAntfile=confirmAntfile -DconfirmAntfileTarget=confirmAntfileTarget  -D_route=UrlAction_Ant -D_task=ant -Dpath=default_db.in7_dziennik_koresp/etykieta -Dtemplate=recurse_ant.buildpdf_recursed_xsl_mail -Dp5fi.primaryKey.local=62875 -Dp5fi.primaryKeyField.local=ID -DantFunctionUrl=https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&amp;_task=ant&amp;path=default_db.in7_dziennik_koresp/etykieta&amp;template=buildpdf_recursed_xsl_mail&amp;typeName=default_db:IN7_DZIENNIK_KORESP&amp;primaryKey=63007&amp;primaryKeyField=ID
    -->
    
    <target name="p5build_SE_build_procesy5_config_folders_root_points_mount_point_isset" unless="p5build_SE.build_procesy5_config.folders.root_points.mount_point">
       <fail>#32 not set expected property p5build_SE.build_procesy5_config.folders.root_points.mount_point = ${p5build_SE.build_procesy5_config.folders.root_points.mount_point} by p5build_SE.build_SE_read_procesy5_file_properties</fail>
    </target>
    
-   <target name="fetch_dir_by_TypeName_and_PK" depends="p5build_SE.build_SE_read_procesy5_file_properties,p5build_SE_build_procesy5_config_folders_root_points_mount_point_isset,p5xmli.NamespaceObjectInstanceTable.local" description="To detect @feature folder by typename = table and its PK ">
+   <target name="fetch_dir_by_TypeName_and_PK" depends="default,p5build_SE.build_SE_read_procesy5_file_properties,p5build_SE_build_procesy5_config_folders_root_points_mount_point_isset,p5xmli.NamespaceObjectInstanceTable.local" description="To detect @feature folder by typename = table and its PK ">
       <input addproperty="p5xmli.NamespaceObjectInstanceTable.local" message="Type NamespaceObjectInstanceTable.local = like IN7_DZIENNIK_KORESP "/>
-      <input addproperty="p5xmli.TypeName.local"  message="Type folders_interface.TypeName.local like p5_default_db:IN7_DZIENNIK_KORESP - to be calculated"/>
-      <input addproperty="folders_interface.primaryKey.local"/>
-      <input addproperty="folders_interface.primaryKeyField.local"/>
+      <input addproperty="p5xmli.TypeName.local"  message="Type p5fi.TypeName.local like p5_default_db:IN7_DZIENNIK_KORESP - to be calculated"/>
+      <input addproperty="p5fi.primaryKey.local"/>
+      <input addproperty="p5fi.primaryKeyField.local"/>
       
       <input addproperty="antFunctionUrl" message="like https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&amp;_task=ant&amp;path=default_db.in7_dziennik_koresp/etykieta&amp;template=buildpdf_recursed_xsl_mail&amp;typeName=default_db:IN7_DZIENNIK_KORESP&amp;primaryKey=63007&amp;primaryKeyField=ID" />
       <input addproperty="confirmAntfile" message="path to ant file to confirm something" />
@@ -47,7 +47,7 @@
       
       <echo>#46 test if ok $p5build_SE.build_procesy5_config.folders.root_points.mount_point = ${p5build_SE.build_procesy5_config.folders.root_points.mount_point}
          $p5xmli.NamespaceObjectInstanceTable.local = ${p5xmli.NamespaceObjectInstanceTable.local}
-         $folders_interface.TypeName.local = ${folders_interface.TypeName.local}
+         $p5xmli.TypeName.local = ${p5xmli.TypeName.local}
          $p5xmli.NamespaceDatabaseStorageDefinitionOptSuffix = ${p5xmli.NamespaceDatabaseStorageDefinitionOptSuffix}
          test eval p5build_SE.build_procesy5_config.folders.IN7_DZIENNIK_KORESP_COLUMN.mount_point = ${p5build_SE.build_procesy5_config.folders.IN7_DZIENNIK_KORESP_COLUMN.mount_point}
       </echo>
@@ -66,69 +66,157 @@
             DEST_FOLDER_VARNAME1="ID"
             DEST_FOLDER_VARNAME2="DESC"-->
       
-      
       <!--<ant antfile="${p5suis.build}" target="p5suis:say_to_queue">
          <property name="p5suis:say_text" value="Indexing files from remote ant object repository" />
       </ant>-->
-      
-      <!--<macrodef name="setToken">
-         <attribute name="loc"/>
-         <attribute name="box"/>
-         <sequential>
-            <property name="token" value="${@{loc}.@{box}.server}" />
-         </sequential>
-      </macrodef>-->
-      <setToken loc="${loc}" box="${box}"/>
-      
-      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.path.mount_point.local"/>
-      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.dir.mount_point.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.dir.mount_point.local" value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.mount_point}"/>
-      <echo>#701 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.dir.mount_point.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.dir.mount_point.local} from ${p5xmli.NamespaceObjectInstanceTable.local} </echo>
-      <!--<property name="p5build_SE.build_procesy5_config.folders.BUILDINGS_COLUMN.LOOKAT_FOLDER_LOOK_GLOB" value="&lt;VARNAME&gt;.*"/>-->
-      
+      <!--<local name="p5build_SE.build_procesy5_config.folders.COLUMN.path.mount_point.local"/>
+      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local"/>      
       <local name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.LOOKAT_FOLDER_LOOK_GLOB}"/>
-      <echo>#706 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local} </echo>
-      
       <local name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.LOOKAT_FOLDER_VARNAME}"/>
-      <echo>#710 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local} </echo>
-      
       <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_FORMAT}"/>
-      <echo>#714 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local} </echo>
-      
       <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME1}"/>
+      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"/>
+      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME3.local"/>
+      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_NEGFILE_LOOK_REGEX.local"/>
+      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FILES_VARNAME.local"/>-->
+     
+      <COLUMN.dir.mount_point.local p5xmli.NamespaceObjectInstanceTable.local="${p5xmli.NamespaceObjectInstanceTable.local}" />
+      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.path.local" location="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}/${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local}"/>
+      <echo>#178 - B $p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local}</echo>
+      
+      <echo>#701 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local} from ${p5xmli.NamespaceObjectInstanceTable.local} </echo>
+      <echo>#706 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local} </echo>
+      <echo>#710 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local} </echo>
+      <echo>#714 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local} </echo>
       <echo>#718 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local} </echo>
+      <echo>#722 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local} </echo>
+      <echo>#722 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_NEGFILE_LOOK_REGEX.local = ${p5build_SE.build_procesy5_config.folders.LOOKAT_NEGFILE_LOOK_REGEX.local} </echo>
+   </target>
+   
+   
+   <macrodef name="COLUMN.dir.mount_point.local">
+      <attribute name="p5xmli.NamespaceObjectInstanceTable.local"/>
+      <sequential>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local" value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.mount_point}" />
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.LOOKAT_FOLDER_LOOK_GLOB}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.LOOKAT_FOLDER_VARNAME}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_FORMAT}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME1}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME2}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME3.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME3}"/>
+         <property name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_NEGFILE_LOOK_REGEX.local"  value="${p5build_SE.build_procesy5_config.folders.@{p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.LOOKAT_NEGFILE_LOOK_REGEX}"/>
+      </sequential>
+   </macrodef>
+   
+   
+   <target name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists">
+      <condition property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists">
+         <available file="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"/>
+      </condition>
+      <condition property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.confirmed">
+         <available file="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"/>
+      </condition>
+   </target>
+   
+   
+   <extension-point name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed.extension" depends="p5build_SE.build_procesy5_config.folders.root_points.mount_point.install"/>
+   <!--<extension-point name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed.extension" depends="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed"/>-->
+   
+   
+   <target name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed"  unless="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists" >
+      <echoxml>
+         <p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed>
+            <WARNING>
+               <say>Not exists ${p5build_SE.build_procesy5_config.folders.root_points.mount_point}</say>
+            </WARNING>
+         </p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed>
+      </echoxml>
+      <!--<antcall target="p5suis.p5suis:say_to_queue">
+         <param name="p5suis:say_text" value="Files Storage Not aviable  "/>
+      </antcall>-->
+      <ant antfile="${system_ui_info_speech}" target="p5suis:say_to_queue">
+         <property name="p5suis:say_text" value="Files Storage Not aviable" />
+      </ant>
+   </target>
+   
+   
+   <target name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.install"  unless="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists">
+      <!-- todo if if="p5build_SE.build_procesy5_config.folders.root_points.mount_point.install" -->
+      <echo>#168 mkdir for storage files</echo>
+      <mkdir dir="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"/>
+      <condition property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.confirmed">
+         <available file="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"/>
+      </condition>
+   </target>
+   
+   
+   <target name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install.ifexists" >
+      <condition property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install.ifexists" taskname="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install">
+         <available file="${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.path.local}"/>
+      </condition>
+      <echo>#169 ifexists p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.path.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.path.local}
+      </echo>
+   </target>
+   
+   <target name="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install" depends="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install.ifexists" unless="p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install.ifexists" description="To install new COLUMN ( p5xmli.NamespaceObjectInstanceTable.local ) folder for files to store ">
+      <mkdir dir="${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.path.local}"/>
+   </target>
+   
+   <target name="fetch_dir_by_TypeName_and_PK_fileset"  if="p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.confirmed" depends="fetch_dir_by_TypeName_and_PK,p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists,p5build_SE.build_procesy5_config.folders.root_points.mount_point.ifexists.failed.extension,p5build_SE.build_procesy5_config.folders.root_points.mount_point.COLUMN.install">
+
+      <tempfile property="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml" destdir="${p5fi.temp}" prefix="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index" suffix=".xml"/>
+      <tempfile property="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml" destdir="${p5fi.temp}" prefix="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset" suffix=".xml"/>
+      <tempfile property="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_analyzed.xml" destdir="${p5fi.temp}" prefix="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_analyzed.xml" suffix=".xml"/>
       
-      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME2}"/>
-      <echo>#722 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local} </echo>
+      <echo>#171 searching for files in ${p5build_SE.build_procesy5_config.folders.root_points.mount_point} </echo>
       
-      <local name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"/>
-      <property name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local"  value="${p5build_SE.build_procesy5_config.folders.${p5xmli.NamespaceObjectInstanceTable.local}_COLUMN.DEST_FOLDER_VARNAME2}"/>
-      <echo>#722 calculated $p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local = ${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local} </echo>
+      <!--<filelist id="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset" dir="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"    > <!-\- excludes="(.*recurse_cache.*)|(.*/temp/.*)" -\->
+         <!-\-<include name="**/*.xsd"/>-\->
+         <!-\-<include name="**/**"/>-\->
+         <!-\- <include name="**/*"/>
+         <exclude name="**/.*"/>-\->
+      </filelist>-->
+      
+      <!--<fileset id="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset" dir="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"    > <!-\- excludes="(.*recurse_cache.*)|(.*/temp/.*)" -\->
+         <!-\-<include name="**/*.xsd"/>-\->
+         <include name="**/**"/>
+        <!-\- <include name="**/*"/>
+         <exclude name="**/.*"/>-\->
+      </fileset>-->
+      <!--<filelist refid="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset">
+            
+      </filelist>-->
+      
+      <dirset id="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset" dir="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"  excludes="(.*recurse_cache.*)|(.*/temp/.*)"  >
+         <!--<include name="**/*.xsd"/>-->
+         <include name="**/*"/>
+         <exclude name="**/.*"/>
+      </dirset>
       
+      <!--<pathconvert pathsep="," property="p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset.local" refid="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset"/>-->
       
-      <tempfile property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml" destdir="${p5fi.temp}" prefix="p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index" suffix=".xml"/>
-      <tempfile property="p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml" destdir="${p5fi.temp}" prefix="p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset" suffix=".xml"/>
+      <pathconvert pathsep=";" property="p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset.local" refid="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset">
+         <map from="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}/" to=""/>
+      </pathconvert>
+      <!--<pathconvert pathsep="&#xA;" property="p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset.local" refid="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset">
+         <mapper type="flatten" />
+      </pathconvert>-->
       
-      <fileset id="p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset" dir="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"  excludes="(.*recurse_cache.*)|(.*/temp/.*)"  >
-         <include name="**/*.xsd"/>
-         <exclude name="**/*build.xml"/>
-      </fileset>
-      <local name="object_merge_ant_object.from_remote_ant_object.files.index.fileset"/>
-      <property name="object_merge_ant_object.from_remote_ant_object.files.index.fileset.local" refid="p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset"/>
+      <!--<local name="p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset"/>-->
+      <!--<property name="p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset.local" refid="p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.fileset"/>-->
       
-      <echo>#32 saved to $p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml = ${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}</echo>
-      <echoxml file="${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}" namespacepolicy="all">
+      <echo>#32 saved to $p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml = ${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}</echo>
+      <echoxml file="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}" namespacepolicy="all">
          <object_merge_ant_object.from_remote_ant_object.files.index.xml xmlns="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/object_merge_ant_object.xsd">
-            ${object_merge_ant_object.from_remote_ant_object.files.index.fileset}
+            ${p5fi.object_merge_ant_object.from_remote_ant_object.files.index.fileset.local}
          </object_merge_ant_object.from_remote_ant_object.files.index.xml>
       </echoxml>
       
-      <xslt basedir="${p5fi.temp}" style="${p5dg.documentation_generator.xsl}" in="${object_merge_ant_object.from_remote_ant_object.files.index.xml}"   out="${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}"  force="true"  >
+      <exec executable="open">
+         <arg file="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}"/>
+      </exec>
+      
+      <xslt basedir="${p5fi.temp}" style="${p5dg.documentation_generator.xsl}" in="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index.xml}"   out="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}"  force="true"  >
          <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             <attribute name="http://saxon.sf.net/feature/initialMode" value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/documentation_generator/documentation_generator.xsd}p5dg.documentation.files.index_fileset.xml"/>
@@ -142,7 +230,7 @@
          <param name="p5dg.documentation.files.index.excludes.regex" expression=""/>
       </xslt>
       
-      <xslt basedir="${p5fi.temp}" style="${p5dg.documentation_generator.xsl}" in="${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}"   out="${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}" force="true"  >
+      <xslt basedir="${p5fi.temp}" style="${p5dg.documentation_generator.xsl}" in="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}"   out="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_analyzed.xml}" force="true"  >
          <factory name="net.sf.saxon.TransformerFactoryImpl">    
             <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             <attribute name="http://saxon.sf.net/feature/initialMode" value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/documentation_generator/documentation_generator.xsd}p5dg.documentation.files.index_analyzed.xml"/>
@@ -157,21 +245,42 @@
       </xslt>
       
       
-      <tempfile property="folders_interface.action.build.xml" destdir="${p5fi.temp}" prefix="folders_interface.action.build" suffix=".xml"/>
+      <tempfile property="p5fi.action.build.xml" destdir="${p5fi.temp}" prefix="p5fi.action.build.xml" suffix=".xml"/>
       
-      <xslt basedir="${object_merge_ant_object.temp}" style="${object_merge_ant_object.xsl}" in="${p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_fileset.xml}"   out="${folders_interface.action.build.xml}" force="true"  >
-         <factory name="net.sf.saxon.TransformerFactoryImpl">    
-            <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-            <attribute name="http://saxon.sf.net/feature/initialMode" value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/folders_interface/p5fi.xsd}folders_interface.action.build.xml"/>
-         </factory>
-         <classpath location="/opt/local/share/java/saxon9he.jar"/>
-         <param name="remote.ant-object" expression="${remote.ant-object}"/>
-         <param name="basedir" expression="${basedir}"/>
-         <param name="object_modeling_new.build.xml" expression="${object_modeling_new.build.xml}"/>
-         <param name="object_merge_ant_object.build.xml" expression="${object_merge_ant_object.build.xml}"/>
-         
-      </xslt>
       
+      <xslt basedir="${p5fi.temp}" style="${p5fi.xsl}" in="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_analyzed.xml}"   out="${p5fi.action.build.xml}" force="true"  >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+               <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+               <attribute name="http://saxon.sf.net/feature/initialMode" value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/folders_interface/p5fi.xsd}p5fi.action.build.xml"/>
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+         <!--   <param name="remote.ant-object" expression="${remote.ant-object}"/>
+            <param name="basedir" expression="${basedir}"/>
+            <param name="object_modeling_new.build.xml" expression="${object_modeling_new.build.xml}"/>
+            <param name="object_merge_ant_object.build.xml" expression="${object_merge_ant_object.build.xml}"/>-->
+            
+            <param name="p5xmli.TypeName.local" expression="${p5xmli.TypeName.local}" />
+            <param name="p5fi.primaryKey.local" expression="${p5fi.primaryKey.local}"/>
+            <param name="p5fi.primaryKeyField.local" expression="${p5fi.primaryKeyField.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.root_points.mount_point" expression="${p5build_SE.build_procesy5_config.folders.root_points.mount_point}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.root_points.share_point" expression="${p5build_SE.build_procesy5_config.folders.root_points.share_point}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.root_points.www_share_point" expression="${p5build_SE.build_procesy5_config.folders.root_points.www_share_point}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.mount_point.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.www_share_point.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.www_share_point.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_LOOK_GLOB.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.LOOKAT_FOLDER_VARNAME.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_FORMAT.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME1.local}"/>
+            <param name="p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local" expression="${p5build_SE.build_procesy5_config.folders.COLUMN.DEST_FOLDER_VARNAME2.local}"/>
+         </xslt>
+         
+         <exec executable="open">
+            <arg file="${p5fi.p5build_SE.build_procesy5_config.folders.root_points.mount_point.files.index_analyzed.xml}"/>
+         </exec>
+         <!--<ant antfile="${object_merge_ant_object.merge.try.build.xml}"/>-->
+         <!--<antcall target="object_modeling_new.objectMergeAntObjectTry">
+            <param name="objectMergeAntObjectTry.build.xml" value="${object_merge_ant_object.merge.try.build.xml}"/>
+         </antcall>-->
       
    </target>
    
@@ -179,6 +288,7 @@
    
    
    
+   
    <!-- Exammple folders config which would parse 
 [root_points]
 mount_point="/Library/Server/Web/Data/Sites/Default/PLIKI/"

+ 9 - 9
SE/schema/WPS_Functions/folders_interface/p5fi.xsl

@@ -17,9 +17,9 @@
    
    <!--<xsl:param name="remote.ant-object" required="yes"/>-->
    
-   <xsl:param name="folders_interface.TypeName.local" />
-   <xsl:param name="folders_interface.primaryKey.local"/>
-   <xsl:param name="folders_interface.primaryKeyField.local"/>
+   <xsl:param name="p5xmli.TypeName.local" />
+   <xsl:param name="p5fi.primaryKey.local"/>
+   <xsl:param name="p5fi.primaryKeyField.local"/>
    <xsl:param name="p5build_SE.build_procesy5_config.folders.root_points.mount_point"/>
    <xsl:param name="p5build_SE.build_procesy5_config.folders.root_points.share_point"/>
    <xsl:param name="p5build_SE.build_procesy5_config.folders.root_points.www_share_point"/>
@@ -36,12 +36,12 @@
    <!--<xsl:param name="object_modeling_new.build.xml" required="yes"/>
    <xsl:param name="object_merge_ant_object.build.xml" required="yes"/>-->
    
-   <xsl:template match="p5dg:p5dg.documentation.files.index_analyzed.xml" mode="p5fi:folders_interface.action.build.xml">
-      <project basedir="{$basedir}" name="folders_interface.action.build.xml" default="folders_interface.action.build.xml"> <!-- object_merge_ant_object.merge.try.build.xml -->
+   <xsl:template match="p5dg:p5dg.documentation.files.index_analyzed.xml" mode="p5fi:p5fi.action.build.xml">
+      <project basedir="{$basedir}" name="p5fi.action.build.xml" default="folders_interface.action.build.xml"> <!-- object_merge_ant_object.merge.try.build.xml -->
         <!-- <include file="{$object_modeling_new.build.xml}" as="object_modeling_new"/>
          <include file="{$object_merge_ant_object.build.xml}" as="object_merge_ant_object"/>-->
          
-         <target name="folders_interface.action.build.xml">
+         <target name="p5fi.action.build.xml">
             <xsl:apply-templates mode="#current"/>
          </target>
       </project>
@@ -49,7 +49,7 @@
    
    
    
-   <xsl:template match="p5ant:filelist[@dir='/Users/a.binder/Documents/se/SE/schema/ant-object/default_db.ADMIN_USERS/ADMIN_USERS']" mode="p5fi:folders_interface.action.build.xml">
+   <xsl:template match="p5ant:filelist[@dir='/Users/a.binder/Documents/se/SE/schema/ant-object/default_db.ADMIN_USERS/ADMIN_USERS']" mode="p5fi:p5fi.action.build.xml">
       
       <xsl:variable name="quess_path" select="substring-after(@dir,concat($p5build_SE.build_procesy5_config.folders.root_points.mount_point,'/'))"/>
       <xsl:variable name="NamespaceObjectInstanceTable" select=" substring-before(substring-after($quess_path,'.'),'/')" />
@@ -68,9 +68,9 @@
             </objectMergeAntObjectTry>
          </xsl:when>
          <xsl:otherwise>
-                <object_merge_ant_object:try_not>
+                <object_merge_ant_object_try_not>
                     <xsl:copy-of select="."/>
-                </object_merge_ant_object:try_not>
+                </object_merge_ant_object_try_not>
             </xsl:otherwise>
       </xsl:choose>