/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7695

Allow use of PID instead of docid in the Perl registry. At least for reading/editing and deleting existing content. Does not create content using a pid. https://projects.ecoinformatics.org/ecoinfo/issues/5932

     debug("Initialized -- stage set: $FORM::stage");
     # handle pids, set the mapped docid in the FORM params
     # see: https://projects.ecoinformatics.org/ecoinfo/issues/5932
     if ($FORM::pid !~ "" ) {
     	my $pid = $FORM::pid;
     	my $metacat = Metacat->new($metacatUrl);
     	my $docid = $metacat->getDocid($pid);
     	$FORM::docid = $docid;
+    }
     # Process the form based on stage parameter.
     if ( $FORM::stage =~ "loginform" ) {
     	print "Content-type: text/html\n\n";

+    }
     #############################################################
     # subroutine to get the docid for a given PID
     # If success, return docid, else return -1
     #############################################################
     sub getDocid {
       my $self = shift;
       my $pid = shift;
       my $returnval = 0;
       my %postData = ( action => 'getdocid',
                        pid => $pid
                      );
       my $response = $self->sendData(%postData);
       if (($response) && $response->content =~  /<docid>(.*)<\/docid>/s) {
           $returnval = "$1";
       } elsif (($response)) {
         $returnval = -1;
         #print "Error response from sendData!\n";
         #print $response->content, "\n";
       } else {
         $returnval = -1;
         #print "Invalid response from sendData!\n";
+      }
       return $returnval;
+    }
     #############################################################
     # subroutine to get the message returned from the last executed
     # metacat action.  These are generally XML formatted messages.
     #############################################################

     				PrintWriter out = response.getWriter();
     				handler.handleGetDTDSchemaAction(out, params, response);
     				out.close();
     			} else if (action.equals("getdocid")) {
     				handler.handleGetDocid(params, response);
     			} else if (action.equals("getlastdocid")) {
     				PrintWriter out = response.getWriter();
     				handler.handleGetMaxDocidAction(out, params, response);

+        }
         /**
          * Look up the pid (guid)-to-docid mapping.
          * Returns XML on the response, e.g.:
          * <docid>sample.1.1</docid>
+         *
          * @param params
          * @param response
          * @throws IOException
          */
         protected void handleGetDocid(Hashtable<String, String[]> params, HttpServletResponse response) throws IOException {
             response.setContentType("text/xml");
         	ServletOutputStream out = response.getOutputStream();
         	try {
                 // Get pid from parameters
         		String pid = null;
                 if (params.containsKey("pid")) {
                 	pid = params.get("pid")[0];
+                }
                 String docid = IdentifierManager.getInstance().getLocalId(pid);
                 out.println(PROLOG);
                 out.println("<docid>");
                 out.println(docid);
                 out.println("</docid>");
         	} catch (Exception e) {
                 // Handle exception
                 out.println(PROLOG);
                 out.println(ERROR);
                 out.println(e.getMessage());
                 out.println(ERRORCLOSE);
             } finally {
             	out.close();
+            }
+        }
         /**
          * Handle "getrevsionanddoctype" action Given a docid, return it's current
          * revision and doctype from data base The output is String look like
          * "rev;doctype"

Also available in: Unified diff