Changeset 25540

Timestamp:

2012-05-08T09:54:33+12:00 (12 years ago)

Author:

sjm84

Message:

Updated the import service so that a manifest file can be included, added a build AND activate call so that the client does not have to trigger both. Also added in a very basic task queuing mechanism

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (10 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -21 +21 @@
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.gsdl3.build.*;
+import org.greenstone.util.GlobalProperties;
 
 import org.w3c.dom.Document;
@@ -33 +34 @@
 import java.util.List;
 import java.util.ArrayList;
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
+import java.lang.Thread.State;
 import java.util.Locale;
+
+import java.util.Timer;
+import java.util.TimerTask;
 
 import org.apache.log4j.*;
@@ -56 +63 @@
     private static final String BUILD_SERVICE = "BuildCollection";
     private static final String ACTIVATE_SERVICE = "ActivateCollection";
+    private static final String BUILD_AND_ACTIVATE_SERVICE = "BuildAndActivateCollection";
     private static final String DELETE_SERVICE = "DeleteCollection";
     private static final String RELOAD_SERVICE = "ReloadCollection";
@@ -75 +83 @@
     // set of listeners for any construction commands
     protected Map listeners = null;
+    protected HashMap<String, Boolean> collectionOperationMap = new HashMap<String, Boolean>(); 
 
     public GS2Construct()
     {
         this.listeners = Collections.synchronizedMap(new HashMap());
-
     }
 
@@ -155 +163 @@
     }
 
+    protected Element processBuildAndActivateCollection(Element request)
+    {
+        waitUntilReady(request);
+        Element buildResponse = processBuildCollection(request);
+        if(buildResponse.getElementsByTagName(GSXML.ERROR_ELEM).getLength() > 0)
+        {
+            return buildResponse;
+        }
+        
+        Element statusElem = (Element) buildResponse.getElementsByTagName(GSXML.STATUS_ELEM).item(0);
+        String id = statusElem.getAttribute("pid");
+
+        GS2PerlListener currentListener = (GS2PerlListener) this.listeners.get(id);
+        int statusCode = currentListener.getStatus();
+        while (!GSStatus.isCompleted(statusCode))
+        {
+            // wait for the process, and keep checking the status code
+            // there is probably a better way to do this.
+            try
+            {
+                Thread.currentThread().sleep(100);
+            }
+            catch (Exception e)
+            { // ignore
+            }
+            statusCode = currentListener.getStatus();
+        }
+
+        Element activateResponse = processActivateCollection(request);
+        signalReady(request);
+        return activateResponse;
+    }
+
     protected Element processImportCollection(Element request)
     {
+        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        HashMap params = GSXML.extractParams(param_list, false);
+
+        //If we have been requested to only build certain documents then we need to create a manifest file
+        String documentsParam = (String) params.get("documents");
+        if (documentsParam != null && !documentsParam.equals(""))
+        {
+            String s = File.separator;
+            String manifestFolderPath = this.site_home + s + "collect" + s + params.get(COL_PARAM) + s + "manifests";
+            String manifestFilePath = manifestFolderPath + File.separator + "tempManifest.xml";
+
+            File manifestFolderFile = new File(manifestFolderPath);
+            if (!manifestFolderFile.exists())
+            {
+                manifestFolderFile.mkdirs();
+            }
+
+            File manifestFile = new File(manifestFilePath);
+            if (!manifestFile.exists())
+            {
+                try
+                {
+                    manifestFile.createNewFile();
+                }
+                catch (Exception ex)
+                {
+                    ex.printStackTrace();
+                    return null; //Probably should return an actual error
+                }
+            }
+            String[] docList = documentsParam.split(",");
+
+            try
+            {
+                BufferedWriter bw = new BufferedWriter(new FileWriter(manifestFile));
+                bw.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+                bw.write("<Manifest>\n");
+                bw.write("  <Index>\n");
+                for (int j = 0; j < docList.length; j++)
+                {
+                    bw.write("    <Filename>" + docList[j] + "</Filename>\n");
+                }
+                bw.write("  </Index>\n");
+                bw.write("</Manifest>\n");
+                bw.close();
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+                return null; //Probably should return an actual error
+            }
+        }
+
         return runCommand(request, GS2PerlConstructor.IMPORT);
     }
@@ -182 +276 @@
             return response;
         }
-        
+
         UserContext userContext = new UserContext(request);
         systemRequest("delete", coll_name, null, userContext);
@@ -422 +516 @@
         e = this.doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
+        e.setAttribute(GSXML.NAME_ATT, BUILD_AND_ACTIVATE_SERVICE);
+        this.short_service_info.appendChild(e);
+
+        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, DELETE_SERVICE);
         this.short_service_info.appendChild(e);
@@ -498 +597 @@
             coll_name = (String) params.get(COL_PARAM);
         }
-        logger.info("Coll name = " + coll_name);
+
         // makes a paramList of the relevant params
         Element other_params = extractOtherParams(params, type);
@@ -512 +611 @@
         }
 
-        GS2PerlListener listener = new GS2PerlListener();
         constructor.setSiteHome(this.site_home);
         constructor.setCollectionName(coll_name);
         constructor.setActionType(type);
         constructor.setProcessParams(other_params);
-
+        if (type == GS2PerlConstructor.IMPORT)
+        {
+            constructor.setManifestFile(this.site_home + File.separator + "collect" + File.separator + params.get(COL_PARAM) + File.separator + "manifests" + File.separator + "tempManifest.xml");
+        }
+
+        GS2PerlListener listener = new GS2PerlListener();
         constructor.addListener(listener);
         constructor.start();
@@ -651 +754 @@
         return null;
     }
-
+    
+    protected void waitUntilReady(Element request)
+    {
+        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        HashMap params = GSXML.extractParams(param_list, false);
+        
+        String collection = (String)params.get(COL_PARAM);
+
+        if(checkCollectionIsNotBusy(collection))
+        {
+            return;
+        }
+
+        while(collectionOperationMap.get(collection) != null)
+        {
+            try
+            {
+                Thread.currentThread().sleep(1000);
+            }
+            catch(Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+    }
+    
+    protected void signalReady(Element request)
+    {
+        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        HashMap params = GSXML.extractParams(param_list, false);
+        
+        String collection = (String)params.get(COL_PARAM);
+
+        collectionOperationMap.remove(collection);
+    }
+    
+    protected synchronized boolean checkCollectionIsNotBusy(String collection)
+    {
+        if(collectionOperationMap.get(collection) == null)
+        {
+            collectionOperationMap.put(collection, true);
+            return true;
+        }
+        return false;
+    }
 }