r4891 - trunk/src/perl

[walbridge at ecoinformatics.org]

Author: walbridge
Date: 2009-04-01 17:01:34 -0700 (Wed, 01 Apr 2009)
New Revision: 4891

Modified:
   trunk/src/perl/register-dataset.cgi
Log:
Adding back fix for editing documents with multiple keywords, closing #3929

Modified: trunk/src/perl/register-dataset.cgi
===================================================================
--- trunk/src/perl/register-dataset.cgi	2009-04-01 19:00:12 UTC (rev 4890)
+++ trunk/src/perl/register-dataset.cgi	2009-04-02 00:01:34 UTC (rev 4891)
@@ -2217,10 +2217,7 @@
 
     my $count = 1;
     foreach $node ($results->get_nodelist) {
-    $tempResult = $node->findnodes('./keyword');
-    if ($tempResult->size() > 1) {
-        errMoreThanOne("keyword");
-    } else {
+        $tempResult = $node->findnodes('./keyword');
         foreach $tempNode ($tempResult->get_nodelist) {
             $$templateVars{"keyword$count"} = $tempNode->textContent();
             if ($tempNode->hasAttributes()) {
@@ -2230,12 +2227,12 @@
                 $$templateVars{"kwType$count"} = $tmp;
             }
         }
-    }
-    $$templateVars{"kwTh$count"} = findValue($node, "keywordThesaurus");
+        $$templateVars{"kwTh$count"} = findValue($node, "keywordThesaurus");
         $count++;
     }
+
     $$templateVars{'keyCount'} = $count;
-    if ($count > 0) {
+    if ($count > 1) {
        $$templateVars{'hasKeyword'} = "true";
     }
 
@@ -3514,7 +3511,7 @@
                 if ($response != '1') {
                     return $failMessage;
                 }
-                foreach (split(":",$moderators)) {
+                foreach (split(":", $moderators)) {
                     $response = $metacat->setaccess($id, $_, "all", "allow", "denyFirst");
                     if ($response != '1') {
                         return $failMessage;