/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1989

Added by Matt Jones almost 21 years ago

Added studyExtent and samplingDescription fields to the registry to accomodate
Sandy's request for a temporalDescription field. This is a little more than
she wanted, but it was needed to satisfy EML minimum requirements.

             <p>
               <input type="button" value="Add paragraph" id="addparabutton1"
                      onClick="addParagraph()">
             </p><br>
             <p class="label">Description of Study Extent</p>
             <p>Describe the temporal, spatial and taxonomic extent of the study,
             supplementing the information on coverage provided above.  For example,
             if the temporal coverage of the data is 1990-2000, you might provide
             details about any years that were missed or the months in which sampling
             occurred.</p>
             <p>
               <textarea rows="5" cols="80" name="studyExtentDescription">[% studyExtentDescription %]</textarea>
             </p><br>
             <p class="label">Sampling Description</p>
             <p>Describe the sampling design of the study.  For example, you might
             describe the way in which treatments were assigned to sampling units.
             </p>
             <p>
               <textarea rows="5" cols="80" name="samplingDescription">[% samplingDescription %]</textarea>
             </p>
           </td>
          </tbody>
        </table>

         <hr>
         <a name="Methods"></a>
         <p><b><font size="4" color="#0000ff">METHODS</font></b></p>
         <p><b><font size="-1">Method Title:</font></b>  [%methodTitle%]</p>
         <p><b><font size="-1">Method Title:</font></b> [%methodTitle%]</p>
         [% FOREACH para = methodPara %]
             <p><b><font size="-1">Paragraph:</font></b>  [%para%] </p>
             <p><b><font size="-1">Paragraph:</font></b> [%para%] </p>
         [% END %]
         <p><b><font size="-1">Study Extent:</font></b> [%studyExtentDescription%]</p>
         <p><b><font size="-1">Sampling Description:</font></b> [%samplingDescription%]</p>
     <hr>
     <a name="DataSetContactAddress"></a>
-...
       [% FOREACH para = methodPara %]
           <input type="hidden" name="methodPara" value="[%para%]">
       [% END %]
       <input type="hidden" name="studyExtentDescription" value="[%studyExtentDescription%]">
       <input type="hidden" name="samplingDescription" value="[%samplingDescription%]">
     <table cellspacing="0" border="0" cellpadding="9" width="800" bgcolor="#C6d6e7">
       <tr>

                 $xmldoc =~ s/docid/$docid/;
                 #my $testFile = "/tmp/test.xml";
                 #open (TFILE,">$testFile") || die ("Cant open xml file...\n");
                 #print TFILE $xmldoc;
                 #close(TFILE);
                 my $testFile = "/tmp/test.xml";
                 open (TFILE,">$testFile") || die ("Cant open xml file...\n");
                 print TFILE $xmldoc;
                 close(TFILE);
                 $notunique = insertMetadata($xmldoc, $docid);
                 #  if (!$notunique) {
-...
                 # The id wasn't unique, so update our lastid file
                 if ($notunique eq "NOT_UNIQUE") {
                     debug( "Registry: Updating lastid (B1.1)");
                     updateLastId($defaultScope);
+                }
+            }
-...
       my $docid = shift;
       my $notunique = "SUCCESS";
       debug("Registry: Starting insert (D1)");
       my $response = $metacat->insert($docid, $xmldoc);
       if (! $response) {
         debug("Registry: Response gotten (D2)");
         my $errormsg = $metacat->getMessage();
         debug("Registry: Error is (D3): ".$errormsg);
         if ($errormsg =~ /is already in use/) {
           $notunique = "NOT_UNIQUE";
           #print "Accession number already used: $docid\n";
-...
           $notunique = $errormsg;
+        }
+      }
       debug("Registry: Ending insert (D4)");
       return $notunique;
+    }
-...
             unless hasContent($longDeg1);
+        }
         push(@invalidParams,
             "You must provide a method description if you provide a method title.")
             if (hasContent($FORM::methodTitle) && !(scalar(@FORM::methodPara) > 0));
         push(@invalidParams,
             "You must provide a method description if you provide a study extent description.")
             if (hasContent($FORM::studyExtentDescription) && !(scalar(@FORM::methodPara) > 0));
         push(@invalidParams,
             "You must provide both a study extent description and a sampling description, or neither.")
             unless (hasContent($FORM::studyExtentDescription) && hasContent($FORM::samplingDescription));
         push(@invalidParams, "Contact first name is missing.")
         unless (hasContent($FORM::origNamefirstContact) ||
             $FORM::useOrigAddress);
-...
             for (my $i = 0; $i < scalar(@FORM::methodPara); $i++) {
                 $methods .= "<para>$FORM::methodPara[$i]</para>\n";
+            }
             $methods .= "</section></description></methodStep></methods>\n";
             $methods .= "</section></description></methodStep>\n";
             if (hasContent($FORM::studyExtentDescription)) {
                 $methods .= "<sampling><studyExtent><description>\n";
                 $methods .= "<para>$FORM::studyExtentDescription</para>\n";
                 $methods .= "</description></studyExtent>\n";
                 $methods .= "<samplingDescription>\n";
                 $methods .= "<para>$FORM::samplingDescription</para>\n";
                 $methods .= "</samplingDescription>\n";
                 $methods .= "</sampling>\n";
+            }
             $methods .= "</methods>\n";
             $doc .= $methods;
+        }
-...
+            }
+        }
         $results = $doc->findnodes('//dataset/methods/methodStep/description/section');
         $results = $doc->findnodes(
                 '//dataset/methods/methodStep/description/section');
         debug("Registry: Number methods: ".$results->size());
         if ($results->size() > 1) {
             errMoreThanN("methods/methodStep/description/section");
         } else {
             dontOccur($doc, "//methodStep/citation", "methodStep/citation");
             dontOccur($doc, "//methodStep/protocol", "methodStep/protocol");
             dontOccur($doc, "//methodStep/instrumentation", "methodStep/instrumentation");
             dontOccur($doc, "//methodStep/software", "methodStep/software");
             dontOccur($doc, "//methodStep/subStep", "methodStep/subStep");
             dontOccur($doc, "//methodStep/dataSource", "methodStep/dataSource");
             dontOccur($doc, "//methods/sampling", "methods/sampling");
             dontOccur($doc, "//methods/qualityControl", "methods/qualityControl");
             my @methodPara;
             foreach $node ($results->get_nodelist) {
-...
+            }
+        }
         $results = $doc->findnodes(
                 '//dataset/methods/sampling/studyExtent/description/para');
         if ($results->size() > 1) {
             errMoreThanN("methods/sampling/studyExtent/description/para");
         } else {
             foreach $node ($results->get_nodelist) {
                 my $studyExtentDescription = $node->textContent();
                 $$templateVars{'studyExtentDescription'} = $studyExtentDescription;
+            }
+        }
         $results = $doc->findnodes(
                 '//dataset/methods/sampling/samplingDescription/para');
         if ($results->size() > 1) {
             errMoreThanN("methods/sampling/samplingDescription/para");
         } else {
             foreach $node ($results->get_nodelist) {
                 my $samplingDescription = $node->textContent();
                 $$templateVars{'samplingDescription'} = $samplingDescription;
+            }
+        }
         dontOccur($doc, "//methodStep/citation", "methodStep/citation");
         dontOccur($doc, "//methodStep/protocol", "methodStep/protocol");
         dontOccur($doc, "//methodStep/instrumentation", "methodStep/instrumentation");
         dontOccur($doc, "//methodStep/software", "methodStep/software");
         dontOccur($doc, "//methodStep/subStep", "methodStep/subStep");
         dontOccur($doc, "//methodStep/dataSource", "methodStep/dataSource");
         dontOccur($doc, "//methods/qualityControl", "methods/qualityControl");
         dontOccur($doc, "//methods/sampling/spatialSamplingUnits", "methods/sampling/spatialSamplingUnits");
         dontOccur($doc, "//methods/sampling/citation", "methods/sampling/citation");
         dontOccur($doc, "./pubPlace", "pubPlace");
         dontOccur($doc, "./project", "project");
-...
         $$templateVars{'methodTitle'} = $FORM::methodTitle;
         $$templateVars{'methodPara'} = \@FORM::methodPara;
         $$templateVars{'studyExtentDescription'} = $FORM::studyExtentDescription;
         $$templateVars{'samplingDescription'} = $FORM::samplingDescription;
         $$templateVars{'docid'} = $FORM::docid;
         $$templateVars{'section'} = "Confirm Data";
-...
         $$templateVars{'taxaAuth'} = $FORM::taxaAuth;
         $$templateVars{'methodTitle'} = $FORM::methodTitle;
         $$templateVars{'methodPara'} = \@FORM::methodPara;
         $$templateVars{'studyExtentDescription'} = $FORM::studyExtentDescription;
         $$templateVars{'samplingDescription'} = $FORM::samplingDescription;
         $$templateVars{'docid'} = $FORM::docid;
         $$templateVars{'form'} = 're_entry';

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1989

Added by Matt Jones almost 21 years ago