Changed Has_Evidence_Code to array; now allows multiple values per

ontological reference; also added to Annotation formand template display

svn path=/; revision=168

diff --git a/preecej/semantic_wiki/forms/Annotation.wiki b/preecej/semantic_wiki/forms/Annotation.wiki
index 51406b69dc172ed0df47675d11c951206888b2dc..0eed1679a0c9565e4b42d0dfc5a4010de9d64cf3 100644 (file)
--- a/preecej/semantic_wiki/forms/Annotation.wiki
+++ b/preecej/semantic_wiki/forms/Annotation.wiki
@@ -151,6 +151,7 @@ __NOTOC__
             |? has_Term_ID
             |? has_Term_Name
             |? has_Aspect
+            |? has_Evidence_Code
         }}
         | Add ontological associations for this annotation.<br>{{#formlink:form=Ontological_References|link text=Add|link type=button|query string=Ontological_References[Annotation Page]={{PAGENAME}}&super_page={{PAGENAME}} }}
       }}

diff --git a/preecej/semantic_wiki/forms/Ontological_References.wiki b/preecej/semantic_wiki/forms/Ontological_References.wiki
index a4ddcb646aade666766049e703053e81dbc80387..0eb3d68184c77cbdd47448057f05daab31c3c190 100644 (file)
--- a/preecej/semantic_wiki/forms/Ontological_References.wiki
+++ b/preecej/semantic_wiki/forms/Ontological_References.wiki
@@ -28,7 +28,8 @@ if a page with that name already exists, you will be sent to a form to edit that
 '''Term Name:''' {{{field|Term Name|}}}
 '''Term ID:''' {{{field|Term ID|}}}
 '''Branch:''' {{{field|Aspect|}}}
-<br>'''Evidence Code:''' {{{field|Evidence Code|}}}
+<br><br>'''Evidence Code:'''<br>
+{{{field|Evidence Code|list}}}
 {{{end template}}}
 
 {{{standard input|summary}}}

diff --git a/preecej/semantic_wiki/templates/Annotation.wiki b/preecej/semantic_wiki/templates/Annotation.wiki
index 4e9f9bd469f5366a7a44c4c811c5ebf5eba61a88..b2e901dfd1dbe9c25d13803c81cbd2a92121d95c 100644 (file)
--- a/preecej/semantic_wiki/templates/Annotation.wiki
+++ b/preecej/semantic_wiki/templates/Annotation.wiki
@@ -98,6 +98,7 @@ Edit the page to see the template text.
         |? has_Term_ID
         |? has_Term_Name
         |? has_Aspect
+        |? has_Evidence_Code
     }}
     | There are no ontological associations available for this gene annotation.
 }}

diff --git a/preecej/semantic_wiki/templates/Ontological_Reference_Repeater.wiki b/preecej/semantic_wiki/templates/Ontological_Reference_Repeater.wiki
index 49a080e0c612c37782f01b8e6313c07693e144e2..60368a56d08bb65ac13a1db6d24820d5d18fbf76 100644 (file)
--- a/preecej/semantic_wiki/templates/Ontological_Reference_Repeater.wiki
+++ b/preecej/semantic_wiki/templates/Ontological_Reference_Repeater.wiki
@@ -11,12 +11,12 @@ It should be called in the following format:
 }}
 </pre>
 Edit the page to see the template text.
-</noinclude><includeonly>
-{{#set_internal:is_Ontological_Reference
+</noinclude><includeonly>{{#set_internal:is_Ontological_Reference
 |from_Ontology={{{Ontology|}}}
 |has_Term_ID={{{Term ID|}}}
 |has_Term_Name={{{Term Name|}}}
 |has_Aspect={{{Aspect|}}}
+|has_Evidence_Code#list={{{Evidence Code|}}}
 }}
 {| class="wikitable"
 ! Ontology
@@ -32,7 +32,7 @@ Edit the page to see the template text.
 | [[Has Aspect::{{{Aspect|}}}]]
 |-
 ! Evidence Code
-| [[Has Evidence Code::{{{Evidence Code|}}}]]
+| {{#arraymap:{{{Evidence Code|}}}|,|x|[[Has Evidence Code::x]]}}
 |}
 </includeonly>