Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
bn
/
se
2
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

tune fix

a.binder 9 rokov pred
rodič
3c2b246b5f
commit
badeb4e579
6 zmenil súbory, kde vykonal 49 pridanie a 243 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 12 7
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml
  2. 0 13
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/do_build.sh
  3. 0 90
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main.dita
  4. 0 91
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main_build_recurse_ant.dita
  5. 0 42
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/sample_test_xml_from_api.xml
  6. 37 0
      SE/se-lib/Core/Database.php

+ 12 - 7
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml
Zobraziť súbor 

@@ -202,8 +202,17 @@
 
         </condition>
 
     </target>
 
     
-    <target name="check_dita" depends="set_dita" if="${test_if_dita}">
 
+    <target name="check_dita" depends="set_dita,dita_fail,dita_ok" if="${test_if_dita}">
 
         <echo> testujemy czy jest dita</echo>
 
+        
+    </target>
 
+    
+    <target name="dita_fail" unless="${test_if_dita}">
 
+        <echo message="OUTPUT__START"/>   
+        <echo>&lt;br&gt;Brakuje druku dla powiązanego obiektu ${main_build_recurse_ant.dita} &lt;/br&gt;</echo>         
+        <echo message="OUTPUT__END"/>
 
+    </target>
 
+    <target name="dita_ok" if="${test_if_dita}">
 
         <antcall target="build_recurse_ant_merge_dita_from_temp.xsl"/>
 
     </target>
 
     
@@ -239,11 +248,7 @@
 
         
     </target>
 
     
-    <target name="info_brak_dita" unless="${test_if_dita}">
 
-        <echo message="OUTPUT__START"/>   
-        <echo>&lt;br&gt;Brakuje druku dla powiązanego obiektu ${main_build_recurse_ant.dita} &lt;/br&gt;</echo>         
-        <echo message="OUTPUT__END"/>
 
-    </target>
 
+    
    
     <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}" >
 
@@ -324,7 +329,7 @@
 
 
 
 
-    <target name="buildpdf_recursed" depends="info_brak_dita,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_dita" if="${test_if_dita}">
 
+    <target name="buildpdf_recursed" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_dita" if="${test_if_dita}">
 
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
 
         <exec executable="${dita.dir}" dir=".">
 
             <arg value="-i"/>

+ 0 - 13
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/do_build.sh
Zobraziť súbor 

@@ -1,13 +0,0 @@
 
-cd /Library/Server/Web/Data/Sites/SE-production-git/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk
 
-
 
-export PATH=/usr/ant/bin:/opt/local/bin:/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/local/bin:/opt/local/sbin/skrypty:/opt/local/var/macports/software:/Applications/Server.app/Contents/ServerRoot/usr/bin:/Applications/Server.app/Contents/ServerRoot/usr/sbin
 
-JAVA_HOME="/usr/bin/java"
 
-#M2_HOME=/usr/local/apache-maven/apache-maven-3.0.5
 
-#M2=$M2_HOME/bin
 
-MAVEN_OPTS="-Xms256m -Xmx512m"
 
-#PATH=$M2:$PATH
 
-
 
-
 
-ant -S ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
 
-
 
-#ant  -S -DtypeName=p5_default_db:IN7_DZIENNIK_KORESP -Dxpath=ID -Dxpath_value=1000 -DpasswordBase64Basic="YS5iaW5kZXI6VmlzMTFvbjY5WA=="

+ 0 - 90
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main.dita
Zobraziť súbor 

@@ -1,90 +0,0 @@
 
-<?xml version="1.0" encoding="UTF-8"?>
 
-<topic id="untitled4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-  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>
 
-  <body>
 
-    <codeblock>
 
-      <RelatedFeature xpath="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 -->
 
-        <ph>Nadawca:</ph><ph/>
 
-        <ph xpath="name1"/><ph/>
 
-        <ph xpath="name2"/><ph/>
 
-        <ph xpath="miasto"/><ph/>
 
-        <ph xpath="nr_rach"/><ph/>
 
-        <ph xpath="BILLING_OWNER_EMAIL"/><ph/>
 
-      </RelatedFeature>
 
-    </codeblock>
 
-    
-    
-    <table frame="all" rowsep="1" colsep="1" id="table_uh2_3qg_vx">
 
-      <title>Nagłówek</title>
 
-      <tgroup cols="2" align="right">
 
-        <colspec colname="c1" colnum="1" colwidth="2.57*"/>
 
-        <colspec colname="c2" colnum="2" colwidth="1*"/>
 
-        <thead>
 
-          <row>
 
-            <entry>Adresat</entry>
 
-            <entry xpath="K_OD_KOGO"/>
 
-          </row>
 
-        </thead>
 
-        <tbody>
 
-          <row>
 
-            <entry>Adres:</entry>
 
-            <entry xpath="OD_KOGO_ADRES"/>
 
-          </row>
 
-          <row>
 
-            <entry>Wasz znak</entry>
 
-            <entry xpath="K_NR_OTRZYM_KORESP"/>
 
-          </row>
 
-        </tbody>
 
-      </tgroup>
 
-    </table>
 
-    <!--<p>Druga tabela - przetwarzanie tresci z data-about/data</p>-->
 
-    <!--<table frame="all" rowsep="1" colsep="1" id="table_uh2_3qg_vxz">
 
-      <title>Nagłówek</title>
 
-      <tgroup cols="2" align="right">
 
-        <colspec colname="c1" colnum="1" colwidth="2.57*"/>
 
-        <colspec colname="c2" colnum="2" colwidth="1*"/>
 
-        <thead>
 
-          <row>
 
-            <entry>Adresat</entry>
 
-            <entry xpath="K_OD_KOGO">
 
-              <data-about>
 
-                <data>
 
-                    <apiname base="SOURCE_INCLUDE"></apiname><!-\- jaki xml lub dane z API sa do zainkludowania -\->
 
-                    <apiname base="STYLE_INCLUDE"></apiname><!-\- jaki styl xsl jest do zaimportowania -\->
 
-                    <apiname base="SOURCE_NAMESPACE">https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd</apiname><!-\- -\->
 
-                    <apiname base="XPATH_VALUE">/*/K_OD_KOGO</apiname>
 
-                </data>
 
-              </data-about>
 
-            </entry>
 
-          </row>
 
-        </thead>
 
-        <tbody>
 
-          <row>
 
-            <entry>Adres:</entry>
 
-            <entry xpath="default_db__x3A__IN7_DZIENNIK_KORESP:OD_KOGO_ADRES"/>
 
-          </row>
 
-          <row>
 
-            <entry>Wasz znak</entry>
 
-            <entry xpath="default_db__x3A__IN7_DZIENNIK_KORESP:K_NR_OTRZYM_KORESP"/>
 
-          </row>
 
-        </tbody>
 
-      </tgroup>
 
-    </table>-->
 
-    <p>Tresc: </p>
 
-    <p xpath="K_ZAWARTOS">
 
-    </p>
 
-   <!-- <data-about>
 
-      <data><apiname base="PROCES_INCLUDE">1607</apiname></data>
 
-    </data-about>-->
 
-  </body>
 
-  
-  <!--<topic id="topic_e22_jwx_yx">
 
-    <title>title2</title>
 
-    <body>
 
-      <p>body topic2</p>
 
-    </body>
 
-  </topic>-->
 
-</topic>

+ 0 - 91
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/main_build_recurse_ant.dita
Zobraziť súbor 

@@ -1,91 +0,0 @@
 
-<?xml version="1.0" encoding="UTF-8"?>
 
-<RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP"
 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
 
-  <!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
 
-  <!--https://biuro.biall-net.pl/SE/version-git/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/out/null400667363.pdf-->
 
-<topic id="untitled4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-  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>
 
-  <body>
 
-    <simpletable id="simpletable_uym_ps1_zy">
 
-      <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/>
 
-        </RelatedFeature></stentry>
 
-        <stentry>
 
-          <p>Odbiorca:</p><ph/>
 
-          <p xpath="K_OD_KOGO"/><ph/>
 
-          <p xpath="OD_KOGO_ADRES"/><ph/>
 
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
 
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
 
-        </stentry>
 
-      </strow>
 
-    </simpletable>
 
-    
-    <p><b>Temat: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
 
-  
- 
-    <p>Tresc: </p>
 
-    <p xpath="K_ZAWARTOSC_HTML">
 
-    </p>
 
-    <p><b>Powiazane elementy (inne dokumenty w sprawie)</b></p>
 
-    <p>
 
-      <table>
 
-        <tgroup cols="3">
 
-          <thead>
 
-            <row>
 
-              <entry>ID</entry>
 
-              <entry>Data</entry>
 
-              <entry>Temat</entry>
 
-            </row>
 
-          </thead>
 
-          <tbody>
 
-            <row>
 
-              <entry/>
 
-              <entry/>
 
-              <entry/>
 
-            </row>
 
-            <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID_PROJECT" typeName="p5_default_db:IN7_DZIENNIK_KORESP">  <!-- test sciagniecia powiazanych pism do sprawy -->
 
-              <row>
 
-                <entry xpath="ID" />
 
-                <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
 
-                <entry xpath="K_ZAWARTOS"/>
 
-              </row>
 
-            </RelatedFeature>
 
-          </tbody>
 
-        </tgroup>
 
-      </table>
 
-    </p> 
-   <!-- <data-about>
 
-      <data><apiname base="PROCES_INCLUDE">1607</apiname></data>
 
-    </data-about>-->
 
-    <!--<simpletable id="simpletable_uym_ps1_zy">
 
-      <strow>
 
-        <stentry>
 
-          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER"></RelatedFeature>
 
-          
-        </stentry>
 
-        <stentry>
 
-        </stentry>
 
-      </strow>
 
-    </simpletable>-->
 
-    
-  </body>
 
-  
-  <!--<topic id="topic_e22_jwx_yx">
 
-    <title>title2</title>
 
-    <body>
 
-      <p>body topic2</p>
 
-    </body>
 
-  </topic>-->
 
-</topic>
 
-</RelatedFeature>

+ 0 - 42
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/sample_test_xml_from_api.xml
Zobraziť súbor 

@@ -1,42 +0,0 @@
 
-<?xml version="1.0" encoding="UTF-8"?>
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns="http://www.opengis.net/wfs"
 
- 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"
 
- xsi:schemaLocation="https://biuro.biall-net.pl/wfs/default_db https://biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;TYPENAME=p5_default_db:IN7_DZIENNIK_KORESP&amp;REQUEST=DescribeFeatureType">
 
- <gml:featureMember>
 
-  <p5_default_db:IN7_DZIENNIK_KORESP fid="IN7_DZIENNIK_KORESP.59657">
 
-   <p5_default_db:ID>59657</p5_default_db:ID>
 
-   <p5_default_db:COST_OF_SHIPMENT>0.00</p5_default_db:COST_OF_SHIPMENT>
 
-   <p5_default_db:COST_VALUE>0.00</p5_default_db:COST_VALUE>
 
-   <p5_default_db:INCOME_VALUE>0.00</p5_default_db:INCOME_VALUE>
 
-   <p5_default_db:path>0-39-816-2097-3487-3625-6282</p5_default_db:path>
 
-   <p5_default_db:P_ID>0</p5_default_db:P_ID>
 
-   <p5_default_db:A_STATUS>WAITING</p5_default_db:A_STATUS>
 
-   <p5_default_db:K_TYP_KORESP>OUT</p5_default_db:K_TYP_KORESP>
 
-   <p5_default_db:K_TYP_RODZAJ>OSOBISCIE</p5_default_db:K_TYP_RODZAJ>
 
-   <p5_default_db:K_DATA_OTRZYMANEJ_KORESP>2017-02-13</p5_default_db:K_DATA_OTRZYMANEJ_KORESP>
 
-   <p5_default_db:K_DATA_OTRZYM_KORESP>0000-00-00</p5_default_db:K_DATA_OTRZYM_KORESP>
 
-   <p5_default_db:ID_BILLING_USERS>0</p5_default_db:ID_BILLING_USERS>
 
-   <p5_default_db:K_OD_KOGO>TELEOPTO S.C.</p5_default_db:K_OD_KOGO>
 
-   <p5_default_db:OD_KOGO_ADRES>ul. Gospody 14C/1</p5_default_db:OD_KOGO_ADRES>
 
-   <p5_default_db:K_ZAWARTOS>Zlecenie wciągnięcia kabla w kanalizacji teletechnicznej Orange</p5_default_db:K_ZAWARTOS>
 
-   <p5_default_db:ID_PROJECT>6282</p5_default_db:ID_PROJECT>
 
-   <p5_default_db:L_APPOITMENT_DATE>2016-10-04 10:58</p5_default_db:L_APPOITMENT_DATE>
 
-   <p5_default_db:L_APPOITMENT_USER>adrian.kasprzak</p5_default_db:L_APPOITMENT_USER>
 
-   <p5_default_db:L_APPOITMENT_INFO>terminy realizacji: do uzgodnienienia</p5_default_db:L_APPOITMENT_INFO>
 
-   <p5_default_db:T_TELBOX_NEIGHBOUR_IN_ID>0</p5_default_db:T_TELBOX_NEIGHBOUR_IN_ID>
 
-   <p5_default_db:ID_ZASOB>0</p5_default_db:ID_ZASOB>
 
-   <p5_default_db:CRM_LISTA_ZASOBOW_ID>92</p5_default_db:CRM_LISTA_ZASOBOW_ID>
 
-   <p5_default_db:ID_DEVICE>0</p5_default_db:ID_DEVICE>
 
-   <p5_default_db:T_TELBOX_NEIGHBOUR_IN_ID_NEW>0</p5_default_db:T_TELBOX_NEIGHBOUR_IN_ID_NEW>
 
-   <p5_default_db:ID_ZASOB_NEW>0</p5_default_db:ID_ZASOB_NEW>
 
-   <p5_default_db:A_RECORD_CREATE_DATE>2017-02-10 09:23:00</p5_default_db:A_RECORD_CREATE_DATE>
 
-   <p5_default_db:A_RECORD_CREATE_AUTHOR>adrian.kasprzak</p5_default_db:A_RECORD_CREATE_AUTHOR>
 
-   <p5_default_db:A_RECORD_UPDATE_DATE>2017-02-10 09:51:00</p5_default_db:A_RECORD_UPDATE_DATE>
 
-   <p5_default_db:A_RECORD_UPDATE_AUTHOR>adrian.kasprzak</p5_default_db:A_RECORD_UPDATE_AUTHOR>
 
-   <p5_default_db:A_CLASSIFIED>27_BIALL-NET</p5_default_db:A_CLASSIFIED>
 
-   <p5_default_db:A_ADM_COMPANY>27_BIALL-NET</p5_default_db:A_ADM_COMPANY>
 
-  </p5_default_db:IN7_DZIENNIK_KORESP>
 
- </gml:featureMember>
 
-</wfs:FeatureCollection>

+ 37 - 0
SE/se-lib/Core/Database.php
Zobraziť súbor 

@@ -55,5 +55,42 @@ class Core_Database {
 
 	function get_by_id($table, $id) {
 
 		return null;
 
 	}
 
+	
+	/* @2015-04-01 - funkcja nie skonczona - gdzies jest piotrowa, ktora generuje schematy
 
+	
+	function STRUCTURE_GENERATE_to_xsd($TABLES_IMPORT,$CONNREMOTE,$schema_folder) {
 
+		//
 
+		//	$TABLES_IMPORT - is array of tables used by $CONNREMOTE->STRUCTURE_GENERATE($TABLES_STRUCTURE,null,$TABLES_STRUCTURE_DATA)
 
+		//	$CONNREMOTE - is $conn of database from which we will detect its name 
+		//
 
+		
+		DEBUG_S(-3,'TABLES_IMPORT',$TABLES_IMPORT,__FILE__,__FUNCTION__,__LINE__);
 
+		
+		foreach($TABLES_IMPORT as $TABLES_IMPORT_NAME=>$TABLE_IMPORT_ARR) {
 
+			if($TABLE_IMPORT_ARR['Table_type']=='BASE TABLE') {
 
+		
+		
+				$xml = new SimpleXMLElement('<xml/>');
 
+		
+				$schema = $xml->addChild('xs:schema',null,'http://www.w3.org/2001/XMLSchema');
 
+				
+				$schema->addAttribute('xmlns:xmlns:'.$CONNREMOTE->getDatabaseName(), 'http://biuro.biall-net.pl/xmlschema_procesy5/default_db/'.$CONNREMOTE->getDatabaseName());
 
+				$complexType = $schema->addChild('complexType');
 
+					$complexType->addAttribute('name',$TABLES_IMPORT_NAME);
 
+				$element = $complexType->addChild('element');
 
+		
+			DEBUG_S(-3,'xml output ',$xml->asXML(),__FILE__,__FUNCTION__,__LINE__);
 
+				
+   			$fp = fopen($schema_folder.'/'.$TABLES_IMPORT_NAME.'.xsd', 'w');
 
+   			fwrite($fp, $xml->asXML());
 
+			fclose($fp);
 
+		
+			}
 
+			unset($xml);
 
+		}
 
+		
+	}
 
+	*/
 
+	
 
 }