Merge branch 'feature/outline' into develop

opensiddur · May 19, 2016 · ed2b550 · ed2b550
2 parents fae61e7 + 8767361
commit ed2b550
Show file tree

Hide file tree

Showing 45 changed files with 66,267 additions and 31 deletions.
diff --git a/lib/exist b/lib/exist
diff --git a/lib/restxq.registry b/lib/restxq.registry
@@ -17,3 +17,4 @@ version: 1
 /db/apps/opensiddur-server/api/data/sources.xqm,{http://jewishliturgy.org/api/data/sources}delete#1{http://jewishliturgy.org/api/data/sources}post#1{http://jewishliturgy.org/api/data/sources}pages#1{http://jewishliturgy.org/api/data/sources}put#2{http://jewishliturgy.org/api/data/sources}get#1{http://jewishliturgy.org/api/data/sources}list#3
 /db/apps/opensiddur-server/api/changes.xqm,{http://jewishliturgy.org/api/changes}list#6
 /db/apps/opensiddur-server/api/static.xqm,{http://jewishliturgy.org/api/static}get#1{http://jewishliturgy.org/api/static}list#0
+/db/apps/opensiddur-server/api/data/outlines.xqm,{http://jewishliturgy.org/api/data/outlines}get#2{http://jewishliturgy.org/api/data/outlines}delete#1{http://jewishliturgy.org/api/data/outlines}post#1{http://jewishliturgy.org/api/data/outlines}post-execute#1{http://jewishliturgy.org/api/data/outlines}list#3{http://jewishliturgy.org/api/data/outlines}put#2
diff --git a/lib/tei/Roma b/lib/tei/Roma
diff --git a/lib/tei/Stylesheets b/lib/tei/Stylesheets
diff --git a/lib/tei/p5subset.xml b/lib/tei/p5subset.xml
diff --git a/opensiddur-server/build.xml b/opensiddur-server/build.xml
@@ -26,10 +26,11 @@
             <mkdir dir="@{temp.dir}"/>
             <exec executable="${roma}">
                 <arg value="--xsl=${lib.dir}/tei/Stylesheets"/>
+                <arg value="--localsource=${lib.dir}/tei/p5subset.xml"/>
                 <arg value="--nodtd"/>
                 <arg value="--noxsd"/>
                 <arg value="--isoschematron"/>
-                <arg value="--dochtml"/>
+                <!--<arg value="- -dochtml"/>-->
                 <arg value="@{input.file}"/>
                 <arg value="@{temp.dir}"/>
             </exec>

diff --git a/opensiddur-server/src/api/data/dindex.xqm b/opensiddur-server/src/api/data/dindex.xqm
@@ -5,7 +5,7 @@ xquery version "3.0";
  :  authentication,
  :  content negotiation
  : 
- : Copyright 2012-2013 Efraim Feinstein <efraim@opensiddur.org>
+ : Copyright 2012-2013,2016 Efraim Feinstein <efraim@opensiddur.org>
  : Open Siddur Project
  : Licensed Under the GNU Lesser General Public License, version 3 or later
  :)
@@ -52,6 +52,9 @@ declare
           <li class="api">
             <a class="discovery" href="{$api-base}/original">Original data</a>
           </li>
+          <li class="api">
+            <a class="discovery" href="{$api-base}/outlines">Outlines</a>
+          </li>
           <li class="api">
             <a class="discovery" href="{$api-base}/sources">Sources (Bibliographic data)</a>
           </li>