missing index views added, minor adaptions

ArchiveTFMVienna · Feb 24, 2018 · 4955198 · 4955198
1 parent 1dec88b
commit 4955198
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 48 deletions.
diff --git a/analyze/beacon.xql b/analyze/beacon.xql
@@ -8,7 +8,7 @@ declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace gefx = "http://gexf.net/data/hello-world.gexf";
 declare namespace util = "http://exist-db.org/xquery/util";
 
-declare option exist:serialize "method=text media-type=text";
+declare option exist:serialize "method=text media-type=text encoding=utf-8";
 
 let $root := "https://rundbriefe-app.acdh.oeaw.ac.at/"
 
@@ -21,7 +21,8 @@ let $items :=
     for $x in doc($app:personIndex)//tei:person[starts-with(./tei:idno/text(), 'http://d-nb')]
         let $ownId := data($x/@xml:id)
         let $url := $root||'pages/hits.html?searchkey='||$ownId
-        let $entry :=$x/tei:idno/text()||'|'||$url
+        let $idno := $x/tei:idno[1]/text()
+        let $entry :=$x/tei:idno[1]/text()||'|'||$url
     return $entry
 let $beacon := string-join(($prefix, $items), '&#10;')
     return $beacon
diff --git a/analyze/persDocNetJson.xql b/analyze/persDocNetJson.xql
@@ -14,7 +14,8 @@ let $result :=
             return
                 <nodes>
                     <id>{$pos}</id>
-                    <label>{$title}</label>
+                    <title>{$title}</title>
+                    <color>red</color>
                 </nodes>
     }
     {
@@ -28,7 +29,8 @@ let $result :=
                     return
                         <nodes>
                             <id>{$key}</id>
-                            <label>{$person[1]/text()}</label>
+                            <title>{$person[1]/text()}</title>
+                            <color>blue</color>
                         </nodes>
     }
     {
@@ -40,7 +42,58 @@ let $result :=
                         <from>{$pos}</from>
                         <to>{$key}</to>
                     </edges>
-                }
+     }
+
+     {
+
+        for $doc at $pos in collection($app:editions)//tei:TEI
+            let $title := $doc//tei:titleStmt/tei:title[@type='sub']
+            let $docID := $pos
+            for $person in $doc//tei:body//tei:rs[@type="org"]
+                let $key := data($person/@ref)
+                group by $key
+                    return
+                        <nodes>
+                            <id>{$key}</id>
+                            <title>{$person[1]/text()}</title>
+                            <color>green</color>
+                        </nodes>
+    }
+    {
+        for $doc at $pos in collection($app:editions)//tei:TEI
+            for $person in $doc//tei:body//tei:rs[@type="org"]
+            let $key := data($person/@ref)
+                return
+                    <edges>
+                        <from>{$pos}</from>
+                        <to>{$key}</to>
+                    </edges>
+     }
+     {
+
+        for $doc at $pos in collection($app:editions)//tei:TEI
+            let $title := $doc//tei:titleStmt/tei:title[@type='sub']
+            let $docID := $pos
+            for $person in $doc//tei:body//tei:rs[@type="work"]
+                let $key := data($person/@ref)
+                group by $key
+                    return
+                        <nodes>
+                            <id>{$key}</id>
+                            <title>{$person[1]/text()}</title>
+                            <color>grey</color>
+                        </nodes>
+    }
+    {
+        for $doc at $pos in collection($app:editions)//tei:TEI
+            for $person in $doc//tei:body//tei:rs[@type="work"]
+            let $key := data($person/@ref)
+                return
+                    <edges>
+                        <from>{$pos}</from>
+                        <to>{$key}</to>
+                    </edges>
+     }
     </result>
 return
     $result
diff --git a/data/editions/Rundbrief_002.xml b/data/editions/Rundbrief_002.xml
diff --git a/data/indices/listperson.xml b/data/indices/listperson.xml
@@ -165,8 +165,8 @@
                   <persName>
                      <surname>Raimund</surname>
                      <forename>Ferdinand</forename>
-                     <roleName>Volksdramatiker</roleName>
-                     <roleName>Volksdarsteller</roleName>
+                     <roleName>Dramatiker</roleName>
+                     <roleName>Schauspieler</roleName>
                   </persName>
                   <idno type="URL">http://d-nb.info/gnd/118597914</idno>
                </person>
@@ -176,6 +176,14 @@
                      <forename>Georg Edmund Alfred</forename>
                      <roleName type="degree" full="abb">Prof.</roleName>
                   </persName>
+                  <birth when="1872-05-17">
+                     <date>17. Mai 1872</date>
+                     <rs type="place" ref="#gera">Gera</rs>
+                  </birth>
+                  <death when="1945-02-14">
+                     <date>14. Februar 1945</date>
+                     <rs type="place" ref="#dresden">Dresden</rs>
+                  </death>
                </person>
                <person xml:id="meyer_ruth">
                   <persName>
@@ -574,6 +582,7 @@
                <person xml:id="lutz_">
                   <persName>
                      <surname>Lutz</surname>
+                     <surname type="alt">Lutze</surname>
                      <forename/>
                      <roleName type="degree" full="yes">Dozent</roleName>
                   </persName>
@@ -794,9 +803,7 @@
                <person xml:id="strauß_richard">
                   <persName>
                      <surname>Strauß</surname>
-                     <surname>
-                                <alt/>Strauss<alt/>
-                            </surname>
+                     <surname type="alt">Strauss</surname>
                      <forename>Richard</forename>
                      <roleName>Komponist</roleName>
                      <roleName>Dirigent</roleName>

diff --git a/data/indices/listplace.xml b/data/indices/listplace.xml
@@ -223,6 +223,13 @@
                </location>
                <idno type="URL">https://d-nb.info/gnd/4066009-6</idno>
             </place>
+            <place xml:id="gera" type="city">
+               <placeName>Gera</placeName>
+               <location>
+                  <geo decls="LatLng">50.885071 12.080720</geo>
+               </location>
+               <idno type="URL">http://d-nb.info/gnd/4020295-1</idno>
+            </place>
          </listPlace>
       </body>
   </text>

diff --git a/data/indices/listwork.xml b/data/indices/listwork.xml
@@ -273,6 +273,12 @@
                         </author>
                         <idno type="URL">https://d-nb.info/02158866X</idno>
                     </bibl>
+                    <bibl xml:id="nationaltheater_deutsche_klassik">
+                        <title>Das Nationaltheater der deutschen Klassik</title>
+                        <author>
+                            <rs type="person" ref="#kindermann_heinz">Heinz Kindermann</rs>
+                        </author>
+                    </bibl>
                 </listBibl>
             </p>
         </body>

diff --git a/modules/app.xql b/modules/app.xql
@@ -178,6 +178,60 @@ for $title in ($entities, $terms)
             </tr>
 };
 
+(:~
+ : creates a basic work-index derived from the  '/data/indices/listbibl.xml'
+ :)
+declare function app:listBibl($node as node(), $model as map(*)) {
+    let $hitHtml := "hits.html?searchkey="
+    for $item in doc($app:workIndex)//tei:listBibl/tei:bibl
+    let $author := normalize-space(string-join($item/tei:author//text(), ' '))
+    let $gnd := $item//tei:idno/text()
+    let $gnd_link := if ($gnd) 
+        then
+            <a href="{$gnd}">{$gnd}</a>
+        else
+            'no normdata provided'
+   return
+        <tr>
+            <td>
+                <a href="{concat($hitHtml,data($item/@xml:id))}">{$item//tei:title[1]/text()}</a>
+            </td>
+            <td>
+                {$author}
+            </td>
+            <td>
+                {$gnd_link}
+            </td>
+        </tr>
+};
+
+(:~
+ : creates a basic organisation-index derived from the  '/data/indices/listorg.xml'
+ :)
+declare function app:listOrg($node as node(), $model as map(*)) {
+    let $hitHtml := "hits.html?searchkey="
+    for $item in doc($app:orgIndex)//tei:listOrg/tei:org
+    let $altnames := normalize-space(string-join($item//tei:orgName[@type='alt'], ' '))
+    let $gnd := $item//tei:idno/text()
+    let $gnd_link := if ($gnd) 
+        then
+            <a href="{$gnd}">{$gnd}</a>
+        else
+            'no normdata provided'
+   return
+        <tr>
+            <td>
+                <a href="{concat($hitHtml,data($item/@xml:id))}">{$item//tei:orgName[1]/text()}</a>
+            </td>
+            <td>
+                {$altnames}
+            </td>
+            <td>
+                {$gnd_link}
+            </td>
+        </tr>
+};
+
 (:~
  : creates a basic person-index derived from the  '/data/indices/listperson.xml'
  :)

diff --git a/pages/bibl.html b/pages/bibl.html
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<div data-template="templates:surround" data-template-with="templates/datatable.html" data-template-at="datatable">
+    <div class="panel panel-default">
+        <div class="panel-heading" style="text-align:center;">
+            <h1>Works</h1>
+        </div>
+        <div class="panel-body">
+            <table id="myTable" class="table table-striped table-condensed table-hover">
+                <thead>
+                    <tr>
+                        <th>Title</th>
+                        <th>Author</th>
+                        <th>Normdata</th>
+                    </tr>
+                </thead>
+                <tbody id="myTableBody" style="display:none">
+                    <tr data-template="app:listBibl"/>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <script>var table = $('#myTable').DataTable({
+        keepConditions: true,
+        dom: 'Bfrtip',
+        buttons: [
+        'copy', 'excel', 'pdf'
+        ]
+        });
+
+        $(document).ready(function() {
+        $("#myTableBody").show({
+        });
+        });</script>
+</div>
diff --git a/pages/orgs.html b/pages/orgs.html
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<div data-template="templates:surround" data-template-with="templates/datatable.html" data-template-at="datatable">
+    <div class="panel panel-default">
+        <div class="panel-heading" style="text-align:center;">
+            <h1>Organisations</h1>
+        </div>
+        <div class="panel-body">
+            <table id="myTable" class="table table-striped table-condensed table-hover">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Alternative Name(s)</th>
+                        <th>Normdata</th>
+                    </tr>
+                </thead>
+                <tbody id="myTableBody" style="display:none">
+                    <tr data-template="app:listOrg"/>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <script>var table = $('#myTable').DataTable({
+        keepConditions: true,
+        dom: 'Bfrtip',
+        buttons: [
+        'copy', 'excel', 'pdf'
+        ]
+        });
+
+        $(document).ready(function() {
+        $("#myTableBody").show({
+        });
+        });</script>
+</div>
diff --git a/templates/page.html b/templates/page.html
@@ -73,6 +73,12 @@
                             <li>
                                 <a href="places.html">Places</a>
                             </li>
+                            <li>
+                                <a href="orgs.html">Organizations</a>
+                            </li>
+                            <li>
+                                <a href="bibl.html">Works</a>
+                            </li>
                         </ul>
                     </li>
                     <li class="dropdown">
@@ -82,7 +88,7 @@
                                 <a href="timeline.html">Timeline</a>
                             </li>
                             <li>
-                                <a href="netvis.html">CMFI-Net</a>
+                                <a href="netvis.html">Network</a>
                             </li>
                         </ul>
                     </li>