Changeset 8287 for trunk/greenstone3-extensions

Timestamp:

2004-10-12T12:13:33+13:00 (20 years ago)

Author:

kjdon

Message:

modified to use the CKServer instead of jni based Cluster and Extractor

File:

• trunk/greenstone3-extensions/vishnu/src/vishnu/server/VisServlet.java (modified) (5 diffs)

trunk/greenstone3-extensions/vishnu/src/vishnu/server/VisServlet.java

@@ -41 +41 @@
     final String INITIALIZATION_ACTION = "initialise";
     
-    protected Document doc=null; 
     protected String COLLS_HOME=null; 
-
-    DataBlock data = null;
+    
     Hashtable collH;
 
@@ -88 +86 @@
     public void doPost(HttpServletRequest req, HttpServletResponse resp)
     {
-        DataBlock data = null;
     Object obj;
     
@@ -131 +128 @@
         descriptions = search_engine.getDocDescriptions();
         System.out.println(docNums.size() + " documents in VisServlet");
-        Cluster c = new Cluster();
-        String results = c.getCluster(collection_home,docNums);
-        Packaging p = new Packaging();
-        data = p.getDataPackage(results, descriptions);
-        response.addElement(data);
+        DataBlock data = generateDataBlock(collection_home, docNums, descriptions);
+        if (data != null) {
+            response.addElement(data);
+        }
         sendObject(resp,response);
         search_engine = null;
-        c = null;
-        p = null;
+        data = null;
+        docNums = null;
+        descriptions = null;
+        
         }
         else if( action.equals(DOCUMENT_FETCH_ACTION) ){
@@ -179 +177 @@
     Vector colls = new Vector();
     collH = new Hashtable();
+    Document doc = null;
     
     File dir = new File(COLLS_HOME);
@@ -217 +216 @@
         }           
     }
+    doc = null;
     return colls;
     }
+    
+    private DataBlock generateDataBlock(String collection_home, Vector docNums, Vector descriptions) {
+
+    DataBlock data = new DataBlock();
+
+    CKServer ck_server = new CKServer(collection_home);
+    
+    /**** set data fields one by one and pass one what ever gets assembled ****/
+        
+    try{
+        
+        ck_server.setDescriptions(descriptions);
+        
+        /**** get candidate keywords ****/
+        
+        String[] keywords = ck_server.computeKeywords(docNums);
+        
+        data.words = keywords;
+        
+        
+        /**** get sparse document * keyword matrix ****/
+        
+        SparseMatrix matrix = ck_server.getSparseMatrix(docNums);
+        
+        data.matrix = matrix;
+        
+        
+        /**** get document indices, this is a subset of the original ****/
+        /**** those without keywords are excluded                    ****/
+        
+        int[] docs = ck_server.getHitDocuments();
+        
+        data.docs = docs;
+        
+        
+        String[] desc = ck_server.getHitDescriptions();
+        
+        data.descriptions = desc;
+        
+        
+        /**** get 10 or so clusters ****/
+        
+        Vector[] clusters = ck_server.getClusters();
+        
+        data.clusters = clusters;
+        
+        
+        double[][] centroids = ck_server.getCentroids();
+        
+        
+        /**** send their centroids through sammon mapping ****/
+        
+        Point2D[] sammon = ck_server.getSammonMap(centroids);
+        
+        System.out.println("Num descriptions: " + descriptions.size());
+        System.out.println("Num docs: " + docs.length);
+        System.out.println("Num desc: " + desc.length);
+        
+        data.sammon = sammon;
+        
+    } catch (Exception e) {
+        System.err.println("VisServlet: computing clustering Error: "+e);
+    }
+    ck_server = null;
+    return data;
+    }
 }