Feature 1716-mn-reindex

src/edu/ucsb/nceas/metacat/dataone/MNodeService.java

@@ -3509,8 +3509,8 @@ public void publishIdentifier(Session session, Identifier identifier)
     public boolean reindex(Session session, List<Identifier> identifiers, boolean all)
                              throws ServiceFailure, NotAuthorized, NotImplemented, InvalidRequest {
         boolean scheduled = true;
-        String serviceFailureCode = "5900";
-        String notAuthorizedCode = "5901";
+        String serviceFailureCode = "5901";
+        String notAuthorizedCode = "5902";
         String notAuthorizedError ="The provided identity does not have permission to reindex "
                                     + "objects on the Node.";
         if (session == null) {
@@ -3538,6 +3538,7 @@ public boolean reindex(Session session, List<Identifier> identifiers, boolean al
      * @param pids  the list of identifier whose solr doc needs to be rebuilt
      */
     protected void handleReindexAction(List<Identifier> pids) {
+        logMetacat.debug("MNodeService.handleReindexAction - reindex some objects");
         if (pids == null) {
             return;
         }
@@ -3570,7 +3571,8 @@ protected void handleReindexAction(List<Identifier> pids) {
      */
     protected void handleReindexAllAction() {
         // Process all of the documents
-        logMetacat.debug("MNodeService.handleReindexAllActionqueueing doc index for all documents");
+        logMetacat.debug("MNodeService.handleReindexAllAction - "
+                                               + "reindexl all objects in this Metacat instance");
         Runnable indexAll = new Runnable() {
             public void run() {
                 List<String> resourceMapFormats = ResourceMapNamespaces.getNamespaces();

src/edu/ucsb/nceas/metacat/restservice/v2/MNResourceHandler.java

@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -137,7 +138,10 @@
  *
  *     MNReplication
  *         replicate() - POST /d1/mn/replicate
- *    getReplica() - GET /d1/mn/replica
+ *         getReplica() - GET /d1/mn/replica
+ *
+ *     MNAdmin
+ *         reindex() - GET /d1/mn/reindex
  *
  * ******************
  * @author leinfelder
@@ -159,6 +163,7 @@ public class MNResourceHandler extends D1ResourceHandler {
     protected static final String RESOURCE_WHOAMI = "whoami";
     //make the status of identifier (e.g. DOI) public
     protected static final String RESOURCE_PUBLISH_IDENTIFIER = "publishIdentifier";
+    protected static final String RESOURCE_REINDEX = "reindex";
 
 
 
@@ -527,6 +532,14 @@ public void handle(byte httpVerb) {
                         publishIdentifier(extra);
                         status = true;
                     }
+                } else if (resource.startsWith(RESOURCE_REINDEX)) {
+                    logMetacat.debug("Using resource: " + RESOURCE_REINDEX);
+                    // GET
+                    if (httpVerb == GET) {
+                        // after the command
+                        reindex();
+                        status = true;
+                    }
                 } else {
                     throw new InvalidRequest("0000", "No resource matched for " + resource);
                 }
@@ -1845,5 +1858,47 @@ protected void updateSystemMetadata() throws ServiceFailure, InvalidRequest,
         MNodeService.getInstance(request).updateSystemMetadata(session, pid, systemMetadata);
     }
 
+    /**
+     * Handle the reindex request
+     * @throws InvalidRequest
+     * @throws ServiceFailure
+     * @throws NotAuthorized
+     * @throws NotImplemented
+     */
+    protected void reindex() throws InvalidRequest, ServiceFailure, NotAuthorized, NotImplemented {
+        boolean all = false;
+        List<Identifier> identifiers = new ArrayList<Identifier>();
+        String[] allValueArray = params.get("all");
+        logMetacat.debug("MNResourceHandler.reindex - the allValueArray in the request is "
+                                                                               + allValueArray);
+        if (allValueArray != null) {
+            if (allValueArray.length != 1) {
+                throw new InvalidRequest("5903", "The \"all\" should only have one vaule");
+            } else {
+                String allValue = allValueArray[0];
+                if (allValue != null && allValue.equalsIgnoreCase("true")) {
+                    all = true;
+                }
+            }
+        }
+        if (!all) {
+            String[] ids = params.get("pid");
+            logMetacat.debug("MNResourceHandler.reindex - the pid list in the request is " + ids);
+            if (ids != null) {
+                for (String id : ids) {
+                    if (id != null && !id.trim().equals("")) {
+                        Identifier identifier = new Identifier();
+                        identifier.setValue(id);
+                        identifiers.add(identifier);
+                    }
+                }
+            } else {
+                throw new InvalidRequest("5903", "Users should specify the \"pid\" vaule "
+                                                                            + "for reindexing");
+            }
+        }
+        MNodeService.getInstance(request).reindex(session, identifiers, all);
+    }
+
 }