Update to remove empty editor elements. majlis-erc#638

Ensure correct editor is added.

Author: wsalesky

forms/formGenerator/generateXForm.xsl

@@ -14,7 +14,7 @@
             - XSLTForms
             - eXist-db 
             
-        Version: 1.70 Beta 
+        Version: 1.71 Beta 
             -1.23 marks a major redesign
         
 
@@ -643,9 +643,11 @@
                         <xf:resource value="concat('services/get-rec.xql?template=true&amp;path=',instance('i-selected'))"/>
                         <xf:action ev:event="xforms-submit-done">
                             <xf:message level="modeless"> Data Loaded! </xf:message>
+                            <!--
                             <xf:insert ref="instance('i-rec')//*:titleStmt/child::*" at="last()" origin="instance('i-admin')//*:editor" position="after"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
+                            -->
                             <xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
                             <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
                             <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>
@@ -658,9 +660,11 @@
                         <xf:resource value="concat('services/get-rec.xql?template=true&amp;path=',instance('i-selected-search'))"/>
                         <xf:action ev:event="xforms-submit-done">
                         <xf:message level="modeless"> Data Loaded! </xf:message>
+                            <!--
                             <xf:insert ref="instance('i-rec')//*:titleStmt/child::*" at="last()" origin="instance('i-admin')//*:editor" position="after"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
+                            -->
                             <xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
                             <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
                             <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>

services/submit.xql

@@ -44,6 +44,10 @@ declare function local:createID(){
 
 (: Any post processing to TEI form data happens here :)
 declare function local:transform($nodes as node()*) as item()* {
+  let $user:=         
+        if(request:get-attribute("org.exist.login.user")) then request:get-attribute("org.exist.login.user") 
+        else(: xmldb:get-current-user():) sm:id()/sm:id/sm:real/sm:username/string(.)
+  let $name := if ($user) then sm:get-account-metadata($user, xs:anyURI('http://axschema.org/namePerson')) else 'Guest'
   for $node in $nodes
   let $new := request:get-parameter('new','')
   let $URI := 
@@ -87,8 +91,13 @@ declare function local:transform($nodes as node()*) as item()* {
                     }
             else element {fn:QName("http://www.tei-c.org/ns/1.0",local-name($node))} {($node/@*, local:markdown2TEI($node/node()))}
         case element(tei:editor) return
-            if($node/descendant-or-self::text() = '') then ()
-            else local:passthru($node) 
+            if($node/parent::tei:titleStmt) then 
+                if($user != 'guest') then
+                    if(not($node/following-sibling::tei:editor) and $node/preceding-sibling::tei:editor[. != $name]) then 
+                        <editor xmlns="http://www.tei-c.org/ns/1.0" xml:id="{$user}" role="contributor">{$name}</editor>
+                    else local:passthru($node)
+                else local:passthru($node)
+            else local:passthru($node)
         case element(tei:idno) return
             if($node/parent::tei:ab[@type='factoid'][@subtype='relation']) then
                 element {fn:QName("http://www.tei-c.org/ns/1.0",local-name($node)) }