Przeglądaj źródła

upd sid testting

a.binder 8 lat temu
rodzic
commit
fc97bd78ec

+ 15 - 1
SE/schema/default_db_xml_cache.public/get_all_xsd.xsl

@@ -21,6 +21,12 @@
     <xsl:param name="default_db.dir" select="'/public_html/default_db/'"/>
     <xsl:param name="default_db_xml_cache.public" select="'/public_html/default_db_xml_cache.public/'"/>
     
+    <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>
+    
+    <xsl:param name="WPS_Functions" select="'public_html/WPS_Functions/'"/>
+    <xsl:param name="new-schema-with-ID-to-move-and-rename-to-xsd" select="'/new-schema-with-ID-to-move-and-rename-to-xsd'"/>
+    
+    
     <xsl:include href="../default_db_xml_cache.public/xml-schema-primitives.xsl"/>
     <xsl:include href="system_cache__appinfo/external_schema_targetNamespace.xsl"/>
     
@@ -108,6 +114,7 @@
     <xsl:function name="system_cache__appinfo:prefix_from_targetNamespace">
         <xsl:param name="system_cache__appinfo:vrtfNamespaces" />
         <xsl:param name="targetNamespace" />
+        <!--<xsl:message>#115 system_cache__appinfo:prefix_from_targetNamespace elements in system_cache__appinfo:vrtfNamespaces=<xsl:value-of select="count($system_cache__appinfo:vrtfNamespaces//ns)" xpath-default-namespace=""/></xsl:message>-->
         <xsl:value-of select="$system_cache__appinfo:vrtfNamespaces//ns[@uri=$targetNamespace][1]/@prefix" xpath-default-namespace=""/>
     </xsl:function>
     <xsl:function name="system_cache__appinfo:targetNamespace_from_prefix">
@@ -618,7 +625,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:variable name="path">
-                    <xsl:value-of select="concat($path2collection,'?select=*.(xsd);recurse=yes;on-error=warning')"/> 
+                    <xsl:value-of select="concat($path2collection,'?select=*.(xsd);recurse=yes;on-error=fail;xinclude=no')"/> 
                 </xsl:variable>
                 <xsl:variable name="docs" select="collection($path)"/>
                 <xsl:variable name="procesy5_system_schema">
@@ -629,6 +636,9 @@
                             <xsl:when test="contains(document-uri(/),'/ant-object/')">
                                 <xsl:message>#519 ignored /ant-object for <xsl:value-of select="document-uri(/)"/>"/> ;</xsl:message>
                             </xsl:when>
+                            <xsl:when test="contains(document-uri(/),$new-schema-with-ID-to-move-and-rename-to-xsd)">
+                                <xsl:message>#638 ignored /ant-object for <xsl:value-of select="document-uri(/)"/>"/> ;</xsl:message>
+                            </xsl:when>
                             <xsl:when test=" contains(document-uri(/), concat($external_schema,'/'))">
                                 <xsl:comment>#145 Ignored /public_html/external_schema <xsl:value-of select="document-uri(/)"/></xsl:comment>
                                 <system_cache__appinfo:get_all_xsd_external_schema>
@@ -692,6 +702,10 @@
                                     <xsl:copy-of select="/"/>
                                 </system_cache__appinfo:get_all_xsd_external_schema_table>
                             </xsl:when>
+                            <xsl:when test=" contains(document-uri(/), $WPS_Functions)">
+                                <xsl:comment>#700 ignored  schema by contains(document-uri(/), $WPS_Functions)</xsl:comment>
+                                <xsl:message>#700 ignored  schema by contains(document-uri(/), $WPS_Functions)</xsl:message>
+                            </xsl:when>
                             <xsl:otherwise>
                                 <system_cache__appinfo:get_all_xsd>
                                     <xsl:attribute name="system_cache__appinfo:document-uri" select="substring-after(document-uri(/), '/public_html/')"/>

+ 1 - 0
SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl

@@ -4,6 +4,7 @@
     xmlns:wfs="http://www.opengis.net/wfs"
     xmlns:gml="http://www.opengis.net/gml"
     xmlns:ogc="http://www.opengis.net/ogc"
+    xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
     xmlns:get_wfs_recurse_xsl="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl.xsd"
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:default_db="https://biuro.biall-net.pl/wfs/default_db"

+ 64 - 10
SE/schema/default_db_xml_cache.public/main_build_recurse_ant.dita_with_id.xsl

@@ -25,6 +25,22 @@
     <xsl:output indent="yes" />
     <xsl:strip-space elements="*"/>
     
+    <xsl:function name="system_cache__resources_tree_generate_xsl_required_occurs_raport:GetsimpleSchema">
+        <xsl:param name="typeNameRealResource"/>
+        <xsl:variable name="featureID_name_dita" select="substring-after($typeNameRealResource,':')"/>
+        <xsl:choose>
+            <xsl:when test=" doc-available(concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml'))">
+                <xsl:variable name="simpleSchemaFile" select="concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml')"/>
+                <xsl:message>get_wfs_recurse_xsl:GetsimpleSchema: <xsl:value-of select="$simpleSchemaFile"/></xsl:message>
+                <xsl:copy-of select="doc($simpleSchemaFile)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>#38 ERROR with not generated file should be - maybe do again build.xml? missing file: <xsl:value-of select="concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml')"/></xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+    </xsl:function>
+    
     <xsl:function name="p5_tr_map:force_local_typeName">
         <xsl:param name="typeName"/>
         <xsl:choose>
@@ -209,7 +225,7 @@
                                              <xsl:copy-of select="$detect_resource_type"/>
                                          </prefixed_object_info>-->
                     <!--<debug208>
-                        <xsl:copy-of select="$detect_resource_type"/>
+                        <xsl:copy-of select="$build_complexType"/>
                     </debug208>-->
                     
                     
@@ -279,6 +295,7 @@
                 <!--<prefixed_object_info>
                          <xsl:copy-of select="$detect_resource_type"/>
                      </prefixed_object_info>-->
+                <xsl:comment>@298 p5_tr_map:simpleTypeMakeOgcFilter</xsl:comment>
                 <xsl:call-template name="p5_tr_map:simpleTypeMakeOgcFilter">
                     <xsl:with-param name="build_complexType" select="$build_complexType"/>
                 </xsl:call-template>
@@ -457,18 +474,41 @@
         <xsl:variable name="simpleTypeMakeOgcFilter">
             <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter" select="$build_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
         </xsl:variable>
+        <!--<debug.476>
+            <xsl:copy-of select="$build_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+        </debug.476>-->
         <xsl:if test="$simpleTypeMakeOgcFilter/*"><!-- display element only if exists filter -->
             <simpleTypeMakeOgcFilter>
                 <xsl:attribute name="name" select="$build_complexType/element/@name" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+                <!--<xsl:attribute name="debug.479" select="true()"/>-->
                 <xsl:copy-of select="$simpleTypeMakeOgcFilter"/>
             </simpleTypeMakeOgcFilter>
         </xsl:if>
         
     </xsl:template>
     
-    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="sequence|complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <!--<xsl:element name="{name()}">-->
+            <xsl:variable name="p5_tr_map:simpleTypeMakeOgcFilter"><!-- to test only -->
+                <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="count($p5_tr_map:simpleTypeMakeOgcFilter/*) &gt; 1">
+                    <ogc:And>
+                        <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter"/>
+                    </ogc:And>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        <!--<xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>-->
+        <!--</xsl:element>-->
+    </xsl:template>
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <!--<xsl:element name="{name()}">-->
-            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
+        <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
         <!--</xsl:element>-->
     </xsl:template>
     
@@ -494,9 +534,23 @@
     
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="restriction[@base]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
-        <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:apply-templates>
+        <xsl:variable name="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+                <xsl:with-param name="name" select="$name"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="count($p5_tr_map:simpleTypeMakeOgcFilter_restriction/*) &gt; 1">
+                <xsl:for-each select="$p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+                    <ogc:Or>
+                        <xsl:copy-of select="*"/>
+                    </ogc:Or>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter_restriction"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     
@@ -504,23 +558,23 @@
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction" match="enumeration" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
         <!--c:Filter&gt;&lt;ogc:And&gt;&lt;ogc:PropertyIsEqualTo&gt;&lt;ogc:Propert -->
-        <ogc:Or>
+        <!--<ogc:Or>-->
             <ogc:PropertyIsEqualTo>
                 <ogc:PropertyName><xsl:value-of select="$name"/></ogc:PropertyName>
                 <ogc:Literal><xsl:value-of select="@value"/></ogc:Literal>
             </ogc:PropertyIsEqualTo>
-        </ogc:Or>
+        <!--</ogc:Or>-->
     </xsl:template>
     
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction" match="minInclusive" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
         <!--c:Filter&gt;&lt;ogc:And&gt;&lt;ogc:PropertyIsEqualTo&gt;&lt;ogc:Propert -->
-        <ogc:Or>
+        <!--<ogc:Or>-->
             <ogc:PropertyIsGreaterThanOrEqualTo>
                 <ogc:PropertyName><xsl:value-of select="$name"/></ogc:PropertyName>
                 <ogc:Literal><xsl:value-of select="@value"/></ogc:Literal>
             </ogc:PropertyIsGreaterThanOrEqualTo>
-        </ogc:Or>
+        <!--</ogc:Or>-->
     </xsl:template>
     
     

+ 55 - 3
SE/schema/default_db_xml_cache.public/object_modeling.xsl

@@ -14,19 +14,48 @@
     
     <xsl:param name="prototype_object_namespace" select="'https://biuro.biall-net.pl/wfs/default_db/Types/Infrastructure.xsd'"/>
     <xsl:param name="new_object_namespace"/> <!-- example https://biuro.biall-net.pl/wfs/default_db/table/CRM_PROCES.xsd -->
+    <xsl:param name="targetNamespace.base" required="yes"/>
+    <!--<xsl:param name="targetNamespace_DEFAULTS" select="'http://biuro.biall-net.pl/xmlschema_procesy5/default_db'"/>-->
     <!--<xsl:param name="procesy5_system_schema_collection_dir" select="'../../'"/>--> <!-- should be like /Users/a.binder/Documents/xmlschema_procesy5/src-xmlschema/public_html -->
     
     
+    <xsl:template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+        <xsl:param name="base"/>
+        <xsl:param name="prototype"/>
+        <xsl:for-each select="$base">
+            <xsl:choose>
+                <xsl:when test="$prototype[ not(@name=current()/@name) and not(name()=current()/name())]">
+                    <xsl:copy-of select="."/>
+                    <!--<xsl:element name="{name()}">
+                        <xsl:copy-of select="@*"/>
+                        <xsl:call-template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+                            <xsl:with-param name="base" select=""/>
+                            <xsl:with-param name="prototype"/>
+                        </xsl:call-template>
+                    </xsl:element>-->
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
     
     <xsl:template match="system_cache__appinfo:get_all_xsd_list" mode="system_cache__appinfo:new_object_by_prototype">
+        <xsl:variable name="system_cache__appinfo:new_object_by_prototype.base" select="system_cache__appinfo:get_all_xsd_default_db/schema[ substring-after(@targetNamespace,'://')=substring-after($targetNamespace.base,'://')]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+        <xsl:if test="not($system_cache__appinfo:new_object_by_prototype.base/complexType)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"><xsl:message terminate="yes">#25 unknow source object - not found for <xsl:value-of select="$targetNamespace.base"/></xsl:message></xsl:if>
+        <xsl:message>#26 <xsl:value-of select="count($system_cache__appinfo:new_object_by_prototype.base/complexType)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+        <debug.45><xsl:copy-of select="$system_cache__appinfo:new_object_by_prototype.base" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></debug.45>
         <xsl:choose>
             <xsl:when test="$prototype_object_namespace and $new_object_namespace">
                 <xsl:variable name="system_cache__appinfo:new_object_by_prototype_test_if_prototype">
-                    <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_test_if_prototype"/>
+                    <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_test_if_prototype">
+                        <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                    </xsl:apply-templates>
                 </xsl:variable>
                 <xsl:choose>
                     <xsl:when test="$system_cache__appinfo:new_object_by_prototype_test_if_prototype/*">
-                        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype"/>
+                        <xsl:variable name="system_cache__appinfo:new_object_by_prototype.base" select="system_cache__appinfo:get_all_xsd_default_db/schema"/>
+                        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype">
+                            <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                        </xsl:apply-templates>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:message terminate="yes">#32 prototype <xsl:value-of select="$prototype_object_namespace"/> not exists in schema !  if it realy exiss consider rebuild procesy5_system_schema.xml !</xsl:message>
@@ -39,7 +68,10 @@
     </xsl:template>
     
     <xsl:template mode="system_cache__appinfo:new_object_by_prototype" match="system_cache__appinfo:get_all_xsd">
-        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype"/>
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
+        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype">
+            <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+        </xsl:apply-templates>
     </xsl:template>
     
     
@@ -56,6 +88,7 @@
     
     
     <xsl:template mode="system_cache__appinfo:new_object_by_prototype" match="schema[@targetNamespace=$prototype_object_namespace]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
         <xsl:variable name="prototype_TargetNamespaceBindings_from_Namespace">
             <xsl:call-template name="system_cache__appinfo:TargetNamespaceBindings_from_Namespace">
                 <xsl:with-param name="TargetNamespace" select="$prototype_object_namespace"/>
@@ -102,10 +135,26 @@
                             <xsl:copy-of select="namespace::node()"/>
                             <xsl:namespace name="{$new_TargetNamespaceBindings_from_Namespace//@NamespacePrefix}" select="$new_object_namespace"/>
                             <xsl:attribute name="targetNamespace" select="$new_object_namespace"/>
+                            <xsl:variable name="system_cache__appinfo:check_if_schema_element_exists_by_base" >
+                                <xsl:call-template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+                                    <xsl:with-param name="base" select="$system_cache__appinfo:new_object_by_prototype.base/*"/>
+                                    <xsl:with-param name="prototype" select="*"/>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <debug.143>
+                                <xsl:attribute name="base" select="$system_cache__appinfo:new_object_by_prototype.base/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" />
+                                <xsl:attribute name="prototype" select="name()"/>
+                                <xsl:copy-of select="$system_cache__appinfo:check_if_schema_element_exists_by_base"/>
+                            </debug.143>
+                            <debug.147.base>
+                                
+                                <xsl:copy-of select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                            </debug.147.base>
                             <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_schema_root">
                                 <xsl:with-param name="prototype_TargetNamespaceBindings_from_Namespace" select="$prototype_TargetNamespaceBindings_from_Namespace"/>
                                 <xsl:with-param name="new_TargetNamespaceBindings_from_Namespace" select="$new_TargetNamespaceBindings_from_Namespace"/>
                                 <xsl:with-param name="prototype_NamespacePrefix" select="$prototype_NamespacePrefix"/>
+                                <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
                             </xsl:apply-templates>
                         </xsl:element>
                     </xsl:result-document>
@@ -125,7 +174,10 @@
         <xsl:param name="prototype_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="new_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="prototype_NamespacePrefix" required="yes"/>
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
+        
         <xsl:element name="{name()}">
+            <xsl:message>#145 debug name form prototype is <xsl:value-of select="$system_cache__appinfo:new_object_by_prototype.base/name()"/></xsl:message>
             <xsl:apply-templates select="@*" mode="system_cache__appinfo:new_object_by_prototype_schema_root">
                 <xsl:with-param name="prototype_TargetNamespaceBindings_from_Namespace" select="$prototype_TargetNamespaceBindings_from_Namespace"/>
                 <xsl:with-param name="new_TargetNamespaceBindings_from_Namespace" select="$new_TargetNamespaceBindings_from_Namespace"/>

+ 1 - 1
SE/schema/default_db_xml_cache.public/system_cache__appinfo/TargetNamespaceBindings.xsl

@@ -7,7 +7,7 @@
     
     <xsl:include href="../get_all_xsd.xsl"/>
     
-    <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>
+    <!--<xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>-->
     <xsl:param name="targetNamespace_DEFAULTS_prefix_objects" select="'default_objects'"/>
     <xsl:param name="TargetNamespaceBindingsApiUrl" select="'https://biuro.biall-net.pl/SE/version-git/wfs-data.php'"/>
      <!-- todo to override from config prefix etc -->

+ 1 - 1
SE/schema/default_db_xml_cache.public/system_cache__appinfo/external_schema_targetNamespace.xsl

@@ -89,7 +89,7 @@
     <xsl:function name="system_cache__appinfo:xpath.to.root_table">
         <xsl:param name="system_cache__appinfo:xpath"/> <!-- like p5_zasob_17666:sys_users/UserId -->
         <xsl:variable name="result" select=" substring-before($system_cache__appinfo:xpath,'/')"/>
-        <xsl:if test="string-length($result) &lt; 1"><xsl:message terminate="yes">#92 incorrect arg <xsl:value-of select="$system_cache__appinfo:xpath"/> should be like p5_zasob_17666:sys_users/UserId</xsl:message></xsl:if>
+        <xsl:if test="string-length($result) &lt; 1"><xsl:message terminate="yes">#92 incorrect arg=(<xsl:value-of select="$system_cache__appinfo:xpath"/>) should be like p5_zasob_17666:sys_users/UserId</xsl:message></xsl:if>
         <xsl:value-of select=" system_cache__appinfo:clean_object_prefix($result)"/>
     </xsl:function>
     

+ 29 - 0
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1172,6 +1172,35 @@ return $cmd;
 }
 
 
+function INSTALL_GETCOMMANDS_NODEJS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+
+//! NODEJS SERVER INSTALACJA
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v8.9.3.pkg','/tmp/node-v8.9.3.pkg');
+
+ $cmd[]['rsh']='installer -package "/tmp/stuff/node-v8.9.3.pkg" -target "/" -verbose';
+ 
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v6.3.1-darwin-x64.tar','/tmp/node-v6.3.1-darwin-x64.tar');
+ $cmd[]['rsh']='cd /tmp && tar xvfz node-v6.3.1-darwin-x64.tar';
+ $cmd[]['rsh']='mkdir -p /usr/local/nodejs';
+ $cmd[]['rsh']='mv /tmp/node-v6.3.1-darwin-x64/* /usr/local/nodejs';
+ $cmd[]['rsh']='cat /etc/paths | grep "/usr/local/nodejs" || echo "/usr/local/nodejs
+ " >> /etc/paths';
+ $cmd[]['rsh']='cat /etc/paths | grep "/usr/local/nodejs/bin" || echo "/usr/local/nodejs/bin
+ " >> /etc/paths';
+$cmd[]['rsh']='cat /etc/bashrc | grep "/usr/local/nodejs/bin" || echo "export PATH=\$PATH:/usr/local/nodejs/bin
+ " >> /etc/bashrc';
+$cmd[]['rsh']='npm install npm -g';
+$cmd[]['rsh']='npm install express';
+//further ! $cmd[]['rsh']='npm update express';
+
+
+
+return $cmd;
+}
+
+
+
+
 function INSTALL_GETCOMMANDS_WMS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 //! pakiet: INSTALL_GETCOMMANDS_WMS @2016-07 maintain bzyk
 

+ 4 - 1
SE/wfs-data.php

@@ -26,7 +26,10 @@ SEF('DEBUG_S');
 Lib::loadClass('ApiUser');
 Lib::loadClass('Api');
 
-if (!empty($_GET['sid'])) session_id($_GET['sid']); // TODO: security BUG
+if (!empty($_GET['sid'])) {
+	 session_id($_GET['sid']); // TODO: security BUG
+	 error_log('wfs-data.php _GET[sid] was read' .$_GET['sid'].' ; ');
+	 }
 session_start();
 session_write_close();