[MOBY-guts] biomoby commit

[Ambrose Ng]

ambrose
Thu Apr 29 14:03:52 EDT 2004
Update of /home/repository/moby/moby-live/Perl/Accessories
In directory pub.open-bio.org:/tmp/cvs-serv22507/Perl/Accessories

Modified Files:
	NamespaceMaintenance.cgi 
Log Message:
updated error catching on namespace maintenance cgi page

moby-live/Perl/Accessories NamespaceMaintenance.cgi,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/Accessories/NamespaceMaintenance.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/Accessories/NamespaceMaintenance.cgi	2004/04/20 23:19:19	1.1
+++ /home/repository/moby/moby-live/Perl/Accessories/NamespaceMaintenance.cgi	2004/04/29 18:03:52	1.2
@@ -68,7 +68,7 @@
             print
         "* = required fields",p,
         " --------",p,
-        "Full abbreviation will be \"authority abbr_identifier abbreviation\" \"GeneDB_Tbrucei\"",
+        "Full abbreviation will be \"authority abbreviation_identifier abbreviation\" e.g. \"GeneDB_Tbrucei\"",
         start_form,
         table(
         Tr(td("authority abbreviation* "),td(textfield(-name => 'authabvr', -class => "require"),"e.g.: GeneDB")),
@@ -79,8 +79,8 @@
         Tr(td("contact email* "),td(textfield(-name =>'email1', -class => "require"),"@",textfield(-name => 'email2', -class => "require" ),"e.g.: example\@email.ca")),
         Tr(td("object "),td(textfield('object'),"e.g.: Gene identifier.")),
         Tr(td("generic url* "),
-    td(popup_menu(-name=>'urltype',
-            -values=>['choose','http://','https://'], -class => "require" ),textfield(-name => 'url', -class => "require"),"e.g.:  http\:\/\/www.genedb.org\/tryp ")),
+    td(popup_menu(-name=>'urltype',-class => "require" ,
+            -values=>['choose','http://','https://']),textfield(-name => 'url', -class => "require"),"e.g.:  http\:\/\/www.genedb.org\/tryp ")),
         Tr(td("synonym "),td(textarea('syn'),"e.g.: SP, SWP, SWISS-PROT. one entry per line")),
         Tr(td("example_id "),td(textfield('example_id'),"e.g.: Tb927.1.5250")),
         Tr(td("url_syntax "),
@@ -112,13 +112,13 @@
         Tr(td("authority abbreviation: "),td($authabvr),(hidden('authabvr')),(hidden('namespace_id'))),
         Tr(td("identifier abbreviation: "),td($namespacetype),(hidden('namespacetype'))),
         Tr(td"--------"),
-        Tr(td("description* "),td(textarea('desc'),"Type a short description here about the entry.")),
-        Tr(td("authority* "),td(textfield('auth'),"e.g.: www.genedb.org")),
-        Tr(td("contact email* "),td(textfield('email1'),"@",textfield('email2'),"e.g.: example\@email.ca")),
+        Tr(td("description* "),td(textarea(-name =>'desc', -class => "require"),"Type a short description here about the entry.")),
+        Tr(td("authority* "),td(textfield(-name =>'auth', -class => "require"),"e.g.: www.genedb.org")),
+        Tr(td("contact email* "),td(textfield(-name=>'email1', -class => "require"),"@",textfield(-name =>'email2', -class=> "require"),"e.g.: example\@email.ca")),
         Tr(td("object "),td(textfield('object'),"e.g.: Gene identifier.")),
         Tr(td("generic url* "),
-    td(popup_menu(-name=>'urltype',
-            -values=>['choose','http://','https://']),textfield('url'),"e.g.:  http\:\/\/www.genedb.org\/tryp ")),
+    td(popup_menu(-name=>'urltype',-class=>"require",
+            -values=>['choose','http://','https://']),textfield(-name=>'url',-class=>"require"),"e.g.:  http\:\/\/www.genedb.org\/tryp ")),
         Tr(td("synonym "),td(textarea('syn'),"e.g.: SP, SWP, SWISS-PROT. one entry per line")),
         Tr(td("example_id "),td(textfield('example_id'),"e.g.: Tb927.1.5250")),
         Tr(td("url_syntax "),
@@ -231,7 +231,7 @@
         print "unfilled description field",hr;
         return 1;
     }
-    elsif (!$Param{email1} or !$Param{email2}) {
+    elsif (!$Param{email1} or !$Param{email2} or !($Param{email2} =~ /\./)) {
         print "invalid email address",hr;
         return 1;
     }