changed app URI and prepared app structure

03f3b2ac · usikora · e67e4946 · 03f3b2ac · 03f3b2ac · 03f3b2ac
Commit 03f3b2ac authored 7 years ago by usikora
--- a/data/samples/samples4.xml
+++ b/data/samples/samples4.xml
@@ -214,5 +214,18 @@
            <app> <lem>Inhalt.</lem>
            </app>
      </div>
+      <app>
+        <lem>die christliche Religion, deren einzige authentische Erkenntnißquelle das N. T. ist,
+            (§.17.) die Merkmale ihrer Wahrheit und Göttlichkeit immerfort an sich trägt, und ihre
+            für alle Menschenwohlthätige Natur nicht verändert hat:</lem>
+        <rdg wit="#a" type="ppl">die Verpflichtung, daß alle, die des Unterrichts der Apostel
+            theilhaftig werden würden, denselben annehmen und befolgen sollen, Marc. 16, <app>
+                <lem wit="#a">15,</lem>
+                <rdg wit="#b" type="v">15.</rdg>
+            </app> 16. (vergl. §. 15. b.) nie auf gewisse Zeitenund Menschen <app>
+                <lem wit="#a">eingeschränckt</lem>
+                <rdg wit="#b" type="v">eingeschränkt</rdg>
+            </app>, oder wieder aufgehoben worden ist:</rdg>
+        </app>
   </text>
 </TEI>
\ No newline at end of file
--- a/expath-pkg.xml
+++ b/expath-pkg.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/interformat" abbrev="interformat" version="0.1" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.1" spec="1.0">
    <title>BdN - Intermediate Format</title>
    <dependency package="http://exist-db.org/apps/shared"/>
 </package>
\ No newline at end of file
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
        <div class="alert alert-success">
            <p>
                <a data-template="templates:load-source" href="index.html">This</a> is the renamed new moded entry page into your application 
-                and was generated by eXide. It uses HTML templates for a clean separation of HTML views and application logic.</p>
+                and was generated by eXide. It sdsd uses HTML templates for a clean separation of HTML views and application logic.</p>
            <p>To add your own template functions, start by editing the XQuery module
                <a data-template="templates:load-source" href="modules/app.xql">app.xql</a>.</p>
        </div>

--- a/modules/app.xql
+++ b/modules/app.xql
 xquery version "3.1";
-module namespace app="http://bdn-edition.de/apps/interformat/templates";
+module namespace app="http://bdn-edition.de/intermediate_format/templates";
 import module namespace templates="http://exist-db.org/xquery/templates" ;
-import module namespace config="http://bdn-edition.de/apps/interformat/config" at "config.xqm";
+import module namespace config="http://bdn-edition.de/intermediate_format/config" at "config.xqm";
 (:~
 : This is a sample templating function. It will be called by the templating module if

--- a/modules/config.xqm
+++ b/modules/config.xqm
@@ -4,7 +4,7 @@ xquery version "3.0";
 : A set of helper functions to access the application context from
 : within a module.
 :)
-module namespace config="http://bdn-edition.de/apps/interformat/config";
+module namespace config="http://bdn-edition.de/intermediate_format/config";
 declare namespace templates="http://exist-db.org/xquery/templates";

--- a/modules/view.xql
+++ b/modules/view.xql
@@ -11,8 +11,8 @@ import module namespace templates="http://exist-db.org/xquery/templates" ;
 : The following modules provide functions which will be called by the 
 : templating.
 :)
-import module namespace config="http://bdn-edition.de/apps/interformat/config" at "config.xqm";
+import module namespace config="http://bdn-edition.de/intermediate_format/config" at "config.xqm";
-import module namespace app="http://bdn-edition.de/apps/interformat/templates" at "app.xql";
+import module namespace app="http://bdn-edition.de/intermediate_format/templates" at "app.xql";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";

--- a/oxygen/devel/data/samples.xml
+++ b/oxygen/devel/data/samples.xml
--- a/oxygen/devel/data/samples2.xml
+++ b/oxygen/devel/data/samples2.xml
--- a/oxygen/devel/data/samples3.xml
+++ b/oxygen/devel/data/samples3.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
-<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
 	schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0">
   <text>
      <app n="1">
-         <lem><body>
+         <lem>
+                <body>
               <div>
                  <app n="2">
                     <lem>
@@ -30,34 +30,43 @@
                     <rdg type="ppl" wit="#a">
                        <div>
                           <head>OPEN SIGLE für app [2]/rdg"a"
-                              <a>Blub <note><app n="4">
+                              <a>Blub <note>
+                                                <app n="4">
                                 <lem>OPEN SIGLE für app [4]/lem hhj CLOSE SIGLE für app [4]/lem</lem>
                                 <rdg wit="#d" type="v">OPEN SIGLE für app [4]/rdg"#d" hallo CLOSE SIGLE für app [4]/rdg"#d"</rdg>
-                                    </app></note>
+                                    </app>
+                                            </note>
                              </a>
                           </head>
                           <p>Test CLOSE SIGLE für app[2]/rdg"a"</p>
                        </div>
                     </rdg>
                     <rdg type="v" wit="#f">F</rdg>
-                     <rdg type="ppl" wit="#b">OPEN SIGLE für app [2]/rdg"b" Zeuge B <aligned>CLOSE SIGLE für app[2]/rdg"b" und app[1]/lem</aligned></rdg>
+                     <rdg type="ppl" wit="#b">OPEN SIGLE für app [2]/rdg"b" Zeuge B <aligned>CLOSE SIGLE für app[2]/rdg"b" und app[1]/lem</aligned>
+                            </rdg>
                     <rdg type="pt" wit="#c">C</rdg>
                     <rdg type="ppl" wit="#e">E</rdg>
-                     <rdg type="om" wit="#g"></rdg>
+                     <rdg type="om" wit="#g"/>
                  </app>
               </div>
-            </body></lem>
+            </body>
-         <rdg wit="#z" type="z">OPEN SIGLE für app [1]/rdg"z" test <note>note test CLOSE SIGLE für app[1]/rdg"z"</note></rdg>
+            </lem>
+         <rdg wit="#z" type="z">OPEN SIGLE für app [1]/rdg"z" test <note>note test CLOSE SIGLE für app[1]/rdg"z"</note>
+            </rdg>
         <rdg wit="#t" type="l">hgjg</rdg>
         <rdg wit="#r" type="l">hgjg</rdg>
      </app>
      <app>
         <lem>
            <div type="preface">
-               <head><pb edRef="#c" type="sp" n="III"/>Vorrede. <lb/>zur dritten Ausgabe.<seg type="condensed">Vorrede zur dritten Ausgabe</seg></head>
+               <head>
+                        <pb edRef="#c" type="sp" n="III"/>Vorrede. <lb/>zur dritten Ausgabe.<seg type="condensed">Vorrede zur dritten Ausgabe</seg>
+                    </head>
               <p>Der schnelle ... <note type="editorial">Anmerkung</note>gegen ihre Gewohnheit zu nehmen sich
-               entschliessen mußte. <lb/>Jena <lb/>im September 1787. <lb/><lb/>
+               entschliessen mußte. <lb/>Jena <lb/>im September 1787. <lb/>
-               <hi rend="right-aligned">D. J. J. Griesbach.</hi></p>
+                        <lb/>
+               <hi rend="right-aligned">D. J. J. Griesbach.</hi>
+                    </p>
            </div>
         </lem>
         <rdg wit="#a #b #d" type="om"/>
@@ -78,18 +87,27 @@
         <rdg wit="#a #d" type="om"/> 
      </app>
      <app>
-         <lem><div type="preface">
+         <lem>
-            <head>SIG-OPEN(lem[a,d]) Vorrede. <lb/><app>
+                <div type="preface">
+            <head>SIG-OPEN(lem[a,d]) Vorrede. <lb/>
+                        <app>
               <lem>SIG-OPEN(lem2[b]) Zur zweiten Ausgabe. SIG-CLOSE(lem2[b])</lem>
               <rdg wit="#b" type="om"/>
-            </app><seg type="condensed">Vorrede zur zweiten Ausgabe</seg></head>
+            </app>
+                        <seg type="condensed">Vorrede zur zweiten Ausgabe</seg>
+                    </head>
            <p>Vor sieben Jahren ... Fürstlich Sächsischen Gesammt Akademie zu Jena, im März
-               1786. <hi>Uwe</hi> <hi>Uwe</hi><app>
+               1786. <hi>Uwe</hi> <hi>Uwe</hi>
-                  <lem />
+                        <app>
-                  <rdg wit="#b" type="ptl"><aligned rend="right-aligned">SIG-OPEN(rdg"b") J. J. Griesbach SIG-CLOSE(rdg"b") SIG-CLOSE(lem)
+                  <lem/>
-                  </aligned></rdg>
+                  <rdg wit="#b" type="ptl">
-               </app></p>
+                                <aligned rend="right-aligned">SIG-OPEN(rdg"b") J. J. Griesbach SIG-CLOSE(rdg"b") SIG-CLOSE(lem)
-         </div></lem>
+                  </aligned>
+                            </rdg>
+               </app>
+                    </p>
+         </div>
+            </lem>
         <rdg wit="#t" type="v">hgjg</rdg>
         <rdg wit="#a" type="v">ghshghg</rdg>
         <rdg wit="#a #d" type="om"/>
@@ -128,7 +146,10 @@
            <rdg type="ptl" wit="#c">
               <div type="preface">
                  <p>
-                     <hi rend="right-aligned">Der Herausgeber <index><term>asasas</term></index></hi>
+                     <hi rend="right-aligned">Der Herausgeber <index>
+                                    <term>asasas</term>
+                                </index>
+                            </hi>
                  </p>
                  <note type="editorial">
                     <label>asdf</label>
@@ -146,8 +167,11 @@
         <var>laeuft!</var>
      </choice>
         </p>
-         <p>Das ist der<pb/> Test und derein<pb/>zige Test der <pb/> <hi>page</hi><pb/><hi>bre<lb>uzgtats</lb>aks
+         <p>Das ist der<pb/> Test und derein<pb/>zige Test der <pb/> <hi>page</hi>
-         richtig zählt</hi></p>
+                <pb/>
+                <hi>bre<lb>uzgtats</lb>aks
+         richtig zählt</hi>
+            </p>
      </div>
   </text>
 </TEI>
\ No newline at end of file
--- a/oxygen/devel/data/samples4.xml
+++ b/oxygen/devel/data/samples4.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
-<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_all.rng" type="application/xml"
 	schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0">
   <text>
@@ -10,7 +9,9 @@
               <head>
                  <item> 
                     <hi>
-                        <item><hi>Überschrift</hi></item>
+                        <item>
+                                    <hi>Überschrift</hi>
+                                </item>
                     </hi>
                  </item> <hi>1</hi>
               </head>
@@ -33,7 +34,7 @@
               </p>
            </div>
         </lem>
-         <rdg wit="#z" type="om"></rdg>
+         <rdg wit="#z" type="om"/>
         <rdg wit="#t" type="ppl">
            <p>Erster Paragraph in T</p>
            <p>Zweiter Paragraph in T</p>
@@ -47,7 +48,7 @@
         <lem>
            <div>APP2</div>
         </lem>
-         <rdg wit="#z" type="om"></rdg>
+         <rdg wit="#z" type="om"/>
         <rdg wit="#t" type="ppl">
            <p>Erster Paragraph in T</p>
            <p>Zweiter Paragraph in T</p>
@@ -57,7 +58,7 @@
         <lem>
            <div>
               <app>
-                  <lem></lem>
+                  <lem/>
                  <rdg wit="#h" type="ppl">
                     <p>Erster Paragraph in H</p>
                     <p>Zweiter Paragraph in H</p>
@@ -106,12 +107,14 @@
               <p>
                  <app>
                     <lem>Zweiter Absatz von Test 2</lem>
-                     <rdg wit="#b" type="pp"><hi>Zweiter Absatz von Test 2</hi></rdg>
+                     <rdg wit="#b" type="pp">
+                                <hi>Zweiter Absatz von Test 2</hi>
+                            </rdg>
                  </app>
               </p>
            </div>
         </lem>
-         <rdg wit="#z" type="om"></rdg>
+         <rdg wit="#z" type="om"/>
      </app>
      <app n="TEST3">
         <lem>
@@ -139,11 +142,11 @@
               </p>
            </div>
         </lem>
-         <rdg wit="#a" type="om"></rdg>
+         <rdg wit="#a" type="om"/>
         <rdg wit="#b #e" type="ptl">
            <div>
               <app>
-                  <lem />
+                  <lem/>
                  <rdg wit="#e" type="ppl">
                     <p>PPL P in E</p>
                  </rdg>
@@ -155,4 +158,4 @@
         </rdg>
      </app>
   </text>
 </TEI>
\ No newline at end of file
--- a/repo.xml
+++ b/repo.xml
@@ -10,5 +10,6 @@
    <target>interformat</target>
    <prepare>pre-install.xql</prepare>
    <finish/>
-<deployed>2018-02-20T11:24:04.081+01:00</deployed>
-</meta>
+<deployed>2018-02-20T15:20:27.056+01:00</deployed>
+</meta>
\ No newline at end of file